Skip to content
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.

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

chore(deps): bump jaxb dependencies #122

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ jobs:
distribution: 'zulu'
cache: maven
- name: Build
run: ./mvnw -V verify
run: ./mvnw -V -ntp verify
working-directory: java
7 changes: 4 additions & 3 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
<version>4.0.2</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
<version>4.0.5</version>
<scope>runtime</scope>
</dependency>

<!-- to be bundled only with the application not the library -->
Expand Down Expand Up @@ -135,7 +136,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>2.5.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>xjc</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.util.Optional;

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

import io.process.analytics.tools.bpmn.generator.model.display.DisplayDimension;
Expand All @@ -29,6 +28,7 @@
import io.process.analytics.tools.bpmn.generator.model.display.DisplayPoint;
import io.process.analytics.tools.bpmn.generator.internal.generated.model.*;
import io.process.analytics.tools.bpmn.generator.model.ShapeType;
import jakarta.xml.bind.JAXBElement;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*/
package io.process.analytics.tools.bpmn.generator.internal;

import com.sun.xml.bind.marshaller.NamespacePrefixMapper;

import java.util.HashMap;
import java.util.Map;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import java.util.stream.Collectors;

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

import io.process.analytics.tools.bpmn.generator.internal.generated.model.*;
import jakarta.xml.bind.JAXBElement;
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
*/
package io.process.analytics.tools.bpmn.generator.internal;

import java.io.File;
import java.io.StringReader;
import java.io.StringWriter;

import javax.xml.bind.*;
import javax.xml.transform.stream.StreamSource;

import io.process.analytics.tools.bpmn.generator.internal.generated.model.ObjectFactory;
import io.process.analytics.tools.bpmn.generator.internal.generated.model.TDefinitions;
import jakarta.xml.bind.*;

public class XmlParser {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
import java.io.IOException;
import java.util.List;

import javax.xml.bind.JAXBElement;

import jakarta.xml.bind.JAXBElement;
import org.junit.jupiter.api.Test;

import io.process.analytics.tools.bpmn.generator.internal.generated.model.*;
Expand Down Expand Up @@ -56,4 +55,4 @@ public void unmarshall() throws IOException {
assertThat(plane.getId()).isEqualTo("BPMNPlane_1");
}

}
}
Loading