Skip to content

Commit

Permalink
#8: fixed build to work with Java8 and Java9-11 (#10)
Browse files Browse the repository at this point in the history 
#9: fixed dependencies so security also works with Java8 and Java9-11
  • Loading branch information
@hohwille
hohwille authored Sep 24, 2018
1 parent f865450 commit 63b3ad7
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 39 deletions.
17 changes: 14 additions & 3 deletions boms/bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@
<version>1.0.0.Final</version>
</dependency>
<!--
<dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<version>2.2</version>
</dependency>
</dependency>
-->
<dependency>
<groupId>cglib</groupId>
Expand Down Expand Up @@ -139,7 +139,7 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.1</version>
<version>2.1</version>
</dependency>
<!-- CXF for REST and Webservices -->
<dependency>
Expand Down Expand Up @@ -217,6 +217,17 @@
<artifactId>validation-api</artifactId>
<version>1.1.0.Final</version>
</dependency>
<!-- JAXB -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
</dependency>

<!-- *** optional TEST DEPENDENCIES *** -->
<!-- JUnit for Test-Case definition and execution -->
Expand Down
24 changes: 24 additions & 0 deletions modules/security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<!-- JAXB -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<optional>true</optional>
</dependency>

<!-- Used by JsonUsernamePasswordAuthenticationFilter -->
<dependency>
Expand All @@ -70,4 +76,22 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>[9,12]</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
60 changes: 24 additions & 36 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.8.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -217,12 +217,12 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<additionalDependencies>
<additionalDependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<version>1.2</version>
</additionalDependency>
<additionalDependencies>
<additionalDependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<version>1.2</version>
</additionalDependency>
</additionalDependencies>
<!-- https://issues.apache.org/jira/browse/MJAVADOC-308 -->
<!-- <notree>true</notree> -->
Expand All @@ -244,7 +244,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>
<version>2.22.0</version>
<configuration>
<!-- force locale to en_EN or tests will fail in other locales -->
<argLine>-Duser.language=en -Duser.region=EN</argLine>
Expand Down Expand Up @@ -313,7 +313,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>1.14</version>
<version>1.14</version>
<configuration>
<outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
<sortArtifactByName>true</sortArtifactByName>
Expand All @@ -323,7 +323,7 @@
<licenseMerges>
<licenseMerge>Apache Software License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache License, Version 2.0</licenseMerge>
</licenseMerges>
</configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down Expand Up @@ -361,12 +361,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalDependencies>
<additionalDependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<version>1.2</version>
</additionalDependency>
<additionalDependencies>
<additionalDependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<version>1.2</version>
</additionalDependency>
</additionalDependencies>
<!--<notree>true</notree> -->
<show>private</show>
Expand All @@ -379,7 +379,6 @@
</additionalOptions>
<links>
<link>http://docs.oracle.com/javase/7/docs/api/</link>
<!--<link>http://oasp.github.io/devon4j/maven/apidocs/</link> -->
</links>
<doctitle>JavaDocs for ${project.name}</doctitle>
<windowtitle>JavaDocs for ${project.name}</windowtitle>
Expand Down Expand Up @@ -465,12 +464,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalDependencies>
<additionalDependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<version>1.2</version>
</additionalDependency>
<additionalDependencies>
<additionalDependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<version>1.2</version>
</additionalDependency>
</additionalDependencies>
</configuration>
<executions>
Expand All @@ -487,7 +486,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<keyname>${oasp.gpg.keyname}</keyname>
<keyname>${devon.gpg.keyname}</keyname>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -527,7 +526,7 @@
<goal>aggregate-download-licenses</goal>
</goals>
</execution>

<execution>
<id>aggregate-add-third-party</id>
<phase>process-resources</phase>
Expand Down Expand Up @@ -563,17 +562,6 @@
<url>https://github.com/oasp/devon4j/tree/develop</url>
</scm>

<!--
<mailingLists>
<mailingList>
<name>oasp-devel</name>
<subscribe>TODO</subscribe>
<unsubscribe>TODO</unsubscribe>
<post>TODO</post>
<archive>TODO</archive>
</mailingList>
</mailingLists>
-->
<organization>
<name>Devon4j-Team</name>
<url>http://oasp.io/devon4j/maven/team-list.html</url>
Expand Down

0 comments on commit 63b3ad7

Please sign in to comment.