Skip to content

Fixes for JDK11, removed cglib, upgraded dependencies and plugins #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcusportmann wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for JDK11, removed cglib, upgraded dependencies and plugins #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7f4d79
Fixes for JDK11, removed cglib, upgraded dependencies and plugins inc…
Jul 28, 2023
9d3f606
Update xacml-core/src/test/java/org/xacml4j/v30/pdp/PolicyTest.java
trumpyla Aug 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .java-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11.0
55 changes: 29 additions & 26 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
</modules>

<properties>
<junit.version>4.13.1</junit.version>
<slf4j.version>1.7.32</slf4j.version>
<logback.version>1.2.8</logback.version>
<easymock.version>3.1</easymock.version>
<guava.version>32.0.0-jre</guava.version>
<junit.version>4.13.2</junit.version>
<slf4j.version>2.0.7</slf4j.version>
<logback.version>1.4.8</logback.version>
<easymock.version>5.1.0</easymock.version>
<guava.version>32.1.0-jre</guava.version>
<xml.resolver.version>1.2</xml.resolver.version>
<yammer.metrics.version>3.0.2</yammer.metrics.version>
<dropwizard-metrics.version>4.2.19</dropwizard-metrics.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<license.licenseName>lgpl_v3</license.licenseName>
</properties>
Expand Down Expand Up @@ -88,17 +88,17 @@
<artifactId>easymock</artifactId>
</dependency>
<dependency>
<groupId>com.codahale.metrics</groupId>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${yammer.metrics.version}</version>
</dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${dropwizard-metrics.version}</version>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
Expand Down Expand Up @@ -134,21 +134,16 @@
<version>${logback.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<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>
<version>4.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.8</version>
<version>4.0.3</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand All @@ -160,18 +155,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.5.0</version>
<inherited>true</inherited>
</plugin>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.11.0</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<inherited>true</inherited>
Expand All @@ -185,17 +179,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
<version>3.1.2</version>
<configuration>
<excludes>
<exclude>**/*TestCase.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.5</version>
</plugin>
<!-- TODO: Find a replacement code coverage reporting tool -->
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.2</version>
<version>2.7</version>
<inherited>true</inherited>
<configuration>
<formats>
Expand All @@ -211,10 +212,11 @@
</execution>
</executions>
</plugin>
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>1.7</version>
<version>2.2.0</version>
<configuration>
</configuration>
<executions>
Expand All @@ -234,20 +236,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<!-- Coverage Report -->
<!-- TODO: Find a replacement code coverage reporting tool -->
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.2</version>
<inherited>true</inherited>
</plugin>
-->
</plugins>
</reporting>

Expand Down
2 changes: 1 addition & 1 deletion xacml-conformance-tests/src/test/java/org/xacml4j/v20/Xacml20ConformanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.HashSet;
import java.util.Set;

import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBElement;

import org.junit.Before;
import org.junit.BeforeClass;
Expand Down
10 changes: 3 additions & 7 deletions xacml-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
Expand All @@ -30,9 +26,9 @@
<build>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.7.4</version>
<groupId>com.helger.maven</groupId>
<artifactId>jaxb30-maven-plugin</artifactId>
<version>0.16.1</version>
<executions>
<execution>
<goals>
Expand Down
52 changes: 0 additions & 52 deletions xacml-core/src/main/java/org/xacml4j/util/CglibInvocationFactory.java
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions xacml-core/src/main/java/org/xacml4j/v30/marshal/jaxb/BaseJAXBMarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import java.io.OutputStream;
import java.io.Writer;

import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Result;

Expand All @@ -52,7 +52,7 @@ public final void marshal(T source, Object target) throws IOException
Preconditions.checkNotNull(source);
Preconditions.checkNotNull(target);
try{
javax.xml.bind.Marshaller m = context.createMarshaller();
jakarta.xml.bind.Marshaller m = context.createMarshaller();
JAXBElement<?> jaxbElement = (JAXBElement<?>)marshal(source);
if(target instanceof OutputStream){
m.marshal(jaxbElement, (OutputStream)target);
Expand Down
12 changes: 6 additions & 6 deletions xacml-core/src/main/java/org/xacml4j/v30/marshal/jaxb/BaseJAXBUnmarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
import java.io.IOException;
import java.io.InputStream;

import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.ValidationEvent;
import javax.xml.bind.ValidationEventHandler;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.ValidationEvent;
import jakarta.xml.bind.ValidationEventHandler;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.Source;

Expand Down Expand Up @@ -61,7 +61,7 @@ public final T unmarshal(Object source) throws XacmlSyntaxException, IOException
{
Preconditions.checkNotNull(source);
try{
javax.xml.bind.Unmarshaller u = context.createUnmarshaller();
jakarta.xml.bind.Unmarshaller u = context.createUnmarshaller();
u.setEventHandler(new ValidationEventHandler() {
@Override
public boolean handleEvent(ValidationEvent event) {
Expand Down
2 changes: 1 addition & 1 deletion xacml-core/src/main/java/org/xacml4j/v30/marshal/jaxb/ExpressionTypeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* #L%
*/

import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBElement;

import com.google.common.base.Optional;
import org.oasis.xacml.v30.jaxb.ApplyType;
Expand Down
4 changes: 2 additions & 2 deletions xacml-core/src/main/java/org/xacml4j/v30/marshal/jaxb/JAXBContextUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
* #L%
*/

import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;

import com.google.common.base.Preconditions;

Expand Down
2 changes: 1 addition & 1 deletion xacml-core/src/main/java/org/xacml4j/v30/marshal/jaxb/TypeToXacml30.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* #L%
*/

import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBElement;
import javax.xml.namespace.QName;

import org.oasis.xacml.v30.jaxb.AttributeType;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/xacml4j/v30/marshal/jaxb/Xacml20PolicyFromJaxbToObjectModelMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.List;
import java.util.Map;

import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBElement;

import org.oasis.xacml.v20.jaxb.policy.ActionMatchType;
import org.oasis.xacml.v20.jaxb.policy.ActionType;
Expand Down
2 changes: 1 addition & 1 deletion xacml-core/src/main/java/org/xacml4j/v30/marshal/jaxb/Xacml20RequestContextUnmarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import java.util.LinkedList;
import java.util.Map;

import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBElement;

import org.oasis.xacml.v20.jaxb.context.ActionType;
import org.oasis.xacml.v20.jaxb.context.AttributeType;
Expand Down
2 changes: 1 addition & 1 deletion ...l-core/src/main/java/org/xacml4j/v30/marshal/jaxb/Xacml20ResponseContextUnmarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import java.util.List;
import java.util.Map;

import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBElement;
import javax.xml.namespace.QName;

import org.oasis.xacml.v20.jaxb.context.DecisionType;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/xacml4j/v30/marshal/jaxb/Xacml30PolicyFromJaxbToObjectModelMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import java.util.List;
import java.util.Map;

import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBElement;

import org.oasis.xacml.v30.jaxb.AdviceExpressionType;
import org.oasis.xacml.v30.jaxb.AdviceExpressionsType;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/xacml4j/v30/marshal/jaxb/Xacml30PolicyFromObjectModelToJaxbMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.util.Collection;
import java.util.Map;

import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBElement;

import org.oasis.xacml.v30.jaxb.AdviceExpressionType;
import org.oasis.xacml.v30.jaxb.AdviceExpressionsType;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/xacml4j/v30/marshal/jaxb/Xacml30RequestContextFromJaxbToObjectModelMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.util.LinkedList;
import java.util.List;

import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBElement;

import org.oasis.xacml.v30.jaxb.AdviceType;
import org.oasis.xacml.v30.jaxb.AssociatedAdviceType;
Expand Down
2 changes: 1 addition & 1 deletion xacml-core/src/main/java/org/xacml4j/v30/marshal/jaxb/Xacml30RequestContextUnmarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* #L%
*/

import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBElement;

import org.xacml4j.v30.RequestContext;
import org.xacml4j.v30.XacmlSyntaxException;
Expand Down
2 changes: 1 addition & 1 deletion ...l-core/src/main/java/org/xacml4j/v30/marshal/jaxb/Xacml30ResponseContextUnmarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* #L%
*/

import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBElement;

import org.xacml4j.v30.ResponseContext;
import org.xacml4j.v30.XacmlSyntaxException;
Expand Down
4 changes: 2 additions & 2 deletions xacml-core/src/main/java/org/xacml4j/v30/marshal/jaxb/XacmlPolicyUnmarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
* #L%
*/

import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBElement;

import org.xacml4j.v30.CompositeDecisionRule;
import org.xacml4j.v30.XacmlSyntaxException;
Expand Down
Loading
Loading