Skip to content

Commit

Permalink
Update to JAXB 2.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ComBatVision committed Apr 24, 2019
1 parent 3693069 commit 6e0e7b4
Show file tree
Hide file tree
Showing 6 changed files with 514 additions and 1,699 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
*.iml
.classpath
.idea
.project
.settings
target
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Android JAXB 2.2.7
Android JAXB 2.3.1
==================

Description
-----------
This project creates an Android compatible JAXB 2.2.7 jar.
This project creates an Android compatible JAXB 2.3.1 jar.
Conflicting classes in java.awt and javax.activation have been
removed from the baseline. An uber-jar containing jaxb-api, jaxb-core,
and jaxb-impl is packaged using the Maven shade plugin.
Expand Down
14 changes: 8 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jaxb.version>2.2.7</jaxb.version>
<jaxb.version>2.3.1</jaxb.version>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>

<build>
Expand All @@ -21,7 +23,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<version>3.2.1</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -57,13 +59,13 @@
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.version}</version>
<scope>provided</scope>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb.version}</version>
<scope>compile</scope>
<exclusions>
Expand Down
Loading

0 comments on commit 6e0e7b4

Please sign in to comment.