-
Notifications
You must be signed in to change notification settings - Fork 3
feat: 177 update maven groupid and repository license #186
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,9 +3,9 @@ | |
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.entur.gbfs</groupId> | ||
| <groupId>org.mobilitydata</groupId> | ||
| <artifactId>gbfs-validator-java-parent</artifactId> | ||
| <version>2.0.67-SNAPSHOT</version> | ||
| <version>2.0.67</version> | ||
| </parent> | ||
|
|
||
| <artifactId>gbfs-validator-java-api</artifactId> | ||
|
|
@@ -14,12 +14,18 @@ | |
| <url>https://github.com/entur/gbfs-validator-java</url> | ||
| <licenses> | ||
| <license> | ||
| <name>EUPL-1.2 with modifications</name> | ||
| <name>Apache License, Version 2.0</name> | ||
| <url>https://joinup.ec.europa.eu/software/page/eupl</url> | ||
| <distribution>repo</distribution> | ||
| </license> | ||
| </licenses> | ||
| <developers> | ||
| <developer> | ||
| <name>MobilityData</name> | ||
| <email>[email protected]</email> | ||
| <organization>MobilityData</organization> | ||
| <organizationUrl>https://mobilitydata.org/</organizationUrl> | ||
| </developer> | ||
| <developer> | ||
| <name>Tom Erik Støwer</name> | ||
| <email>[email protected]</email> | ||
|
|
@@ -28,9 +34,9 @@ | |
| </developer> | ||
| </developers> | ||
| <scm> | ||
| <connection>scm:git:ssh://[email protected]/entur/gbfs-validator-java.git</connection> | ||
| <developerConnection>scm:git:ssh://[email protected]/entur/gbfs-validator-java.git</developerConnection> | ||
| <url>https://github.com/entur/gbfs-validator-java/tree/master</url> | ||
| <connection>scm:git:ssh://[email protected]/MobilityData/gbfs-validator-java.git</connection> | ||
| <developerConnection>scm:git:ssh://[email protected]/MobilityData/gbfs-validator-java.git</developerConnection> | ||
| <url>https://github.com/MobilityData/gbfs-validator-java.git</url> | ||
| <tag>HEAD</tag> | ||
| </scm> | ||
| <properties> | ||
|
|
@@ -126,15 +132,15 @@ | |
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.entur.gbfs</groupId> | ||
| <groupId>org.mobilitydata</groupId> | ||
| <artifactId>gbfs-validator-java-loader</artifactId> | ||
| <version>2.0.67-SNAPSHOT</version> | ||
| <version>2.0.67</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.entur.gbfs</groupId> | ||
| <groupId>org.mobilitydata</groupId> | ||
| <artifactId>gbfs-validator-java</artifactId> | ||
| <version>2.0.67-SNAPSHOT</version> | ||
| <version>2.0.67</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.guava</groupId> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,13 +2,13 @@ | |
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.entur.gbfs</groupId> | ||
| <groupId>org.mobilitydata</groupId> | ||
| <artifactId>gbfs-validator-java-parent</artifactId> | ||
| <version>2.0.67-SNAPSHOT</version> | ||
| <version>2.0.67</version> | ||
| </parent> | ||
|
|
||
| <artifactId>gbfs-validator-java</artifactId> | ||
| <version>2.0.67-SNAPSHOT</version> | ||
| <version>2.0.67</version> | ||
| <packaging>jar</packaging> | ||
|
|
||
| <name>gbfs-validator-java</name> | ||
|
|
@@ -22,13 +22,19 @@ | |
|
|
||
| <licenses> | ||
| <license> | ||
| <name>EUPL-1.2 with modifications</name> | ||
| <url>https://joinup.ec.europa.eu/software/page/eupl</url> | ||
| <name>Apache License, Version 2.0</name> | ||
| <url>https://www.apache.org/licenses/LICENSE-2.0</url> | ||
| <distribution>repo</distribution> | ||
| </license> | ||
| </licenses> | ||
|
|
||
| <developers> | ||
| <developer> | ||
| <name>MobilityData</name> | ||
| <email>[email protected]</email> | ||
| <organization>MobilityData</organization> | ||
| <organizationUrl>https://mobilitydata.org/</organizationUrl> | ||
| </developer> | ||
| <developer> | ||
| <name>Tom Erik Støwer</name> | ||
| <email>[email protected]</email> | ||
|
|
@@ -38,9 +44,9 @@ | |
| </developers> | ||
|
|
||
| <scm> | ||
| <connection>scm:git:ssh://[email protected]/entur/gbfs-validator-java.git</connection> | ||
| <developerConnection>scm:git:ssh://[email protected]/entur/gbfs-validator-java.git</developerConnection> | ||
| <url>https://github.com/entur/gbfs-validator-java/tree/master</url> | ||
| <connection>scm:git:ssh://[email protected]/MobilityData/gbfs-validator-java.git</connection> | ||
| <developerConnection>scm:git:ssh://[email protected]/MobilityData/gbfs-validator-java.git</developerConnection> | ||
| <url>https://github.com/MobilityData/gbfs-validator-java.git</url> | ||
| <tag>HEAD</tag> | ||
| </scm> | ||
| <properties> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,9 +2,9 @@ | |
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <groupId>org.entur.gbfs</groupId> | ||
| <groupId>org.mobilitydata</groupId> | ||
| <artifactId>gbfs-validator-java-parent</artifactId> | ||
| <version>2.0.67-SNAPSHOT</version> | ||
| <version>2.0.67</version> | ||
|
|
||
| <packaging>pom</packaging> | ||
|
|
||
|
|
@@ -17,8 +17,8 @@ | |
| </organization> | ||
| <licenses> | ||
| <license> | ||
| <name>EUPL-1.2 with modifications</name> | ||
| <url>https://joinup.ec.europa.eu/software/page/eupl</url> | ||
| <name>Apache License, Version 2.0</name> | ||
| <url>https://www.apache.org/licenses/LICENSE-2.0</url> | ||
| <distribution>repo</distribution> | ||
| </license> | ||
| </licenses> | ||
|
|
@@ -30,6 +30,12 @@ | |
| </modules> | ||
|
|
||
| <developers> | ||
| <developer> | ||
| <name>MobilityData</name> | ||
| <email>[email protected]</email> | ||
| <organization>MobilityData</organization> | ||
| <organizationUrl>https://mobilitydata.org/</organizationUrl> | ||
| </developer> | ||
| <developer> | ||
| <name>Tom Erik Støwer</name> | ||
| <email>[email protected]</email> | ||
|
|
@@ -39,9 +45,9 @@ | |
| </developers> | ||
|
|
||
| <scm> | ||
| <connection>scm:git:ssh://[email protected]/entur/gbfs-validator-java.git</connection> | ||
| <developerConnection>scm:git:ssh://[email protected]/entur/gbfs-validator-java.git</developerConnection> | ||
| <url>https://github.com/entur/gbfs-validator-java/tree/master</url> | ||
| <connection>scm:git:ssh://[email protected]/MobilityData/gbfs-validator-java.git</connection> | ||
| <developerConnection>scm:git:ssh://[email protected]/MobilityData/gbfs-validator-java.git</developerConnection> | ||
| <url>https://github.com/MobilityData/gbfs-validator-java.git</url> | ||
| <tag>HEAD</tag> | ||
| </scm> | ||
| <properties> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you sure we should change this by hand?
Actually I looked into it and the version is automatically set by entur/gha-maven-central/.github/workflows/maven-publish.yml
I suggest we don't change it by hand.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought I needed to do a release so I changed it. I'll leave it there and let the github actions change it next time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe it will work.
I saw that entur/gha-maven-central does something special if the current version in pom.xml ends with SNAPSHOT (see this), but I am not sure of the exact effect.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is why my suggestion is to address the release in its own issue; we also need to "clean up" the maven build, dependencies, release, and other entur's related plugins.