Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit f581ce2

Browse files
author
Stefan Kock
committed
SORMAS-Foundation#3449: List of directly used Payara modules completed
- JakartaEE alias names for JavaEE modules documented - Defined some uniquely used JakartaEE/JavaEE dependencies as exclusions
1 parent 46453ca commit f581ce2

2 files changed

Lines changed: 128 additions & 30 deletions

File tree

‎sormas-base/dependencies/serverlibs.pom‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -40,30 +40,6 @@
4040
<dependency>
4141
<groupId>org.hibernate</groupId>
4242
<artifactId>hibernate-core</artifactId>
43-
44-
<exclusions>
45-
<!-- *** Excluded Payara modules -->
46-
<exclusion>
47-
<groupId>javax.persistence</groupId>
48-
<artifactId>javax.persistence-api</artifactId>
49-
</exclusion>
50-
<exclusion>
51-
<groupId>org.javassist</groupId>
52-
<artifactId>javassist</artifactId>
53-
</exclusion>
54-
<exclusion>
55-
<groupId>org.jboss.spec.javax.transaction</groupId>
56-
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
57-
</exclusion>
58-
<exclusion>
59-
<groupId>com.sun.activation</groupId>
60-
<artifactId>javax.activation</artifactId>
61-
</exclusion>
62-
<exclusion>
63-
<groupId>com.sun.istack</groupId>
64-
<artifactId>istack-commons-runtime</artifactId>
65-
</exclusion>
66-
</exclusions>
6743
</dependency>
6844

6945
<dependency>
@@ -91,12 +67,6 @@
9167

9268
<!-- *** Exclude Payara modules *** (with explicite scope "runtime") -->
9369

94-
<dependency>
95-
<groupId>javax.activation</groupId>
96-
<artifactId>javax.activation-api</artifactId>
97-
<scope>runtime</scope>
98-
</dependency>
99-
10070
<dependency>
10171
<groupId>org.jboss.logging</groupId>
10272
<artifactId>jboss-logging</artifactId>

‎sormas-base/pom.xml‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
<!-- *** Payara module versions *** -->
1818
<jackson.version>2.10.2</jackson.version>
19+
<jakarta.activation.version>1.2.1</jakarta.activation.version>
1920
<javaee.version>8.0.1</javaee.version>
2021
<jersey.version>2.30</jersey.version>
2122
<!-- Payara version used for release. Overwrite them in settings.xml for local development with different versions -->
@@ -51,35 +52,47 @@
5152
<version>${javaee.version}</version>
5253
<scope>provided</scope>
5354
</dependency>
55+
<dependency>
56+
<groupId>javax.activation</groupId>
57+
<artifactId>activation</artifactId>
58+
<version>1.1.1</version>
59+
<scope>provided</scope>
60+
<!-- Payara module: jakarta.activation -->
61+
</dependency>
5462
<dependency>
5563
<groupId>javax.activation</groupId>
5664
<artifactId>javax.activation-api</artifactId>
5765
<version>1.2.0</version>
5866
<scope>provided</scope>
67+
<!-- Payara module: jakarta.activation-api -->
5968
</dependency>
6069
<dependency>
6170
<groupId>javax.persistence</groupId>
6271
<artifactId>javax.persistence-api</artifactId>
6372
<version>2.2</version>
6473
<scope>provided</scope>
74+
<!-- Payara module: jakarta.persistence -->
6575
</dependency>
6676
<dependency>
6777
<groupId>javax.security.enterprise</groupId>
6878
<artifactId>javax.security.enterprise-api</artifactId>
6979
<version>1.0</version>
7080
<scope>provided</scope>
81+
<!-- Payara module: jakarta.security.enterprise-api -->
7182
</dependency>
7283
<dependency>
7384
<groupId>javax.servlet</groupId>
7485
<artifactId>javax.servlet-api</artifactId>
7586
<version>4.0.1</version>
7687
<scope>provided</scope>
88+
<!-- Payara module: jakarta.servlet-api -->
7789
</dependency>
7890
<dependency>
7991
<groupId>javax.validation</groupId>
8092
<artifactId>validation-api</artifactId>
8193
<version>2.0.1.Final</version>
8294
<scope>provided</scope>
95+
<!-- Payara module: jakarta.validation-api -->
8396
</dependency>
8497

8598
<dependency>
@@ -100,19 +113,46 @@
100113
<version>${jackson.version}</version>
101114
<scope>provided</scope>
102115
</dependency>
116+
<dependency>
117+
<groupId>com.fasterxml.jackson.dataformat</groupId>
118+
<artifactId>jackson-dataformat-yaml</artifactId>
119+
<version>${jackson.version}</version>
120+
<scope>provided</scope>
121+
</dependency>
103122
<dependency>
104123
<groupId>com.fasterxml.jackson.module</groupId>
105124
<artifactId>jackson-module-jaxb-annotations</artifactId>
106125
<version>${jackson.version}</version>
107126
<scope>provided</scope>
108127
</dependency>
109128

129+
<dependency>
130+
<groupId>com.github.stephenc.jcip</groupId>
131+
<artifactId>jcip-annotations</artifactId>
132+
<version>1.0-1</version>
133+
<scope>provided</scope>
134+
<!-- Payara module: jcip-annotations-repackaged -->
135+
</dependency>
136+
137+
<dependency>
138+
<groupId>com.sun.activation</groupId>
139+
<artifactId>jakarta.activation</artifactId>
140+
<version>${jakarta.activation.version}</version>
141+
<scope>provided</scope>
142+
</dependency>
110143
<dependency>
111144
<groupId>com.sun.istack</groupId>
112145
<artifactId>istack-commons-runtime</artifactId>
113146
<version>3.0.10</version>
114147
<scope>provided</scope>
115148
</dependency>
149+
<dependency>
150+
<groupId>com.sun.mail</groupId>
151+
<artifactId>javax.mail</artifactId>
152+
<version>1.6.2</version>
153+
<scope>provided</scope>
154+
<!-- Payara module: jakarta.mail -->
155+
</dependency>
116156

