Skip to content

Commit 8b3d0bd

Browse files
committed
Updated eclipse parent to 2.0.5
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
1 parent 609ca4f commit 8b3d0bd

4 files changed

Lines changed: 35 additions & 44 deletions

File tree

bom/pom.xml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
1818
-->
1919

20-
<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">
20+
<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">
2121

2222
<modelVersion>4.0.0</modelVersion>
2323

2424
<parent>
2525
<groupId>org.eclipse.ee4j</groupId>
2626
<artifactId>project</artifactId>
27-
<version>1.0.9</version>
28-
<relativePath/>
27+
<version>2.0.5</version>
28+
<relativePath />
2929
</parent>
3030

3131
<groupId>org.glassfish.jersey</groupId>
@@ -437,6 +437,14 @@
437437
</build>
438438

439439
<profiles>
440+
<profile>
441+
<id>oss-release</id>
442+
<properties>
443+
<release.projectName>Eclipse Jersey BOM</release.projectName>
444+
<release.autoPublish>false</release.autoPublish>
445+
<release.waitUntil>published</release.waitUntil>
446+
</properties>
447+
</profile>
440448
<profile>
441449
<id>project-info</id>
442450
<activation>

pom.xml

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@
1717
1818
-->
1919

20-
<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">
20+
<project xmlns="http://maven.apache.org/POM/4.0.0"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
23+
child.project.url.inherit.append.path="false">
2124
<modelVersion>4.0.0</modelVersion>
2225

2326
<parent>
2427
<groupId>org.eclipse.ee4j</groupId>
2528
<artifactId>project</artifactId>
26-
<version>1.0.9</version>
29+
<version>2.0.5</version>
30+
<relativePath />
2731
</parent>
2832

2933
<groupId>org.glassfish.jersey</groupId>
@@ -38,8 +42,6 @@
3842

3943
<url>https://projects.eclipse.org/projects/ee4j.jersey</url>
4044

41-
<!-- prerequisites -->
42-
4345
<issueManagement>
4446
<system>JIRA</system>
4547
<url>https://github.com/eclipse-ee4j/jersey/issues</url>
@@ -213,7 +215,9 @@
213215
</license>
214216
</licenses>
215217

216-
<scm>
218+
<scm child.scm.connection.inherit.append.path="false"
219+
child.scm.developerConnection.inherit.append.path="false"
220+
child.scm.url.inherit.append.path="false">
217221
<connection>scm:git:git@github.com:jersey/jersey.git</connection>
218222
<developerConnection>scm:git:git@github.com:eclipse-ee4j/jersey.git</developerConnection>
219223
<url>https://github.com/eclipse-ee4j/jersey</url>
@@ -1072,6 +1076,14 @@
10721076
</plugins>
10731077
</build>
10741078
</profile>
1079+
<profile>
1080+
<id>oss-release</id>
1081+
<properties>
1082+
<release.projectName>Eclipse Jersey</release.projectName>
1083+
<release.autoPublish>false</release.autoPublish>
1084+
<release.waitUntil>published</release.waitUntil>
1085+
</properties>
1086+
</profile>
10751087
<profile>
10761088
<id>xdk</id>
10771089
<activation>
@@ -1182,37 +1194,6 @@
11821194
</site>
11831195
</distributionManagement>
11841196
</profile>
1185-
<profile>
1186-
<id>sbom</id>
1187-
<activation>
1188-
<property>
1189-
<name>!skipSBOM</name>
1190-
</property>
1191-
</activation>
1192-
<build>
1193-
<plugins>
1194-
<plugin>
1195-
<groupId>org.cyclonedx</groupId>
1196-
<artifactId>cyclonedx-maven-plugin</artifactId>
1197-
<version>${cyclonedx.mvn.plugin.version}</version>
1198-
<inherited>true</inherited>
1199-
<executions>
1200-
<execution>
1201-
<phase>package</phase>
1202-
<goals>
1203-
<goal>makeAggregateBom</goal>
1204-
</goals>
1205-
<configuration>
1206-
<!-- <schemaVersion>1.4</schemaVersion>-->
1207-
<projectType>framework</projectType>
1208-
<excludeTestProject>true</excludeTestProject>
1209-
</configuration>
1210-
</execution>
1211-
</executions>
1212-
</plugin>
1213-
</plugins>
1214-
</build>
1215-
</profile>
12161197
<profile>
12171198
<id>sonar</id>
12181199
<properties>
@@ -2137,7 +2118,7 @@
21372118
<artifactId>yasson</artifactId>
21382119
<version>${yasson.version}</version>
21392120
</dependency>
2140-
2121+
21412122
<dependency>
21422123
<groupId>com.google.code.gson</groupId>
21432124
<artifactId>gson</artifactId>

tools/jersey-doc-modulelist-maven-plugin/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818
-->
1919

2020
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
2222
<modelVersion>4.0.0</modelVersion>
2323

2424
<parent>
2525
<groupId>org.eclipse.ee4j</groupId>
2626
<artifactId>project</artifactId>
27-
<version>1.0.9</version>
27+
<version>2.0.5</version>
28+
<relativePath />
2829
</parent>
2930

3031
<groupId>org.glassfish.jersey.tools.plugins</groupId>

tools/jersey-release-notes-maven-plugin/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818
-->
1919

2020
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
2222
<modelVersion>4.0.0</modelVersion>
2323

2424
<parent>
2525
<groupId>org.eclipse.ee4j</groupId>
2626
<artifactId>project</artifactId>
27-
<version>1.0.9</version>
27+
<version>2.0.5</version>
28+
<relativePath />
2829
</parent>
2930

3031
<groupId>org.glassfish.jersey.tools.plugins</groupId>

0 commit comments

Comments
 (0)