Skip to content

Commit 43d73b3

Browse files
authored
Merge pull request #464 from lutovich/1.5-java9
Build on Java 9
2 parents d69bc96 + b066580 commit 43d73b3

File tree

4 files changed

+17
-21
lines changed

4 files changed

+17
-21
lines changed

driver/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -312,14 +312,6 @@
312312
<plugin>
313313
<groupId>pl.project13.maven</groupId>
314314
<artifactId>git-commit-id-plugin</artifactId>
315-
<version>2.1.13</version>
316-
<executions>
317-
<execution>
318-
<goals>
319-
<goal>revision</goal>
320-
</goals>
321-
</execution>
322-
</executions>
323315
</plugin>
324316
</plugins>
325317
</build>

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();

examples/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,6 @@
162162
<plugin>
163163
<groupId>pl.project13.maven</groupId>
164164
<artifactId>git-commit-id-plugin</artifactId>
165-
<version>2.1.13</version>
166-
<executions>
167-
<execution>
168-
<goals>
169-
<goal>revision</goal>
170-
</goals>
171-
</execution>
172-
</executions>
173165
</plugin>
174166
</plugins>
175167
</build>

pom.xml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,18 @@
9191
</execution>
9292
</executions>
9393
</plugin>
94+
<plugin>
95+
<groupId>pl.project13.maven</groupId>
96+
<artifactId>git-commit-id-plugin</artifactId>
97+
<version>2.2.4</version>
98+
<executions>
99+
<execution>
100+
<goals>
101+
<goal>revision</goal>
102+
</goals>
103+
</execution>
104+
</executions>
105+
</plugin>
94106
</plugins>
95107
</pluginManagement>
96108
<plugins>
@@ -133,7 +145,7 @@
133145
<plugin>
134146
<groupId>org.apache.maven.plugins</groupId>
135147
<artifactId>maven-source-plugin</artifactId>
136-
<version>2.4</version>
148+
<version>3.0.1</version>
137149
<executions>
138150
<execution>
139151
<id>attach-sources</id>
@@ -146,7 +158,7 @@
146158
<plugin>
147159
<groupId>org.apache.maven.plugins</groupId>
148160
<artifactId>maven-javadoc-plugin</artifactId>
149-
<version>2.9.1</version>
161+
<version>3.0.0</version>
150162
<configuration>
151163
<charset>UTF-8</charset>
152164
<docencoding>UTF-8</docencoding>
@@ -157,7 +169,7 @@
157169
<script>hljs.initHighlightingOnLoad();</script>
158170
]]></top>
159171
<!-- Required for Java 8u121 or later. See https://github.com/neo4j/neo4j-java-driver/pull/318 -->
160-
<additionalparam>--allow-script-in-comments</additionalparam>
172+
<additionalOptions>--allow-script-in-comments</additionalOptions>
161173
</configuration>
162174
<executions>
163175
<execution>

0 commit comments

Comments
 (0)