Skip to content

Commit f1441f1

Browse files
author
John MacAuley
committed
Backed out the jakarta package port and returned to javax for compatibility with springboot.
1 parent dd0b98d commit f1441f1

6 files changed

Lines changed: 50 additions & 73 deletions

File tree

‎pom.xml‎

Lines changed: 12 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@
55

66
<groupId>net.es.nsi</groupId>
77
<artifactId>dds-lib</artifactId>
8-
<version>1.0.1</version>
8+
<version>1.0.2</version>
99
<packaging>jar</packaging>
1010

11+
<parent>
12+
<groupId>org.springframework.boot</groupId>
13+
<artifactId>spring-boot-starter-parent</artifactId>
14+
<version>2.6.4</version>
15+
</parent>
16+
1117
<properties>
1218
<project.scm.id>github</project.scm.id>
1319
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -20,57 +26,19 @@
2026
<dependency>
2127
<groupId>net.es.nsi</groupId>
2228
<artifactId>common-lib</artifactId>
23-
<version>1.0.0</version>
24-
</dependency>
25-
26-
<!-- Needed for our use of JAXB API bindings. -->
27-
<dependency>
28-
<groupId>jakarta.xml.bind</groupId>
29-
<artifactId>jakarta.xml.bind-api</artifactId>
30-
<version>3.0.0</version>
31-
</dependency>
32-
33-
<!-- Needed for REST API bindings. -->
34-
<dependency>
35-
<groupId>jakarta.ws.rs</groupId>
36-
<artifactId>jakarta.ws.rs-api</artifactId>
37-
<version>3.0.0</version>
38-
</dependency>
39-
40-
<!-- For content encoding types. -->
41-
<dependency>
42-
<groupId>jakarta.mail</groupId>
43-
<artifactId>jakarta.mail-api</artifactId>
44-
<version>2.0.0</version>
45-
<scope>provided</scope>
46-
</dependency>
47-
48-
<!-- For priority annotations. -->
49-
<dependency>
50-
<groupId>jakarta.annotation</groupId>
51-
<artifactId>jakarta.annotation-api</artifactId>
52-
<version>2.0.0</version>
53-
</dependency>
54-
55-
<!-- JAXB Runtime -->
56-
<dependency>
57-
<groupId>org.glassfish.jaxb</groupId>
58-
<artifactId>jaxb-runtime</artifactId>
59-
<version>[3.0.0,)</version>
29+
<version>1.0.1</version>
6030
</dependency>
6131

6232
<!-- Helper annotations for Getter/Setters and Builders. -->
6333
<dependency>
6434
<groupId>org.projectlombok</groupId>
6535
<artifactId>lombok</artifactId>
66-
<version>[1.18.20,)</version>
6736
</dependency>
6837

6938
<!-- Google JSON parsers perform better than Moxy. -->
7039
<dependency>
7140
<groupId>com.google.code.gson</groupId>
7241
<artifactId>gson</artifactId>
73-
<version>[2.8.7,)</version>
7442
</dependency>
7543

7644
<dependency>
@@ -83,43 +51,37 @@
8351
<dependency>
8452
<groupId>commons-io</groupId>
8553
<artifactId>commons-io</artifactId>
86-
<version>[2.11.0,)</version>
54+
<version>2.11.0</version>
8755
</dependency>
8856

8957
<dependency>
9058
<groupId>org.glassfish.jersey.ext</groupId>
9159
<artifactId>jersey-proxy-client</artifactId>
92-
<version>[3.0.0,)</version>
9360
</dependency>
9461

9562
<dependency>
9663
<groupId>org.glassfish.jersey.connectors</groupId>
9764
<artifactId>jersey-apache-connector</artifactId>
98-
<version>[3.0.1,)</version>
9965
</dependency>
10066

10167
<dependency>
10268
<groupId>org.glassfish.jersey.media</groupId>
10369
<artifactId>jersey-media-moxy</artifactId>
104-
<version>[3.0.1,)</version>
10570
</dependency>
10671

