Update dependencies

#983
linkedpipes · Jul 7, 2024 · 67138b2 · 67138b2
1 parent c675ae8
commit 67138b2
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ LinkedPipes ETL is an RDF based, lightweight ETL tool.
 - [Docker Compose] is optional as `docker compose` is supported by modern versions of [Docker] 
 
 ### For building locally
-- [Java] 17, 18, 20
+- [Java] 21, 22
 - [Git]
 - Optionally [Maven]
 - [Node.js] 18 & npm

diff --git a/docker-compose.develop.yml b/docker-compose.develop.yml
@@ -0,0 +1,69 @@
+#
+# WARNING:
+# This is development version of Docker compose file, it can build the images
+# from local files instead of using the published version.
+#
+# Environment variables:
+# * LP_ETL_DOMAIN - URL prefix, for example http://localhost:9080
+# * LP_ETL_PORT - port number to expose LP-ETL on
+# * LP_VERSION - 'main' by default or 'develop'
+#
+#
+services:
+  storage:
+    image: ghcr.io/linkedpipes/etl-storage:${LP_VERSION-main}
+    build:
+      context: .
+      dockerfile: storage/Dockerfile
+    volumes:
+      - data-storage:/data/lp-etl/storage
+      - configuration:/data/lp-etl/configuration
+      - data-logs:/data/lp-etl/logs
+    environment:
+      - LP_ETL_DOMAIN
+    restart: always
+  frontend:
+    image: ghcr.io/linkedpipes/etl-frontend:${LP_VERSION-main}
+    build:
+      context: .
+      dockerfile: frontend/Dockerfile
+    volumes:
+      - configuration:/data/lp-etl/configuration
+      - data-logs:/data/lp-etl/logs
+    ports:
+      - ${LP_ETL_PORT-8080}:8080
+    environment:
+      - LP_ETL_DOMAIN
+    restart: always
+  executor-monitor:
+    image: ghcr.io/linkedpipes/etl-executor-monitor:${LP_VERSION-main}
+    build:
+      context: .
+      dockerfile: executor-monitor/Dockerfile
+    volumes:
+      - data-execution:/data/lp-etl/executor
+      - data-logs:/data/lp-etl/logs
+      - configuration:/data/lp-etl/configuration
+    environment:
+      - LP_ETL_DOMAIN
+    restart: always
+  executor:
+    image: ghcr.io/linkedpipes/etl-executor:${LP_VERSION-main}
+    build:
+      context: .
+      dockerfile: executor/Dockerfile
+    volumes:
+      - data-execution:/data/lp-etl/executor
+      - data-logs:/data/lp-etl/logs
+      - configuration:/data/lp-etl/configuration
+    environment:
+      - LP_ETL_DOMAIN
+    restart: always
+volumes:
+  data-logs:
+  data-execution:
+  data-storage:
+  configuration:
+  # When binding configuration it must contain file configuration.properties.
+  # Do not forget that LP_ETL_DOMAIN overwrites domain.uri in the
+  # configuration file.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,6 @@
 # * LP_ETL_PORT - port number to expose LP-ETL on
 # * LP_VERSION - 'main' by default or 'develop'
 #
-version: "3"
 services:
   storage:
     image: ghcr.io/linkedpipes/etl-storage:${LP_VERSION-main}

diff --git a/pom-backend/pom.xml b/pom-backend/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>pom-backend</artifactId>
     <version>0.0.0</version>
     <packaging>pom</packaging>
-    <name>LinkedPipes Backend Pom</name>
+    <name>LinkedPipes Backend POM</name>
 
     <properties>
         <project.build.sourceEncoding>
@@ -313,16 +313,6 @@
 
     <profiles>
         <!-- Java profiles. -->
-        <profile>
-            <id>java-17</id>
-            <activation>
-                <jdk>17</jdk>
-            </activation>
-            <properties>
-                <maven.compiler.source>17</maven.compiler.source>
-                <maven.compiler.target>17</maven.compiler.target>
-            </properties>
-        </profile>
         <profile>
             <id>java-21</id>
             <activation>
@@ -375,7 +365,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.3.0</version>
             </plugin>
         </plugins>
     </build>

diff --git a/pom-plugin/pom.xml b/pom-plugin/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>pom-plugin</artifactId>
     <version>0.0.0</version>
     <packaging>pom</packaging>
-    <name>LinkedPipes Plugin Pom</name>
+    <name>LinkedPipes Plugin POM</name>
 
     <properties>
         <project.build.sourceEncoding>
@@ -26,7 +26,7 @@
         <rdf4j.version>4.3.11</rdf4j.version>
         <jena.version>4.1.0</jena.version>
         <mockito.version>5.11.0</mockito.version>
-        <junit.version>5.10.2</junit.version>
+        <junit.version>5.10.3</junit.version>
         <lp.version>0.0.0</lp.version>
         <commons-io.version>2.16.1</commons-io.version>
         <commons-net.version>3.10.0</commons-net.version>
@@ -230,16 +230,6 @@
 
     <profiles>
         <!-- Java profiles. -->
-        <profile>
-            <id>java-17</id>
-            <activation>
-                <jdk>17</jdk>
-            </activation>
-            <properties>
-                <maven.compiler.source>17</maven.compiler.source>
-                <maven.compiler.target>17</maven.compiler.target>
-            </properties>
-        </profile>
         <profile>
             <id>java-21</id>
             <activation>
@@ -293,7 +283,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.3.0</version>
                 <configuration>
                     <excludedGroups>external-dependency</excludedGroups>
                 </configuration>