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 2452e7b..7f1cbcc 100644 --- a/bom/pom.xml +++ b/bom/pom.xml
@@ -17,15 +17,15 @@ --> -<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/maven-v4_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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <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> @@ -430,6 +430,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 881d33a..684e212 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 http://maven.apache.org/maven-v4_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> @@ -1081,6 +1085,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> @@ -1184,37 +1196,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/ --> @@ -2335,4 +2316,4 @@ <javax.annotation.version>1.3.2</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests --> <mimepull.version>1.9.15</mimepull.version> </properties> -</project> \ No newline at end of file +</project>
diff --git a/tests/version-agnostic/pom.xml b/tests/version-agnostic/pom.xml index 1160c7f..2ad4dc7 100644 --- a/tests/version-agnostic/pom.xml +++ b/tests/version-agnostic/pom.xml
@@ -17,14 +17,14 @@ --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <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> @@ -75,6 +75,13 @@ <bsdTemplateFile>etc/config/edl-copyright.txt</bsdTemplateFile> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build>
diff --git a/tools/jersey-doc-modulelist-maven-plugin/pom.xml b/tools/jersey-doc-modulelist-maven-plugin/pom.xml index 876adef..19f8b44 100644 --- a/tools/jersey-doc-modulelist-maven-plugin/pom.xml +++ b/tools/jersey-doc-modulelist-maven-plugin/pom.xml
@@ -18,13 +18,14 @@ --> <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/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <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.tools.plugins</groupId>
diff --git a/tools/jersey-release-notes-maven-plugin/pom.xml b/tools/jersey-release-notes-maven-plugin/pom.xml index acd6678..0543599 100644 --- a/tools/jersey-release-notes-maven-plugin/pom.xml +++ b/tools/jersey-release-notes-maven-plugin/pom.xml
@@ -18,13 +18,14 @@ --> <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/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <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.tools.plugins</groupId>