Migrating to Java 17.

Rothamsted · Jul 27, 2023 · c3d9273 · c3d9273
1 parent c0ebf09
commit c3d9273
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,21 +22,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+    - name: Set up JDK
+      uses: actions/setup-java@v3
       with:
-        distribution: 'adopt'
-        java-version: 11
+        distribution: 'temurin'
+        java-version: 17
         settings-path: ${{ github.workspace }} # location for the settings.xml file
 
     - name: Cache Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.m2
-        key: ${{ runner.os }}-m2-v6-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2-v6
+        key: ${{ runner.os }}-m2-v7-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2-v7
 
     - name: Build
       env:

diff --git a/neo4j-utils/pom.xml b/neo4j-utils/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>uk.ac.rothamsted.kg</groupId>
     <artifactId>rdf2pg-pom</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
   </parent>
 
 

diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
   <artifactId>rdf2pg-pom</artifactId>
   <packaging>pom</packaging>
 
-  <version>4.0.2-SNAPSHOT</version>
+  <version>5.0-SNAPSHOT</version>
 
   <name>rdf2pg-pom - top POM</name>
   <url>https://github.com/Rothamsted/rdf2pg</url>
@@ -149,6 +149,7 @@
 				-->
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
+					<version>3.6.0</version>
 					<configuration>
 						<archiverConfig>
 							<fileMode>0755</fileMode>

diff --git a/rdf2graphml-cli/pom.xml b/rdf2graphml-cli/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
     <artifactId>rdf2pg-pom</artifactId>
     <groupId>uk.ac.rothamsted.kg</groupId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
   </parent>
 
 	<artifactId>rdf2graphml-cli</artifactId>

diff --git a/rdf2graphml/pom.xml b/rdf2graphml/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>uk.ac.rothamsted.kg</groupId>
     <artifactId>rdf2pg-pom</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>rdf2graphml</artifactId>

diff --git a/rdf2neo-cli/pom.xml b/rdf2neo-cli/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
     <artifactId>rdf2pg-pom</artifactId>
     <groupId>uk.ac.rothamsted.kg</groupId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
   </parent>
 
 	<artifactId>rdf2neo-cli</artifactId>

diff --git a/rdf2neo-cli/src/main/assembly/resources/examples/dbpedia/config.xml b/rdf2neo-cli/src/main/assembly/resources/examples/dbpedia/config.xml
@@ -137,7 +137,8 @@
 		<constructor-arg>
 			<bean class = "org.neo4j.driver.AuthTokens" factory-method = "basic">
 				<constructor-arg value = "neo4j" />
-				<constructor-arg value = "test" />
+				<!-- Since 5.10, Neo4j wants >8 passwords -->
+				<constructor-arg value = "testTest" />
 			</bean>
 		</constructor-arg>
 

diff --git a/rdf2neo-cli/src/test/resources/test_config.xml b/rdf2neo-cli/src/test/resources/test_config.xml
@@ -19,7 +19,7 @@
 		<constructor-arg>
 			<bean class = "org.neo4j.driver.AuthTokens" factory-method = "basic">
 				<constructor-arg value = "neo4j" />
-				<constructor-arg value = "test" />
+				<constructor-arg value = "testTest" />
 			</bean>
 		</constructor-arg>
 

diff --git a/rdf2neo/pom.xml b/rdf2neo/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>uk.ac.rothamsted.kg</groupId>
     <artifactId>rdf2pg-pom</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>rdf2neo</artifactId>

diff --git a/rdf2neo/src/main/java/uk/ac/rothamsted/kg/rdf2pg/neo4j/test/NeoTestUtils.java b/rdf2neo/src/main/java/uk/ac/rothamsted/kg/rdf2pg/neo4j/test/NeoTestUtils.java
@@ -16,7 +16,7 @@ public class NeoTestUtils
 {
 	public static final String NEO_TEST_URL = "bolt://127.0.0.1:17690";
 	public static final String NEO_TEST_USER = "neo4j";
-	public static final String NEO_TEST_PWD = "test";
+	public static final String NEO_TEST_PWD = "testTest";
 
 
 	/**

diff --git a/rdf2neo/src/test/resources/multi_config.xml b/rdf2neo/src/test/resources/multi_config.xml
@@ -109,7 +109,7 @@
 		<constructor-arg>
 			<bean class = "org.neo4j.driver.AuthTokens" factory-method = "basic">
 				<constructor-arg value = "neo4j" />
-				<constructor-arg value = "test" />
+				<constructor-arg value = "testTest" />
 			</bean>
 		</constructor-arg>
 

diff --git a/rdf2neo/src/test/resources/multi_config_indexing.xml b/rdf2neo/src/test/resources/multi_config_indexing.xml
@@ -120,7 +120,7 @@
 		<constructor-arg>
 			<bean class = "org.neo4j.driver.AuthTokens" factory-method = "basic">
 				<constructor-arg value = "neo4j" />
-				<constructor-arg value = "test" />
+				<constructor-arg value = "testTest" />
 			</bean>
 		</constructor-arg>
 

diff --git a/rdf2neo/src/test/resources/test_config.xml b/rdf2neo/src/test/resources/test_config.xml
@@ -45,7 +45,7 @@
 		<constructor-arg>
 			<bean class = "org.neo4j.driver.AuthTokens" factory-method = "basic">
 				<constructor-arg value = "neo4j" />
-				<constructor-arg value = "test" />
+				<constructor-arg value = "testTest" />
 			</bean>
 		</constructor-arg>
 	</bean>

diff --git a/rdf2pg-core-cli/pom.xml b/rdf2pg-core-cli/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
     <artifactId>rdf2pg-pom</artifactId>
     <groupId>uk.ac.rothamsted.kg</groupId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
   </parent>
 
 	<artifactId>rdf2pg-core-cli</artifactId>

diff --git a/rdf2pg-core/pom.xml b/rdf2pg-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>uk.ac.rothamsted.kg</groupId>
     <artifactId>rdf2pg-pom</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>rdf2pg-core</artifactId>

diff --git a/revision_history.md b/revision_history.md
@@ -7,9 +7,6 @@
 
 ## 5.0
 * Migrated to Java 17. **WARNING: no backward compatibility guaranteed**.
-* Neo4j dependency upgraded to 5.10.x
-* Neo4j server plug-in upgraded (following from above)
-
 
 ## 4.1
 * Generalisation of the indexing functionality, with default simple TSV indexer