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

Commit 882c9ab

Browse files
author
Stefan Kock
committed
SORMAS-Foundation#3449: Sorted Payara modules with scope provided and adjusted versions
- The versions fit to the corresponding Payara module version. - For javax. dependencies they fit to the jakarta. version in Payara - Explicit exclusions in serverlibs.pom needed because it collects "provided" dependencies
1 parent 953e903 commit 882c9ab

3 files changed

Lines changed: 207 additions & 134 deletions

File tree

sormas-backend/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
<dependency>
131131
<groupId>org.glassfish.jersey.inject</groupId>
132132
<artifactId>jersey-hk2</artifactId>
133+
<scope>test</scope>
133134
</dependency>
134135

135136
<dependency>

sormas-base/dependencies/serverlibs.pom

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,33 @@
2020
</dependency>
2121

2222
<dependency>
23-
<groupId>org.hibernate</groupId>
24-
<artifactId>hibernate-core</artifactId>
23+
<groupId>org.hibernate</groupId>
24+
<artifactId>hibernate-core</artifactId>
2525
<scope>provided</scope>
26+
27+
<exclusions>
28+
<!-- *** Excluded Payara modules -->
29+
<exclusion>
30+
<groupId>javax.persistence</groupId>
31+
<artifactId>javax.persistence-api</artifactId>
32+
</exclusion>
33+
<exclusion>
34+
<groupId>org.javassist</groupId>
35+
<artifactId>javassist</artifactId>
36+
</exclusion>
37+
<exclusion>
38+
<groupId>org.jboss.spec.javax.transaction</groupId>
39+
<artifactId>jboss-transaction-api_1.2_spec</artifactId>
40+
</exclusion>
41+
<exclusion>
42+
<groupId>com.sun.activation</groupId>
43+
<artifactId>javax.activation</artifactId>
44+
</exclusion>
45+
<exclusion>
46+
<groupId>com.sun.istack</groupId>
47+
<artifactId>istack-commons-runtime</artifactId>
48+
</exclusion>
49+
</exclusions>
2650
</dependency>
2751

2852
<dependency>
@@ -72,6 +96,19 @@
7296
<artifactId>bcpkix-jdk15on</artifactId>
7397
<scope>provided</scope>
7498
</dependency>
99+
100+
<!-- *** Excluded Payara modules -->
101+
<dependency>
102+
<groupId>org.jboss.logging</groupId>
103+
<artifactId>jboss-logging</artifactId>
104+
<scope>runtime</scope>
105+
</dependency>
106+
<dependency>
107+
<groupId>javax.activation</groupId>
108+
<artifactId>javax.activation-api</artifactId>
109+
<scope>runtime</scope>
110+
</dependency>
111+
75112
</dependencies>
76113

77114
<build>

0 commit comments

Comments
 (0)