10772
<dependency>
10873
<groupId>org.glassfish.jersey.bundles</groupId>
10974
<artifactId>jaxrs-ri</artifactId>
110-
<version>[3.0.1,)</version>
11175
</dependency>
11276

11377
<dependency>
11478
<groupId>org.glassfish.jersey.core</groupId>
11579
<artifactId>jersey-common</artifactId>
116-
<version>[3.0.1,)</version>
11780
</dependency>
11881

11982
<dependency>
12083
<groupId>org.apache.httpcomponents</groupId>
12184
<artifactId>httpclient</artifactId>
122-
<version>[4.5.13,)</version>
12385
</dependency>
12486

12587
<!-- Needed for certificate DN manipulation and SSL. -->
@@ -157,7 +119,6 @@
157119
<dependency>
158120
<groupId>junit</groupId>
159121
<artifactId>junit</artifactId>
160-
<version>[4.13.2,)</version>
161122
<scope>test</scope>
162123
</dependency>
163124
</dependencies>
@@ -167,7 +128,6 @@
167128
<plugin>
168129
<groupId>org.codehaus.mojo</groupId>
169130
<artifactId>versions-maven-plugin</artifactId>
170-
<version>2.5</version>
171131
<configuration>
172132
<generateBackupPoms>false</generateBackupPoms>
173133
</configuration>
@@ -239,21 +199,21 @@
239199
<dependency>
240200
<groupId>org.glassfish.jaxb</groupId>
241201
<artifactId>jaxb-xjc</artifactId>
242-
<version>3.0.0</version>
202+
<version>2.3.6</version>
243203
<scope>compile</scope>
244204
</dependency>
245205

246206
<dependency>
247207
<groupId>org.glassfish.jaxb</groupId>
248208
<artifactId>jaxb-core</artifactId>
249-
<version>3.0.0</version>
209+
<version>2.3.0.1</version>
250210
<scope>compile</scope>
251211
</dependency>
252212

253213
<dependency>
254214
<groupId>org.glassfish.jaxb</groupId>
255215
<artifactId>jaxb-runtime</artifactId>
256-
<version>3.0.0</version>
216+
<version>2.3.6</version>
257217
<scope>compile</scope>
258218
</dependency>
259219
</dependencies>

‎src/main/java/net/es/nsi/dds/lib/client/DdsClient.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
package net.es.nsi.dds.lib.client;
22

33
import com.google.common.base.Strings;
4-
import jakarta.ws.rs.client.Entity;
5-
import jakarta.ws.rs.client.WebTarget;
6-
import jakarta.ws.rs.core.HttpHeaders;
7-
import jakarta.ws.rs.core.Response;
8-
import jakarta.ws.rs.core.Response.Status;
9-
import jakarta.xml.bind.JAXBException;
104
import java.io.IOException;
115
import java.security.KeyManagementException;
126
import java.security.KeyStoreException;
@@ -17,6 +11,12 @@
1711
import java.util.Date;
1812
import java.util.Optional;
1913
import java.util.stream.Collectors;
14+
import javax.ws.rs.client.Entity;
15+
import javax.ws.rs.client.WebTarget;
16+
import javax.ws.rs.core.HttpHeaders;
17+
import javax.ws.rs.core.Response;
18+
import javax.ws.rs.core.Response.Status;
19+
import javax.xml.bind.JAXBException;
2020
import net.es.nsi.common.constants.Nsi;
2121
import net.es.nsi.common.util.UrlHelper;
2222
import net.es.nsi.dds.lib.dao.SecureType;
@@ -49,6 +49,13 @@ public DdsClient() throws KeyStoreException, IOException, NoSuchAlgorithmExcepti
4949
super();
5050
}
5151