117157
<dependency>
118158
<groupId>fish.payara.api</groupId>
@@ -127,6 +167,37 @@
127167
<scope>provided</scope>
128168
</dependency>
129169

170+
<dependency>
171+
<groupId>jakarta.activation</groupId>
172+
<artifactId>jakarta.activation-api</artifactId>
173+
<version>${jakarta.activation.version}</version>
174+
<scope>provided</scope>
175+
</dependency>
176+
<dependency>
177+
<groupId>jakarta.annotation</groupId>
178+
<artifactId>jakarta.annotation-api</artifactId>
179+
<version>1.3.5</version>
180+
<scope>provided</scope>
181+
</dependency>
182+
<dependency>
183+
<groupId>jakarta.validation</groupId>
184+
<artifactId>jakarta.validation-api</artifactId>
185+
<version>2.0.2</version>
186+
<scope>provided</scope>
187+
</dependency>
188+
<dependency>
189+
<groupId>jakarta.ws.rs</groupId>
190+
<artifactId>jakarta.ws.rs-api</artifactId>
191+
<version>2.1.6</version>
192+
<scope>provided</scope>
193+
</dependency>
194+
<dependency>
195+
<groupId>jakarta.xml.bind</groupId>
196+
<artifactId>jakarta.xml.bind-api</artifactId>
197+
<version>2.3.2</version>
198+
<scope>provided</scope>
199+
</dependency>
200+
130201
<dependency>
131202
<groupId>org.eclipse.microprofile.config</groupId>
132203
<artifactId>microprofile-config-api</artifactId>
@@ -139,6 +210,7 @@
139210
<artifactId>javax.el</artifactId>
140211
<version>3.0.0</version>
141212
<scope>provided</scope>
213+
<!-- Payara module: jakarta.el -->
142214
</dependency>
143215
<dependency>
144216
<groupId>org.glassfish.corba</groupId>
@@ -186,6 +258,13 @@
186258
<scope>provided</scope>
187259
</dependency>
188260

261+
<dependency>
262+
<groupId>org.yaml</groupId>
263+
<artifactId>snakeyaml</artifactId>
264+
<version>1.25</version>
265+
<scope>provided</scope>
266+
</dependency>
267+
189268
<!-- *** Payara modules END *** -->
190269

191270
<!-- Baseline for tests, so that in all projects in any case the test
@@ -223,6 +302,37 @@
223302
<artifactId>hibernate-core</artifactId>
224303
<version>5.4.18.Final</version>
225304
<scope>provided</scope>
305+
<exclusions>
306+
<!-- Exclude Payara modules here -->
307+
<exclusion>
308+
<groupId>com.sun.istack</groupId>
309+
<artifactId>istack-commons-runtime</artifactId>
310+
</exclusion>
311+
<exclusion>
312+
<groupId>javax.activation</groupId>
313+
<artifactId>javax.activation-api</artifactId>
314+
<!-- Payara module: jakarta.activation-api -->
315+
</exclusion>
316+
<exclusion>
317+
<groupId>javax.persistence</groupId>
318+
<artifactId>javax.persistence-api</artifactId>
319+
<!-- Payara module: jakarta.persistence -->
320+
</exclusion>
321+
<exclusion>
322+
<groupId>javax.xml.bind</groupId>
323+
<artifactId>jaxb-api</artifactId>
324+
<!-- Payara module: jakarta.xml.bind-api -->
325+
</exclusion>
326+
<exclusion>
327+
<groupId>org.javassist</groupId>
328+
<artifactId>javassist</artifactId>
329+
</exclusion>
330+
<exclusion>
331+
<groupId>org.jboss.spec.javax.transaction</groupId>
332+
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
333+
<!-- Payara module: jakarta.transaction-api -->
334+
</exclusion>
335+
</exclusions>
226336
</dependency>
227337

228338
<dependency>
@@ -324,6 +434,24 @@
324434
<artifactId>keycloak-admin-client</artifactId>
325435
<version>${keycloak.version}</version>
326436
<!-- TODO #3449: avoid scope compile -->
437+
<exclusions>
438+
<!-- Exclude Payara modules here -->
439+
<exclusion>
440+
<groupId>org.jboss.spec.javax.annotation</groupId>
441+
<artifactId>jboss-annotations-api_1.3_spec</artifactId>
442+
<!-- Payara module: jakarta.annotation-api -->
443+
</exclusion>
444+
<exclusion>
445+
<groupId>org.jboss.spec.javax.ws.rs</groupId>
446+
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
447+
<!-- Payara module: jakarta.ws.rs-api -->
448+
</exclusion>
449+
<exclusion>
450+
<groupId>org.jboss.spec.javax.xml.bind</groupId>
451+
<artifactId>jboss-jaxb-api_2.3_spec</artifactId>
452+
<!-- Payara module: jakarta.xml.bind-api -->
453+
</exclusion>
454+
</exclusions>
327455
</dependency>
328456
<dependency>
329457
<groupId>org.keycloak</groupId>

0 commit comments

Comments
 (0)