From 1bf9051fb0eccb8aa7b72a9aef0ca0abdc290c57 Mon Sep 17 00:00:00 2001
From: Grzegorz <gsiewruk+gitlab@gmail.com>
Date: Thu, 9 Jul 2020 12:17:18 +0200
Subject: [PATCH] jaxb to java 11

---
 pom.xml                                       | 29 +++++++++++++++++--
 .../bst/mixer/openvas/OpenVasClient.java      |  1 -
 src/main/resources/application.properties     |  3 +-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5707145..c13846b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,9 +64,24 @@
 		    <version>2.8.5</version>
 		</dependency>
 		<dependency>
-		    <groupId>javax.xml.bind</groupId>
-		    <artifactId>jaxb-api</artifactId>
-		    <version>2.3.0</version>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-core</artifactId>
+			<version>2.3.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.25.0-GA</version>
 		</dependency>
 
 	</dependencies>
@@ -79,6 +94,14 @@
 			</plugin>
 		</plugins>
 	</build>
+	<distributionManagement>
+		<repository>
+			<id>github</id>
+			<name>GitHub OWNER Apache Maven Packages</name>
+			<url>https://maven.pkg.github.com/Mixeway/MixewayOpenVASRestAPI</url>
+		</repository>
+	</distributionManagement>
+
 
 
 </project>
diff --git a/src/main/java/pl/orange/bst/mixer/openvas/OpenVasClient.java b/src/main/java/pl/orange/bst/mixer/openvas/OpenVasClient.java
index 2c369a5..b345415 100644
--- a/src/main/java/pl/orange/bst/mixer/openvas/OpenVasClient.java
+++ b/src/main/java/pl/orange/bst/mixer/openvas/OpenVasClient.java
@@ -158,7 +158,6 @@ private String getCreateTaskResponse(User user, HashMap<String, String> params)
 	}
 	private String getConfigResponse(User user) throws SAXException, IOException, ParserConfigurationException, JAXBException {
 		ProcessBuilder pb = new ProcessBuilder("bash", "-c", "gvm-cli socket --socketpath "+socket+" --xml \""+xob.buildGetConfig(user)+"\"");
-		System.out.println("gvm-cli socket --socketpath "+socket+" --xml \""+xob.buildGetConfig(user)+"\"");
 		String output = IOUtils.toString(pb.start().getInputStream());
 		Document doc = DocumentBuilderFactory.newInstance()
                 .newDocumentBuilder()
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 592c04e..231d01b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,8 @@
-server.port: 8443
+server.port: 8444
 server.ssl.key-store: pki/localhost.p12
 server.ssl.key-store-password: changeit
 server.ssl.keyStoreType: PKCS12
+server.ssl.key-alias=mixer
 server.ssl.trust-store=etc/pki/trust.jks
 server.ssl.trust-store-password=changeit
 server.ssl.client-auth=need