a

GDATASoftwareAG · Aug 30, 2023 · a8261d7 · a8261d7
1 parent 00d3d17
commit a8261d7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/janusgraph-dist/docker/Dockerfile b/janusgraph-dist/docker/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BASE_IMAGE=eclipse-temurin:11-jre
+ARG BASE_IMAGE=eclipse-temurin:17-jre
 
 FROM debian:buster-slim as builder
 

diff --git a/janusgraph-dist/pom.xml b/janusgraph-dist/pom.xml
@@ -26,7 +26,7 @@
 
         <packname.standard>janusgraph-${project.version}</packname.standard>
         <packname.full>janusgraph-full-${project.version}</packname.full>
-        <docker.baseimage>eclipse-temurin:11-jre</docker.baseimage>
+        <docker.baseimage>eclipse-temurin:17-jre</docker.baseimage>
         <docker.tag-suffix></docker.tag-suffix>
 
         <!-- Variables for integration testing on release-candidate archive files -->

diff --git a/janusgraph-dist/src/assembly/static/bin/janusgraph-server.sh b/janusgraph-dist/src/assembly/static/bin/janusgraph-server.sh
@@ -112,7 +112,7 @@ if [[ -z "$JAVA_OPTIONS_FILE" ]]; then
   if [[ $jver == "1.8" ]]; then                
     JAVA_OPTIONS_FILE="$JANUSGRAPH_CONF/jvm-8.options"
   else
-    JAVA_OPTIONS_FILE="$JANUSGRAPH_CONF/jvm-11.options"
+    JAVA_OPTIONS_FILE="$JANUSGRAPH_CONF/jvm.options"
   fi
 fi
 if [[ -f "$JAVA_OPTIONS_FILE" ]]; then

diff --git a/...t/src/assembly/static/conf/jvm-11.options → ...dist/src/assembly/static/conf/jvm.options b/...t/src/assembly/static/conf/jvm-11.options → ...dist/src/assembly/static/conf/jvm.options
diff --git a/pom.xml b/pom.xml
@@ -57,9 +57,10 @@
     <properties>
         <titan.compatible-versions>1.0.0,1.1.0-SNAPSHOT</titan.compatible-versions>
         <tinkerpop.version>3.7.0</tinkerpop.version>
-        <junit-platform.version>1.9.3</junit-platform.version>
-        <junit.version>5.9.3</junit.version>
-        <mockito.version>4.11.0</mockito.version>
+        <junit-platform.version>1.10.0</junit-platform.version>
+        <junit.version>5.10.0</junit.version>
+        <mockito.version>5.5.0</mockito.version>
+        <mockito-inline.version>5.2.0</mockito-inline.version>
         <jamm.version>0.3.3</jamm.version>
         <metrics.version>4.2.19</metrics.version>
         <slf4j.version>1.7.36</slf4j.version>
@@ -93,8 +94,9 @@
         <test.skip.tp>true</test.skip.tp>
         <top.level.basedir>${basedir}</top.level.basedir>
         <maven.javadoc.version>3.5.0</maven.javadoc.version>
-        <compiler.source>17</compiler.source>
-        <compiler.target>17</compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
         <test.excluded.groups>MEMORY_TESTS,PERFORMANCE_TESTS,BRITTLE_TESTS</test.excluded.groups>
         <dependency.locations.enabled>false</dependency.locations.enabled>
         <cassandra.version>3.11.10</cassandra.version>
@@ -360,8 +362,6 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.11.0</version>
                     <configuration>
-                        <source>${compiler.source}</source>
-                        <target>${compiler.target}</target>
                         <compilerArguments>
                             <Xmaxerrs>500</Xmaxerrs>
                         </compilerArguments>
@@ -913,7 +913,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-inline</artifactId>
-                <version>${mockito.version}</version>
+                <version>${mockito-inline.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
@@ -1464,13 +1464,14 @@
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
-                                <phase>package</phase>
+                                <phase>none</phase>
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>
                                 <configuration>
                                     <!-- Quiet mode still shows warnings and errors -->
                                     <quiet>true</quiet>
+                                    <doclint>none</doclint>
                                 </configuration>
                             </execution>
                         </executions>