Skip to content

Commit 53e9ee4

Browse files
committed
Build on Java 9
Updated couple incompatible Maven plugins, removed usage of inaccessible class.
1 parent d69bc96 commit 53e9ee4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

driver/src/main/java/org/neo4j/driver/internal/util/CertificateTool.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import java.security.cert.Certificate;
3131
import java.security.cert.CertificateException;
3232
import java.security.cert.CertificateFactory;
33-
import javax.xml.bind.DatatypeConverter;
33+
import java.util.Base64;
3434

3535
/**
3636
* A tool related to save, load certs, etc.
@@ -89,7 +89,7 @@ public static void saveX509Cert( Certificate[] certs, File certFile ) throws Gen
8989

9090
for ( Certificate cert : certs )
9191
{
92-
String certStr = DatatypeConverter.printBase64Binary( cert.getEncoded() ).replaceAll( "(.{64})", "$1\n" );
92+
String certStr = Base64.getEncoder().encodeToString( cert.getEncoded() ).replaceAll( "(.{64})", "$1\n" );
9393

9494
writer.write( BEGIN_CERT );
9595
writer.newLine();

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<plugin>
134134
<groupId>org.apache.maven.plugins</groupId>
135135
<artifactId>maven-source-plugin</artifactId>
136-
<version>2.4</version>
136+
<version>3.0.1</version>
137137
<executions>
138138
<execution>
139139
<id>attach-sources</id>
@@ -146,7 +146,7 @@
146146
<plugin>
147147
<groupId>org.apache.maven.plugins</groupId>
148148
<artifactId>maven-javadoc-plugin</artifactId>
149-
<version>2.9.1</version>
149+
<version>3.0.0</version>
150150
<configuration>
151151
<charset>UTF-8</charset>
152152
<docencoding>UTF-8</docencoding>
@@ -157,7 +157,7 @@
157157
<script>hljs.initHighlightingOnLoad();</script>
158158
]]></top>
159159
<!-- Required for Java 8u121 or later. See https://github.com/neo4j/neo4j-java-driver/pull/318 -->
160-
<additionalparam>--allow-script-in-comments</additionalparam>
160+
<additionalOptions>--allow-script-in-comments</additionalOptions>
161161
</configuration>
162162
<executions>
163163
<execution>

0 commit comments

Comments
 (0)