Complement to bamaer upgrade commits

And check with examples Change-Id: Ie12acfe8465adb7067c54f4c7a90986749b0196c
atolcd · Oct 23, 2023 · c9f0732 · c9f0732
1 parent 504c9c7
commit c9f0732
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/assemblies/src/assembly/assembly.xml b/assemblies/src/assembly/assembly.xml
@@ -52,7 +52,7 @@
         <include>org.geolatte:geolatte-geom:jar</include>
         <include>oracle:sdoutl:jar</include>
         <include>oracle:sdoapi:jar</include>
-        <include>com.oracle.database.jdbc:ojdbc8:jar</include>
+        <include>com.oracle.database.jdbc:ojdbc11:jar</include>
         <include>com.j256.ormlite:ormlite-jdbc:jar</include>
         <include>org.jdom:jdom2:jar</include>
         <include>mil.nga:sf:jar</include>

diff --git a/concave-hull/pom.xml b/concave-hull/pom.xml
@@ -24,7 +24,7 @@
         <version>3.2</version>
         <configuration>
           <source>1.8</source>
-          <target>1.8</target>
+          <target>11</target>
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>

diff --git a/docker/hop-gis/Dockerfile b/docker/hop-gis/Dockerfile
@@ -1,4 +1,4 @@
-ARG HOP_VERSION=1.1.0
+ARG HOP_VERSION=2.6.0
 # --------------------
 # Build artefacts - hop-gis-plugins
 # --------------------
@@ -16,5 +16,5 @@ FROM apache/hop:${HOP_VERSION}
 WORKDIR /app
 # Builder
 COPY --from=builder /app/assemblies/target/gis-plugin-assemblies-*.zip /tmp/
-RUN unzip /tmp/gis-plugin-assemblies-*.zip -d ${DEPLOYMENT_PATH}/hop/plugins/ &&\
+RUN unzip /tmp/gis-plugin-assemblies-*.zip -d ${DEPLOYMENT_PATH}/plugins/ &&\
   rm /tmp/gis-plugin-assemblies-*.zip
diff --git a/hop-gis-plugins/pom.xml b/hop-gis-plugins/pom.xml
@@ -17,8 +17,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.7.0</version>
         <configuration>
-          <source>8</source>
-          <target>8</target>
+          <source>11</source>
+          <target>11</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/pom.xml b/pom.xml
@@ -230,8 +230,8 @@
     </dependency>
     <dependency>
       <groupId>com.oracle.database.jdbc</groupId>
-      <artifactId>ojdbc8</artifactId>
-      <version>21.3.0.0</version>
+      <artifactId>ojdbc11</artifactId>
+      <version>23.3.0.23.09</version>
     </dependency>
     <dependency>
       <groupId>org.postgresql</groupId>