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 e1f2bcb..4f1a336 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> @@ -438,6 +438,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 ceb1a83..ce786e8 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> @@ -213,7 +215,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> @@ -1073,6 +1077,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> @@ -1183,37 +1195,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/ --> @@ -2137,7 +2118,7 @@ <artifactId>yasson</artifactId> <version>${yasson.version}</version> </dependency> - + <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId>
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 8f44150..e168424 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>