Skip to content

Commit acc903f

Browse files
authored
Merge pull request #197 from rosette-api/COMN-287
COMN-287: Use parent POM 12.0.0
2 parents fdf4e24 + b7a8885 commit acc903f

File tree

9 files changed

+12
-30
lines changed

9 files changed

+12
-30
lines changed

annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.basistech.rosette</groupId>
2121
<artifactId>rosette-api-java-binding</artifactId>
22-
<version>1.23.102-SNAPSHOT</version>
22+
<version>1.23.103-SNAPSHOT</version>
2323
</parent>
2424
<artifactId>rosette-api-annotations</artifactId>
2525
<name>rosette-api-annotations</name>

api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.basistech.rosette</groupId>
2121
<artifactId>rosette-api-java-binding</artifactId>
22-
<version>1.23.102-SNAPSHOT</version>
22+
<version>1.23.103-SNAPSHOT</version>
2323
</parent>
2424
<artifactId>rosette-api</artifactId>
2525
<name>rosette-api</name>

common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.basistech.rosette</groupId>
2121
<artifactId>rosette-api-java-binding</artifactId>
22-
<version>1.23.102-SNAPSHOT</version>
22+
<version>1.23.103-SNAPSHOT</version>
2323
</parent>
2424
<artifactId>rosette-api-common</artifactId>
2525
<name>rosette-api-common</name>

examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>com.basistech.rosette</groupId>
2222
<artifactId>rosette-api-java-binding</artifactId>
23-
<version>1.23.102-SNAPSHOT</version>
23+
<version>1.23.103-SNAPSHOT</version>
2424
</parent>
2525
<groupId>com.basistech.rosette</groupId>
2626
<artifactId>rosette-api-examples</artifactId>

json/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>com.basistech.rosette</groupId>
2222
<artifactId>rosette-api-java-binding</artifactId>
23-
<version>1.23.102-SNAPSHOT</version>
23+
<version>1.23.103-SNAPSHOT</version>
2424
</parent>
2525
<artifactId>rosette-api-json</artifactId>
2626
<name>rosette-api-json</name>

model/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.basistech.rosette</groupId>
2121
<artifactId>rosette-api-java-binding</artifactId>
22-
<version>1.23.102-SNAPSHOT</version>
22+
<version>1.23.103-SNAPSHOT</version>
2323
</parent>
2424
<artifactId>rosette-api-model</artifactId>
2525
<name>rosette-api-model</name>

osgi-itests/pom.xml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.basistech.rosette</groupId>
77
<artifactId>rosette-api-java-binding</artifactId>
8-
<version>1.23.102-SNAPSHOT</version>
8+
<version>1.23.103-SNAPSHOT</version>
99
</parent>
1010
<properties>
1111
<bundle-repo>target/test-bundles</bundle-repo>
@@ -14,20 +14,12 @@
1414
<dependency>
1515
<groupId>com.basistech.rosette</groupId>
1616
<artifactId>rosette-api</artifactId>
17-
<version>1.23.102-SNAPSHOT</version>
17+
<version>1.23.103-SNAPSHOT</version>
1818
</dependency>
1919

2020
<!-- The goal of this test is to make sure rosette-api resolves successfully in OSGi with given dependencies. -->
2121
<!-- A failure in this test indicates changes in the minimum runtime requirements of the bundle. -->
2222

23-
<!-- Transitive dependencies of rosette-api are used for resolving. -->
24-
<!-- ADM common-api doesn't line up with the parent in use. -->
25-
<dependency>
26-
<groupId>com.basistech</groupId>
27-
<artifactId>common-api</artifactId>
28-
<version>${bt-common-api.version}</version>
29-
</dependency>
30-
3123
<!-- OSGi framework dependencies -->
3224
<dependency>
3325
<groupId>org.apache.felix</groupId>

pom.xml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
<modelVersion>4.0.0</modelVersion>
1919
<groupId>com.basistech.rosette</groupId>
2020
<artifactId>rosette-api-java-binding</artifactId>
21-
<version>1.23.102-SNAPSHOT</version>
21+
<version>1.23.103-SNAPSHOT</version>
2222
<parent>
2323
<artifactId>open-source-parent</artifactId>
2424
<groupId>com.basistech</groupId>
25-
<version>7.0.1</version>
25+
<version>12.0.0</version>
2626
<relativePath />
2727
</parent>
2828
<packaging>pom</packaging>
@@ -41,12 +41,7 @@
4141
</site>
4242
</distributionManagement>
4343
<properties>
44-
<!-- TODO: After completing upgrade to latest parent pom, review and remove properties we want the parent to set. -->
4544
<bbh-maven-plugin.version>1.0.1</bbh-maven-plugin.version>
46-
<bnd-maven-plugin.version>6.2.0</bnd-maven-plugin.version>
47-
<bt-adm-version>2.7.3</bt-adm-version>
48-
<bt-common-api.version>37.0.1</bt-common-api.version>
49-
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
5045
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
5146
<commons-beanutils.version>1.9.4</commons-beanutils.version>
5247
<commons-codec.version>1.15</commons-codec.version>
@@ -60,12 +55,7 @@
6055
<junit.version>5.9.1</junit.version>
6156
<lombok.version>1.18.24</lombok.version>
6257
<lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
63-
<maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
64-
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
65-
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
66-
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
6758
<mockserver.version>5.14.0</mockserver.version>
68-
<nexus-staging-plugin-version>1.6.13</nexus-staging-plugin-version>
6959
<osgi-enroute-junit-wrapper.version>4.12.0</osgi-enroute-junit-wrapper.version>
7060
<osgi-enroute-hamcrest-wrapper.version>1.3.0</osgi-enroute-hamcrest-wrapper.version>
7161
<reflections.version>0.10.2</reflections.version>
@@ -86,7 +76,7 @@
8676
<dependency>
8777
<groupId>com.basistech</groupId>
8878
<artifactId>common-api</artifactId>
89-
<version>${bt-common-api.version}</version>
79+
<version>${bt-common-api-version}</version>
9080
</dependency>
9181
<dependency>
9282
<groupId>com.basistech</groupId>

release/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.basistech.rosette</groupId>
2121
<artifactId>rosette-api-java-binding</artifactId>
22-
<version>1.23.102-SNAPSHOT</version>
22+
<version>1.23.103-SNAPSHOT</version>
2323
</parent>
2424
<groupId>com.basistech.rosette</groupId>
2525
<artifactId>rosette-api-release</artifactId>

0 commit comments

Comments
 (0)