Skip to content

Commit

Permalink
Merge pull request #50 from policy4j/fix_openjdk11_compat
Browse files Browse the repository at this point in the history
JDK 11 compatibility
  • Loading branch information
trumpyla authored Jul 17, 2023
2 parents ce9609d + 0d93f65 commit 02f21e4
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ master, 1.3.x ]
branches: [ master, 1.5.x ]


jobs:
Expand All @@ -20,10 +20,10 @@ jobs:
- name: Check out
uses: actions/checkout@v2
- uses: ouzi-dev/[email protected]
- name: Set up JDK 8
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '8'
java-version: '11'
distribution: 'adopt'
cache: maven
- name: Build with Maven
Expand Down
18 changes: 15 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<slf4j.version>1.7.32</slf4j.version>
<logback.version>1.2.8</logback.version>
<easymock.version>3.1</easymock.version>
<guava.version>24.1.1-jre</guava.version>
<guava.version>32.0.0-jre</guava.version>
<xml.resolver.version>1.2</xml.resolver.version>
<yammer.metrics.version>3.0.2</yammer.metrics.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -139,6 +139,18 @@
<artifactId>cglib-nodep</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.8</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -166,8 +178,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<plugin>
Expand Down
8 changes: 8 additions & 0 deletions xacml-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion xacml-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.2</version>
<version>2.8.9</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 02f21e4

Please sign in to comment.