Skip to content

Commit

Permalink
Reorganise POM + remove JAXB impl (frankframework#2067)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nielsm5
nielsm5 authored Jul 29, 2021
1 parent 955806f commit e88f58e
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 48 deletions.
99 changes: 51 additions & 48 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,43 +21,33 @@
<groupId>org.ibissource</groupId>
<artifactId>credentialprovider</artifactId>
</dependency>
<dependency>
<groupId>net.arnx</groupId>
<artifactId>nashorn-promise</artifactId>
<version>0.1.3</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.23.2-GA</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>1.1.1</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>

<!-- Logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<!--LOG4J SLF4J Binding-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.31</version>
</dependency>
<dependency><!--LOG4J SLF4J Binding-->
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<!--Apache Commons Logging Binding-->
<dependency>
<dependency><!--Apache Commons Logging Binding-->
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<version>${log4j2.version}</version>
Expand All @@ -69,6 +59,7 @@
<scope>test</scope>
<classifier>tests</classifier>
</dependency>

<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
Expand Down Expand Up @@ -96,7 +87,8 @@
<artifactId>jaxrpc-api</artifactId>
<version>1.1</version>
</dependency>
<!-- commons -->

<!-- Apache Commons -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand Down Expand Up @@ -171,6 +163,7 @@
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</dependency>

<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
Expand All @@ -197,6 +190,8 @@
<artifactId>aopalliance</artifactId>
<version>1.0</version>
</dependency>

<!-- SPRING -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
Expand Down Expand Up @@ -242,6 +237,7 @@
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
Expand Down Expand Up @@ -356,6 +352,8 @@
</exclusion>
</exclusions>
</dependency>

<!-- Http Components -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
Expand Down Expand Up @@ -389,11 +387,6 @@
<version>5.11.0.Final</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.31</version>
</dependency>
<dependency>
<groupId>com.microsoft.ews-java-api</groupId>
<artifactId>ews-java-api</artifactId>
Expand All @@ -404,11 +397,6 @@
<artifactId>joda-time</artifactId>
<version>2.8</version>
</dependency>
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
<version>1.7.13</version>
</dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
Expand All @@ -424,7 +412,12 @@
<artifactId>liquibase-core</artifactId>
<version>3.5.3</version><!-- beware, Liquibase checksum generation is not consistent over liquibase versions, see https://liquibase.jira.com/browse/CORE-3204 -->
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>

<!-- JavaScript -->
<dependency>
<groupId>com.eclipsesource.j2v8</groupId>
<artifactId>j2v8_macosx_x86_64</artifactId>
Expand All @@ -449,43 +442,53 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
<version>1.7.13</version>
</dependency>
<dependency>
<groupId>net.arnx</groupId>
<artifactId>nashorn-promise</artifactId>
<version>0.1.3</version>
</dependency>

<!-- CXF -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
<exclusions>
<!-- For some reason Maven likes to change this around depending on the
CXF build profiles which may cause duplicate versions in the war file -->
<exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
<!-- Add the excluded files from the CXF dependency explicitly which prevents duplicates in war files -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.2.11</version>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>1.1.1</version>
</dependency>

<!-- Use our own JaxB and JaxWS implementations to run on the IBM JDK -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.2.11</version>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.3.1</version>
</dependency>

<!--
Expand Down
1 change: 1 addition & 0 deletions ear/src/main/application/META-INF/was.policy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ permission java.net.SocketPermission "*", "connect,resolve";
permission java.io.FilePermission "${user.home}${/}.mailcap", "read";
permission java.io.FilePermission "${was.install.root}${/}java${/}jre${/}lib${/}mailcap", "read";
permission java.io.FilePermission "${java.home}${/}conf", "read";
permission java.lang.RuntimePermission "accessClassInPackage.com.sun.activation.registries";

// property * write required for Quartz scheduler and SpringFramework,
// as they call java.System.getProperties()
Expand Down

0 comments on commit e88f58e

Please sign in to comment.