Skip to content

Commit 44eb274

Browse files
zhenlineozhenlineo
authored
Merge pull request #465 from lutovich/1.5-pom-cleanup
POM cleanups & improvements
2 parents 43d73b3 + 41d8abb commit 44eb274

File tree

8 files changed

+175
-203
lines changed

8 files changed

+175
-203
lines changed

‎driver/src/main/resources/license-header.txt‎ renamed to ‎build/license-header.txt‎

File renamed without changes.

‎driver/pom.xml‎

Lines changed: 10 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<properties>
7-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8-
<build.revision></build.revision>
97
<bundle.name>${project.groupId}.${project.artifactId}</bundle.name>
108
<maven.build.timestamp.format>'v'yyyyMMdd-HHmm</maven.build.timestamp.format>
11-
<netty.version>4.1.16.Final</netty.version>
9+
<moduleName>org.neo4j.driver</moduleName>
10+
<rootDir>${project.basedir}/..</rootDir>
1211
</properties>
1312

1413
<parent>
@@ -23,91 +22,59 @@
2322
<packaging>jar</packaging>
2423
<name>Neo4j Java Driver</name>
2524
<description>Access to the Neo4j graph database through Java</description>
26-
<url>https://github.com/neo4j/neo4j-java-driver</url>
27-
28-
<licenses>
29-
<license>
30-
<name>Apache License, Version 2</name>
31-
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
32-
</license>
33-
</licenses>
3425

3526
<dependencies>
36-
<dependency>
37-
<groupId>io.netty</groupId>
38-
<artifactId>netty-handler</artifactId>
39-
<version>${netty.version}</version>
40-
</dependency>
27+
<!-- Compile dependencies -->
28+
<dependency>
29+
<groupId>io.netty</groupId>
30+
<artifactId>netty-handler</artifactId>
31+
</dependency>
4132

42-
<!-- Test dependencies -->
33+
<!-- Test dependencies -->
4334
<dependency>
4435
<groupId>org.hamcrest</groupId>
4536
<artifactId>hamcrest-library</artifactId>
46-
<scope>test</scope>
4737
</dependency>
4838
<dependency>
4939
<groupId>org.hamcrest</groupId>
5040
<artifactId>hamcrest-core</artifactId>
51-
<scope>test</scope>
5241
</dependency>
5342
<dependency>
5443
<groupId>org.mockito</groupId>
5544
<artifactId>mockito-core</artifactId>
56-
<scope>test</scope>
5745
</dependency>
5846
<dependency>
5947
<groupId>junit</groupId>
6048
<artifactId>junit</artifactId>
61-
<scope>test</scope>
6249
</dependency>
6350
<dependency>
6451
<groupId>org.rauschig</groupId>
6552
<artifactId>jarchivelib</artifactId>
66-
<version>0.5.0</version>
67-
<scope>test</scope>
6853
</dependency>
6954
<dependency>
7055
<groupId>org.bouncycastle</groupId>
7156
<artifactId>bcprov-jdk15on</artifactId>
72-
<version>1.52</version>
73-
<scope>test</scope>
7457
</dependency>
7558
<dependency>
7659
<groupId>org.bouncycastle</groupId>
7760
<artifactId>bcpkix-jdk15on</artifactId>
78-
<version>1.52</version>
79-
<scope>test</scope>
8061
</dependency>
8162
<dependency>
8263
<groupId>info.cukes</groupId>
8364
<artifactId>cucumber-junit</artifactId>
84-
<version>1.2.4</version>
85-
<scope>test</scope>
8665
</dependency>
8766
<dependency>
8867
<groupId>info.cukes</groupId>
8968
<artifactId>cucumber-java</artifactId>
90-
<version>1.2.4</version>
91-
<scope>test</scope>
9269
</dependency>
9370
<dependency>
9471
<groupId>com.fasterxml.jackson.core</groupId>
9572
<artifactId>jackson-databind</artifactId>
96-
<version>2.6.0</version>
97-
<scope>test</scope>
9873
</dependency>
9974
</dependencies>
10075

