Skip to content

Commit 281f57e

Browse files
authored
Merge pull request #2 from Mixeway/v1.0.1
jaxb to java 11
2 parents 84c1f43 + 1bf9051 commit 281f57e

File tree

3 files changed

+28
-5
lines changed

3 files changed

+28
-5
lines changed

pom.xml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,24 @@
6464
<version>2.8.5</version>
6565
</dependency>
6666
<dependency>
67-
<groupId>javax.xml.bind</groupId>
68-
<artifactId>jaxb-api</artifactId>
69-
<version>2.3.0</version>
67+
<groupId>com.sun.xml.bind</groupId>
68+
<artifactId>jaxb-core</artifactId>
69+
<version>2.3.0.1</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>javax.xml.bind</groupId>
73+
<artifactId>jaxb-api</artifactId>
74+
<version>2.3.1</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>com.sun.xml.bind</groupId>
78+
<artifactId>jaxb-impl</artifactId>
79+
<version>2.3.1</version>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.javassist</groupId>
83+
<artifactId>javassist</artifactId>
84+
<version>3.25.0-GA</version>
7085
</dependency>
7186

7287
</dependencies>
@@ -79,6 +94,14 @@
7994
</plugin>
8095
</plugins>
8196
</build>
97+
<distributionManagement>
98+
<repository>
99+
<id>github</id>
100+
<name>GitHub OWNER Apache Maven Packages</name>
101+
<url>https://maven.pkg.github.com/Mixeway/MixewayOpenVASRestAPI</url>
102+
</repository>
103+
</distributionManagement>
104+
82105

83106

84107
</project>

src/main/java/pl/orange/bst/mixer/openvas/OpenVasClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ private String getCreateTaskResponse(User user, HashMap<String, String> params)
158158
}
159159
private String getConfigResponse(User user) throws SAXException, IOException, ParserConfigurationException, JAXBException {
160160
ProcessBuilder pb = new ProcessBuilder("bash", "-c", "gvm-cli socket --socketpath "+socket+" --xml \""+xob.buildGetConfig(user)+"\"");
161-
System.out.println("gvm-cli socket --socketpath "+socket+" --xml \""+xob.buildGetConfig(user)+"\"");
162161
String output = IOUtils.toString(pb.start().getInputStream());
163162
Document doc = DocumentBuilderFactory.newInstance()
164163
.newDocumentBuilder()

src/main/resources/application.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
server.port: 8443
1+
server.port: 8444
22
server.ssl.key-store: pki/localhost.p12
33
server.ssl.key-store-password: changeit
44
server.ssl.keyStoreType: PKCS12
5+
server.ssl.key-alias=mixer
56
server.ssl.trust-store=etc/pki/trust.jks
67
server.ssl.trust-store-password=changeit
78
server.ssl.client-auth=need

0 commit comments

Comments
 (0)