52+
public DdsClient(int maxConnPerRoute, int maxConnTotal) throws KeyStoreException, IOException,
53+
NoSuchAlgorithmException, CertificateException, KeyManagementException, UnrecoverableKeyException,
54+
NoSuchProviderException {
55+
56+
super(maxConnPerRoute, maxConnTotal);
57+
}
58+
5259
public DdsClient(int maxConnPerRoute, int maxConnTotal, SecureType secure) throws KeyStoreException, IOException,
5360
NoSuchAlgorithmException, CertificateException, KeyManagementException, UnrecoverableKeyException,
5461
NoSuchProviderException {

‎src/main/java/net/es/nsi/dds/lib/client/RestClient.java‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
package net.es.nsi.dds.lib.client;
22

3-
import jakarta.ws.rs.client.Client;
4-
import jakarta.ws.rs.client.ClientBuilder;
5-
import jakarta.ws.rs.client.ClientRequestContext;
6-
import jakarta.ws.rs.client.ClientResponseContext;
7-
import jakarta.ws.rs.client.ClientResponseFilter;
8-
import jakarta.ws.rs.client.Entity;
9-
import jakarta.ws.rs.core.GenericEntity;
10-
import jakarta.ws.rs.core.MultivaluedMap;
11-
import jakarta.ws.rs.core.Response;
12-
import jakarta.xml.bind.JAXBElement;
133
import java.io.IOException;
144
import java.io.InputStream;
155
import java.security.KeyManagementException;
@@ -22,6 +12,16 @@
2212
import java.util.logging.Level;
2313
import javax.net.ssl.HostnameVerifier;
2414
import javax.net.ssl.SSLContext;
15+
import javax.ws.rs.client.Client;
16+
import javax.ws.rs.client.ClientBuilder;
17+
import javax.ws.rs.client.ClientRequestContext;
18+
import javax.ws.rs.client.ClientResponseContext;
19+
import javax.ws.rs.client.ClientResponseFilter;
20+
import javax.ws.rs.client.Entity;
21+
import javax.ws.rs.core.GenericEntity;
22+
import javax.ws.rs.core.MultivaluedMap;
23+
import javax.ws.rs.core.Response;
24+
import javax.xml.bind.JAXBElement;
2525
import net.es.nsi.common.constants.Nsi;
2626
import net.es.nsi.dds.lib.dao.HttpsContext;
2727
import net.es.nsi.dds.lib.dao.SecureType;
@@ -92,6 +92,16 @@ public RestClient() throws KeyStoreException, IOException, NoSuchAlgorithmExcept
9292
client = getRestClient();
9393
}
9494

95+
public RestClient(int maxConnPerRoute, int maxConnTotal) throws KeyStoreException, IOException,
96+
NoSuchAlgorithmException, CertificateException, KeyManagementException, UnrecoverableKeyException,
97+
NoSuchProviderException {
98+
99+
this.maxConnPerRoute = maxConnPerRoute;
100+
this.maxConnTotal = maxConnTotal;
101+
102+
client = getRestClient();
103+
}
104+
95105
public RestClient(int maxConnPerRoute, int maxConnTotal, SecureType secure) throws KeyStoreException, IOException,
96106
NoSuchAlgorithmException, CertificateException, KeyManagementException, UnrecoverableKeyException,
97107
NoSuchProviderException {

‎src/main/java/net/es/nsi/dds/lib/client/Result.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.es.nsi.dds.lib.client;
22

3-
import jakarta.ws.rs.core.Response.Status;
3+
import javax.ws.rs.core.Response.Status;
44
import lombok.Data;
55
import lombok.EqualsAndHashCode;
66

‎src/main/java/net/es/nsi/dds/lib/jaxb/DdsParser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package net.es.nsi.dds.lib.jaxb;
22

3-
import jakarta.xml.bind.JAXBElement;
4-
import jakarta.xml.bind.JAXBException;
53
import java.io.IOException;
64
import java.io.InputStream;
5+
import javax.xml.bind.JAXBElement;
6+
import javax.xml.bind.JAXBException;
77
import net.es.nsi.common.jaxb.JaxbParser;
88
import net.es.nsi.dds.lib.jaxb.dds.CollectionType;
99
import net.es.nsi.dds.lib.jaxb.dds.DocumentListType;

‎src/main/schema/dds/xjb/dds.xjb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<jxb:bindings version="3.0"
2-
xmlns:jxb="https://jakarta.ee/xml/ns/jaxb"
1+
<jxb:bindings version="1.0"
2+
xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
33
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
44

55
</jxb:bindings>

0 commit comments

Comments
 (0)