10176
<build>
10277
<plugins>
103-
<plugin>
104-
<artifactId>maven-compiler-plugin</artifactId>
105-
<version>2.3.2</version>
106-
<configuration>
107-
<source>${java.version}</source>
108-
<target>${java.version}</target>
109-
</configuration>
110-
</plugin>
11178
<plugin>
11279
<groupId>org.codehaus.mojo</groupId>
11380
<artifactId>clirr-maven-plugin</artifactId>
@@ -143,9 +110,6 @@
143110
<groupId>org.apache.maven.plugins</groupId>
144111
<artifactId>maven-javadoc-plugin</artifactId>
145112
<configuration>
146-
<charset>UTF-8</charset>
147-
<docencoding>UTF-8</docencoding>
148-
<encoding>UTF-8</encoding>
149113
<sourceFileIncludes>
150114
<sourceFileInclude>org/neo4j/driver/v1/**/*.java</sourceFileInclude>
151115
</sourceFileIncludes>
@@ -154,7 +118,6 @@
154118
<plugin>
155119
<groupId>org.apache.maven.plugins</groupId>
156120
<artifactId>maven-jar-plugin</artifactId>
157-
<version>2.5</version>
158121
<executions>
159122
<execution>
160123
<goals>
@@ -172,14 +135,15 @@
172135
<manifestEntries>
173136
<!-- This is used to programatically determine the driver version -->
174137
<Implementation-Version>${project.version}-${build.revision}</Implementation-Version>
138+
<!-- Stable module name for JDK9 automatic modules -->
139+
<Automatic-Module-Name>${moduleName}</Automatic-Module-Name>
175140
</manifestEntries>
176141
</archive>
177142
</configuration>
178143
</plugin>
179144
<plugin>
180145
<groupId>org.codehaus.mojo</groupId>
181146
<artifactId>build-helper-maven-plugin</artifactId>
182-
<version>1.12</version>
183147
<executions>
184148
<execution>
185149
<id>set-osgi-version</id>
@@ -193,7 +157,6 @@
193157
<plugin>
194158
<groupId>org.apache.felix</groupId>
195159
<artifactId>maven-bundle-plugin</artifactId>
196-
<version>3.2.0</version>
197160
<extensions>true</extensions>
198161
<executions>
199162
<execution>
@@ -217,15 +180,9 @@
217180
</instructions>
218181
</configuration>
219182
</plugin>
220-
<plugin>
221-
<groupId>org.apache.maven.plugins</groupId>
222-
<artifactId>maven-surefire-plugin</artifactId>
223-
<version>2.20.1</version>
224-
</plugin>
225183
<plugin>
226184
<groupId>org.apache.maven.plugins</groupId>
227185
<artifactId>maven-failsafe-plugin</artifactId>
228-
<version>2.20.1</version>
229186
<configuration>
230187
<!--
231188
Failsafe plugin starting from 2.19 by default runs tests from 'target/test-classes' against a package jar.
@@ -237,19 +194,10 @@
237194
-->
238195
<classesDirectory>${project.build.directory}/classes</classesDirectory>
239196
</configuration>
240-
<executions>
241-
<execution>
242-
<goals>
243-
<goal>integration-test</goal>
244-
<goal>verify</goal>
245-
</goals>
246-
</execution>
247-
</executions>
248197
</plugin>
249198
<plugin>
250199
<groupId>org.apache.maven.plugins</groupId>
251200
<artifactId>maven-shade-plugin</artifactId>
252-
<version>3.1.0</version>
253201
<executions>
254202
<execution>
255203
<phase>package</phase>
@@ -276,46 +224,4 @@
276224
</plugins>
277225
</build>
278226

279-
<profiles>
280-
<profile>
281-
<id>default-tools.jar</id>
282-
<activation>
283-
<property>
284-
<name>java.vendor</name>
285-
<value>Sun Microsystems Inc.</value>
286-
</property>
287-
</activation>
288-
<dependencies>
289-
<dependency>
290-
<groupId>com.sun</groupId>
291-
<artifactId>tools</artifactId>
292-
<version>1.4.2</version>
293-
<scope>system</scope>
294-
<systemPath>${java.home}/../lib/tools.jar</systemPath>
295-
</dependency>
296-
</dependencies>
297-
</profile>
298-
<!-- If a revision has not been explicitly set, sort it out by looking at git metadata -->
299-
<profile>
300-
<id>determine-revision</id>
301-
<activation>
302-
<activeByDefault>false</activeByDefault>
303-
<property>
304-
<name>!build.revision</name>
305-
</property>
306-
</activation>
307-
<properties>
308-
<build.revision>${git.commit.id.abbrev}</build.revision>
309-
</properties>
310-
<build>
311-
<plugins>
312-
<plugin>
313-
<groupId>pl.project13.maven</groupId>
314-
<artifactId>git-commit-id-plugin</artifactId>
315-
</plugin>
316-
</plugins>
317-
</build>
318-
</profile>
319-
</profiles>
320-
321227
</project>

‎driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ public String lastBookmark()
249249
}
250250

251251
@Override
252+
@SuppressWarnings( "deprecation" )
252253
public void reset()
253254
{
254255
Futures.blockingGet( resetAsync(),

‎driver/src/test/java/org/neo4j/driver/v1/GraphDatabaseTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ public void boltPlusDiscoverySchemeShouldInstantiateClusterDriver() throws Excep
8989
}
9090

9191
@Test
92+
@SuppressWarnings( "deprecation" )
9293
public void boltPlusDiscoverySchemeShouldNotSupportTrustOnFirstUse()
9394
{
9495
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );

‎driver/src/test/java/org/neo4j/driver/v1/tck/tck/util/ResultParser.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
import org.neo4j.driver.internal.value.PathValue;
3838
import org.neo4j.driver.internal.value.RelationshipValue;
3939
import org.neo4j.driver.internal.value.StringValue;
40-
import org.neo4j.driver.v1.types.Entity;
41-
import org.neo4j.driver.v1.types.Path;
4240
import org.neo4j.driver.v1.Value;
4341
import org.neo4j.driver.v1.Values;
42+
import org.neo4j.driver.v1.types.Entity;
43+
import org.neo4j.driver.v1.types.Path;
4444

4545
import static java.lang.String.format;
4646
import static org.junit.Assert.assertEquals;
@@ -359,6 +359,7 @@ public static String[] getList( String resultValue )
359359
return resultValue.substring( 1, resultValue.length() - 1 ).split( ", " );
360360
}
361361

362+
@SuppressWarnings( "unchecked" )
362363
public static Map<String,Object> getMapOfObjects( String input, boolean normalInts )
363364
{
364365
Map<String,Object> properties = new HashMap<>();

‎driver/src/test/java/org/neo4j/driver/v1/util/cc/Cluster.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,6 @@ private static Config driverConfig()
420420
.withTrustStrategy( trustAllCertificates() )
421421
.withEncryption()
422422
.withMaxConnectionPoolSize( 1 )
423-
.withMaxIdleConnections( 1 )
424423
.withConnectionLivenessCheckTimeout( 1, TimeUnit.HOURS )
425424
.toConfig();
426425
}

0 commit comments

Comments
 (0)