Skip to content

Commit 5e36667

Browse files
Merge pull request #138 from bnicholesdell/updatetojava11
Add components for compatibility with Java 11
2 parents c014f62 + 6411019 commit 5e36667

1 file changed

Lines changed: 23 additions & 20 deletions

File tree

pom.xml

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<licenses>
2525
<license>
2626
<name>Apache License, Version 2.0</name>
27-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
27+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
2828
<distribution>repo</distribution>
2929
</license>
3030
</licenses>
@@ -53,12 +53,34 @@
5353
<groupId>org.apache.httpcomponents</groupId>
5454
<artifactId>httpclient</artifactId>
5555
<version>4.5.14</version>
56+
<exclusions>
57+
<exclusion>
58+
<groupId>commons-codec</groupId>
59+
<artifactId>commons-codec</artifactId>
60+
</exclusion>
61+
</exclusions>
62+
</dependency>
63+
<dependency>
64+
<groupId>commons-codec</groupId>
65+
<artifactId>commons-codec</artifactId>
66+
<version>1.15</version>
5667
</dependency>
5768
<dependency>
5869
<groupId>org.apache.httpcomponents</groupId>
5970
<artifactId>httpmime</artifactId>
6071
<version>4.5.14</version>
6172
</dependency>
73+
<dependency>
74+
<groupId>jakarta.xml.bind</groupId>
75+
<artifactId>jakarta.xml.bind-api</artifactId>
76+
<version>2.3.2</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.glassfish.jaxb</groupId>
80+
<artifactId>jaxb-runtime</artifactId>
81+
<version>2.3.2</version>
82+
<scope>runtime</scope>
83+
</dependency>
6284
<dependency>
6385
<groupId>com.fasterxml.jackson.core</groupId>
6486
<artifactId>jackson-databind</artifactId>
@@ -122,25 +144,6 @@
122144
<autoReleaseAfterClose>false</autoReleaseAfterClose>
123145
</configuration>
124146
</plugin>
125-
<plugin>
126-
<artifactId>maven-assembly-plugin</artifactId>
127-
<executions>
128-
<execution>
129-
<id>jar-with-dependencies</id>
130-
<phase>package</phase>
131-
<goals>
132-
<goal>single</goal>
133-
</goals>
134-
</execution>
135-
</executions>
136-
<configuration>
137-
<descriptorRefs>
138-
<descriptorRef>jar-with-dependencies</descriptorRef>
139-
</descriptorRefs>
140-
<finalName>safeguardjava-${revision}-bundle</finalName>
141-
<appendAssemblyId>false</appendAssemblyId>
142-
</configuration>
143-
</plugin>
144147
</plugins>
145148
</build>
146149

0 commit comments

Comments
 (0)