Skip to content

Commit a2112cc

Browse files
strubergstruberg
committed
MEECROWAVE-289 fix jakarta dependencies
1 parent d753aef commit a2112cc

File tree

5 files changed

+52
-31
lines changed

5 files changed

+52
-31
lines changed

‎meecrowave-jpa/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
<groupId>org.apache.openjpa</groupId>
4949
<artifactId>openjpa</artifactId>
5050
<version>${openjpa.version}</version>
51+
<exclusions>
52+
<exclusion>
53+
<groupId>jakarta.annotation</groupId>
54+
<artifactId>jakarta.annotation-api</artifactId>
55+
</exclusion>
56+
</exclusions>
5157
</dependency>
5258

5359
<dependency>

‎meecrowave-jta/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,23 @@
3737
<dependency>
3838
<groupId>jakarta.transaction</groupId>
3939
<artifactId>jakarta.transaction-api</artifactId>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>jakarta.annotation</groupId>
43+
<artifactId>jakarta.annotation-api</artifactId>
44+
</exclusion>
45+
</exclusions>
4046
</dependency>
4147
<dependency>
4248
<groupId>org.apache.geronimo.components</groupId>
4349
<artifactId>geronimo-transaction</artifactId>
4450
<version>4.0.0</version>
51+
<exclusions>
52+
<exclusion>
53+
<groupId>jakarta.annotation</groupId>
54+
<artifactId>jakarta.annotation-api</artifactId>
55+
</exclusion>
56+
</exclusions>
4557
</dependency>
4658
<dependency>
4759
<groupId>org.slf4j</groupId>

‎meecrowave-junit/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@
4343
</profiles>
4444

4545
<dependencies>
46-
<dependency>
47-
<groupId>org.apache.meecrowave</groupId>
48-
<artifactId>meecrowave-specs-api</artifactId>
49-
<version>${project.version}</version>
50-
<scope>provided</scope>
51-
</dependency>
52-
5346
<dependency>
5447
<groupId>junit</groupId>
5548
<artifactId>junit</artifactId>

‎meecrowave-oauth2-minimal/pom.xml‎

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -47,39 +47,43 @@
4747

4848
<dependencies>
4949
<dependency>
50-
<groupId>jakarta.inject</groupId>
51-
<artifactId>jakarta.inject-api</artifactId>
50+
<groupId>org.apache.meecrowave</groupId>
51+
<artifactId>meecrowave-specs-api</artifactId>
52+
<version>${project.version}</version>
5253
</dependency>
53-
5454
<dependency>
5555
<groupId>org.apache.meecrowave</groupId>
5656
<artifactId>meecrowave-core</artifactId>
5757
<version>${project.version}</version>
5858
</dependency>
59-
<dependency>
60-
<groupId>jakarta.ws.rs</groupId>
61-
<artifactId>jakarta.ws.rs-api</artifactId>
62-
</dependency>
63-
<dependency>
64-
<groupId>jakarta.json</groupId>
65-
<artifactId>jakarta.json-api</artifactId>
66-
</dependency>
67-
<dependency>
68-
<groupId>jakarta.json.bind</groupId>
69-
<artifactId>jakarta.json.bind-api</artifactId>
70-
</dependency>
7159

7260
<dependency>
7361
<groupId>org.apache.tomcat</groupId>
7462
<artifactId>tomcat-catalina</artifactId>
7563
<version>${tomcat.version}</version>
7664
<scope>provided</scope>
65+
<exclusions>
66+
<exclusion>
67+
<groupId>org.apache.tomcat</groupId>
68+
<artifactId>tomcat-servlet-api</artifactId>
69+
</exclusion>
70+
<exclusion>
71+
<groupId>org.apache.tomcat</groupId>
72+
<artifactId>tomcat-el-api</artifactId>
73+
</exclusion>
74+
</exclusions>
7775
</dependency>
7876

7977
<dependency>
8078
<groupId>org.apache.cxf</groupId>
8179
<artifactId>cxf-rt-rs-security-jose</artifactId>
8280
<version>${cxf.version}</version>
81+
<exclusions>
82+
<exclusion>
83+
<groupId>jakarta.annotation</groupId>
84+
<artifactId>jakarta.annotation-api</artifactId>
85+
</exclusion>
86+
</exclusions>
8387
</dependency>
8488
<dependency>
8589
<groupId>org.apache.cxf</groupId>
@@ -132,6 +136,12 @@
132136
<artifactId>openjpa</artifactId>
133137
<version>${openjpa.version}</version>
134138
<scope>provided</scope>
139+
<exclusions>
140+
<exclusion>
141+
<groupId>jakarta.annotation</groupId>
142+
<artifactId>jakarta.annotation-api</artifactId>
143+
</exclusion>
144+
</exclusions>
135145
</dependency>
136146
<dependency>
137147
<groupId>org.apache.geronimo.specs</groupId>
@@ -143,6 +153,12 @@
143153
<groupId>jakarta.persistence</groupId>
144154
<artifactId>jakarta.persistence-api</artifactId>
145155
<scope>provided</scope>
156+
<exclusions>
157+
<exclusion>
158+
<groupId>jakarta.annotation</groupId>
159+
<artifactId>jakarta.annotation-api</artifactId>
160+
</exclusion>
161+
</exclusions>
146162
</dependency>
147163
<dependency>
148164
<groupId>commons-cli</groupId>
@@ -181,14 +197,7 @@
181197
<version>${h2.version}</version>
182198
<scope>test</scope>
183199
</dependency>
184-
<!--X TODO check
185-
<dependency>
186-
<groupId>org.bouncycastle</groupId>
187-
<artifactId>bcpkix-jdk15on</artifactId>
188-
<version>1.64</version>
189-
<scope>test</scope>
190-
</dependency>
191-
-->
200+
192201
<dependency>
193202
<groupId>org.bouncycastle</groupId>
194203
<artifactId>bcpkix-jdk15on</artifactId>

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,10 @@
254254
<plugin>
255255
<groupId>org.apache.maven.plugins</groupId>
256256
<artifactId>maven-javadoc-plugin</artifactId>
257-
<version>3.2.0</version>
257+
<version>3.12.0</version>
258258
<configuration>
259259
<release>${source}</release>
260+
<legacyMode>true</legacyMode>
260261
<doclint>none</doclint>
261262
</configuration>
262263
</plugin>

0 commit comments

Comments
 (0)