Updated eclipse parent to 2.0.5 Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
diff --git a/bom/pom.xml b/bom/pom.xml index 45b24b1..04b10b1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml
@@ -24,8 +24,8 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.9</version> - <relativePath/> + <version>2.0.5</version> + <relativePath /> </parent> <groupId>org.glassfish.jersey</groupId> @@ -460,6 +460,14 @@ <profiles> <profile> + <id>oss-release</id> + <properties> + <release.projectName>Eclipse Jersey BOM</release.projectName> + <release.autoPublish>false</release.autoPublish> + <release.waitUntil>published</release.waitUntil> + </properties> + </profile> + <profile> <id>project-info</id> <activation> <activeByDefault>false</activeByDefault>
diff --git a/pom.xml b/pom.xml index 9cdb79a..3d31559 100644 --- a/pom.xml +++ b/pom.xml
@@ -17,13 +17,17 @@ --> -<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 https://maven.apache.org/xsd/maven-4.0.0.xsd"> +<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 https://maven.apache.org/xsd/maven-4.0.0.xsd" + child.project.url.inherit.append.path="false"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.9</version> + <version>2.0.5</version> + <relativePath /> </parent> <groupId>org.glassfish.jersey</groupId> @@ -38,8 +42,6 @@ <url>https://projects.eclipse.org/projects/ee4j.jersey</url> - <!-- prerequisites --> - <issueManagement> <system>JIRA</system> <url>https://github.com/eclipse-ee4j/jersey/issues</url> @@ -216,7 +218,9 @@ </license> </licenses> - <scm> + <scm child.scm.connection.inherit.append.path="false" + child.scm.developerConnection.inherit.append.path="false" + child.scm.url.inherit.append.path="false"> <connection>scm:git:git@github.com:jersey/jersey.git</connection> <developerConnection>scm:git:git@github.com:eclipse-ee4j/jersey.git</developerConnection> <url>https://github.com/eclipse-ee4j/jersey</url> @@ -998,6 +1002,14 @@ </build> </profile> <profile> + <id>oss-release</id> + <properties> + <release.projectName>Eclipse Jersey</release.projectName> + <release.autoPublish>false</release.autoPublish> + <release.waitUntil>published</release.waitUntil> + </properties> + </profile> + <profile> <id>xdk</id> <activation> <property> @@ -1101,37 +1113,6 @@ </distributionManagement> </profile> <profile> - <id>sbom</id> - <activation> - <property> - <name>!skipSBOM</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.cyclonedx</groupId> - <artifactId>cyclonedx-maven-plugin</artifactId> - <version>${cyclonedx.mvn.plugin.version}</version> - <inherited>true</inherited> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>makeAggregateBom</goal> - </goals> - <configuration> - <!-- <schemaVersion>1.4</schemaVersion>--> - <projectType>framework</projectType> - <excludeTestProject>true</excludeTestProject> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>sonar</id> <properties> <!-- Sonar/Reporting settings (heavily inspired at http://www.aheritier.net/maven-failsafe-sonar-and-jacoco-are-in-a-boat/ --> @@ -1332,24 +1313,6 @@ </plugins> </build> </profile> - <profile> - <id>central-release</id> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.central</groupId> - <artifactId>central-publishing-maven-plugin</artifactId> - <version>0.8.0</version> - <extensions>true</extensions> - <configuration> - <publishingServerId>central</publishingServerId> - <autoPublish>false</autoPublish> - <!-- waitUntil>published</waitUntil --> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> <reporting>
diff --git a/tests/version-agnostic/pom.xml b/tests/version-agnostic/pom.xml index a01aa02..264cfe6 100644 --- a/tests/version-agnostic/pom.xml +++ b/tests/version-agnostic/pom.xml
@@ -23,8 +23,8 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.9</version> - <relativePath>../../../pom.xml</relativePath> + <version>2.0.5</version> + <relativePath /> </parent> <groupId>org.glassfish.jersey.tests</groupId> @@ -78,7 +78,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>3.1.1</version> <configuration> <skip>true</skip> </configuration>
diff --git a/tools/jersey-doc-modulelist-maven-plugin/pom.xml b/tools/jersey-doc-modulelist-maven-plugin/pom.xml index 8b56c39..d1a481b 100644 --- a/tools/jersey-doc-modulelist-maven-plugin/pom.xml +++ b/tools/jersey-doc-modulelist-maven-plugin/pom.xml
@@ -24,7 +24,8 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.9</version> + <version>2.0.5</version> + <relativePath /> </parent> <groupId>org.glassfish.jersey.tools.plugins</groupId>
diff --git a/tools/jersey-release-notes-maven-plugin/pom.xml b/tools/jersey-release-notes-maven-plugin/pom.xml index 876af82..700d58d 100644 --- a/tools/jersey-release-notes-maven-plugin/pom.xml +++ b/tools/jersey-release-notes-maven-plugin/pom.xml
@@ -24,7 +24,8 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.9</version> + <version>2.0.5</version> + <relativePath /> </parent> <groupId>org.glassfish.jersey.tools.plugins</groupId>