Merge pull request #259 from eclipse-basyx/development-release

Development release
eclipse-basyx · Apr 3, 2023 · c3efd1e · c3efd1e
2 parents 80b5759 + 02147e2
commit c3efd1e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.eclipse.basyx</groupId>
 	<artifactId>basyx.sdk</artifactId>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.4.0</version>
 	<name>BaSyx SDK</name>
 	<description>BaSyx Software Development Kit</description>
 	<url>https://www.eclipse.org/basyx/</url>

diff --git a/src/main/java/org/eclipse/basyx/vab/protocol/https/JerseyHttpsClientFactory.java b/src/main/java/org/eclipse/basyx/vab/protocol/https/JerseyHttpsClientFactory.java
@@ -33,7 +33,6 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
 
 import org.apache.http.conn.ssl.DefaultHostnameVerifier;
 import org.glassfish.jersey.client.JerseyClientBuilder;

diff --git a/...test/java/org/eclipse/basyx/testsuite/regression/submodel/restapi/TestHttpFileUpload.java b/...test/java/org/eclipse/basyx/testsuite/regression/submodel/restapi/TestHttpFileUpload.java
@@ -121,6 +121,7 @@ public void fileUploadedCorrectly() throws IOException {
 
 	}
 
+	@SuppressWarnings("deprecation")
 	private CloseableHttpResponse uploadDummyFileToSubmodelElement(String submodelElementIdShort) throws IOException {
 		CloseableHttpClient client = HttpClients.createDefault();
 
@@ -140,6 +141,7 @@ private CloseableHttpResponse uploadDummyFileToSubmodelElement(String submodelEl
 		return client.execute(uploadFile);
 	}
 
+	@SuppressWarnings("deprecation")
 	private CloseableHttpResponse uploadDummyAAS()
 			throws FileNotFoundException, IOException, UnsupportedEncodingException, ClientProtocolException {
 		File file = ResourceUtils.getFile("src/test/resources/aas/dummyAAS.json");
@@ -154,6 +156,7 @@ private CloseableHttpResponse uploadDummyAAS()
 		return client.execute(put);
 	}
 
+	@SuppressWarnings("deprecation")
 	private CloseableHttpResponse uploadDummySubmodel()
 			throws FileNotFoundException, IOException, UnsupportedEncodingException, ClientProtocolException {
 		File file = ResourceUtils.getFile("src/test/resources/aas/dummySubmodel.json");