From d580900ecbe2661ad5cb8eb41c9c0b58c65ab455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= Date: Sat, 1 Feb 2025 14:24:20 +0100 Subject: [PATCH] [SYNCOPE-1860] Switching to JAR executables --- .../archetype-resources/console/pom.xml | 10 ++++++- .../archetype-resources/core/pom.xml | 12 ++++++-- .../archetype-resources/enduser/pom.xml | 10 ++++++- .../resources/archetype-resources/wa/pom.xml | 10 ++++++- docker/console/pom.xml | 22 +------------- docker/console/src/main/resources/Dockerfile | 2 +- docker/console/src/main/resources/startup.sh | 2 +- docker/core/pom.xml | 30 ++++--------------- docker/core/src/main/resources/Dockerfile | 2 +- docker/core/src/main/resources/startup.sh | 2 +- docker/enduser/pom.xml | 22 +------------- docker/enduser/src/main/resources/Dockerfile | 2 +- docker/enduser/src/main/resources/startup.sh | 2 +- .../docker-compose/docker-compose-all.yml | 2 +- docker/wa/pom.xml | 22 +------------- docker/wa/src/main/resources/Dockerfile | 2 +- docker/wa/src/main/resources/startup.sh | 2 +- 17 files changed, 54 insertions(+), 102 deletions(-) diff --git a/archetype/src/main/resources/archetype-resources/console/pom.xml b/archetype/src/main/resources/archetype-resources/console/pom.xml index ca0a693f0ed..5292c723a57 100644 --- a/archetype/src/main/resources/archetype-resources/console/pom.xml +++ b/archetype/src/main/resources/archetype-resources/console/pom.xml @@ -30,7 +30,11 @@ under the License. Apache Syncope sample project - Console ${groupId} ${artifactId} - war + ${packaging} + + + war + @@ -123,6 +127,10 @@ under the License. standalone + + jar + + org.springframework.boot diff --git a/archetype/src/main/resources/archetype-resources/core/pom.xml b/archetype/src/main/resources/archetype-resources/core/pom.xml index 13e2b72dbce..93a046ac73b 100644 --- a/archetype/src/main/resources/archetype-resources/core/pom.xml +++ b/archetype/src/main/resources/archetype-resources/core/pom.xml @@ -30,7 +30,11 @@ under the License. Apache Syncope sample project - Core ${groupId} ${artifactId} - war + ${packaging} + + + war + @@ -169,7 +173,11 @@ under the License. standalone - + + + jar + + org.springframework.boot diff --git a/archetype/src/main/resources/archetype-resources/enduser/pom.xml b/archetype/src/main/resources/archetype-resources/enduser/pom.xml index d9bf3513bbe..46458139da5 100644 --- a/archetype/src/main/resources/archetype-resources/enduser/pom.xml +++ b/archetype/src/main/resources/archetype-resources/enduser/pom.xml @@ -30,7 +30,11 @@ under the License. Apache Syncope sample project - Enduser ${groupId} ${artifactId} - war + ${packaging} + + + war + @@ -150,6 +154,10 @@ under the License. standalone + + jar + + org.springframework.boot diff --git a/archetype/src/main/resources/archetype-resources/wa/pom.xml b/archetype/src/main/resources/archetype-resources/wa/pom.xml index 960599dbef4..6e9082af022 100644 --- a/archetype/src/main/resources/archetype-resources/wa/pom.xml +++ b/archetype/src/main/resources/archetype-resources/wa/pom.xml @@ -30,7 +30,11 @@ under the License. Apache Syncope sample project - WA ${groupId} ${artifactId} - war + ${packaging} + + + war + @@ -142,6 +146,10 @@ under the License. standalone + + jar + + org.springframework.boot diff --git a/docker/console/pom.xml b/docker/console/pom.xml index f3f1687e501..2b7cd20ee56 100644 --- a/docker/console/pom.xml +++ b/docker/console/pom.xml @@ -31,7 +31,7 @@ under the License. Apache Syncope Docker Console org.apache.syncope syncope-docker-console - war + jar ${basedir}/../.. @@ -92,26 +92,6 @@ under the License. - - org.apache.maven.plugins - maven-war-plugin - false - - ${basedir}/../../fit/console-reference/src/main/webapp/WEB-INF/web.xml - - - ${basedir} - META-INF - - LICENSE - NOTICE - - - - ${project.build.outputDirectory} - - - org.springframework.boot spring-boot-maven-plugin diff --git a/docker/console/src/main/resources/Dockerfile b/docker/console/src/main/resources/Dockerfile index ae7d3fdb1da..c882a9e1a5e 100644 --- a/docker/console/src/main/resources/Dockerfile +++ b/docker/console/src/main/resources/Dockerfile @@ -29,7 +29,7 @@ RUN mkdir /opt/syncope/log COPY *.properties /opt/syncope/conf/ COPY log4j2.xml /opt/syncope/conf/ -COPY syncope-docker-console-*war /opt/syncope/lib/syncope-console.war +COPY syncope-docker-console-*jar /opt/syncope/lib/syncope-console.jar ENV SPRING_PROFILES_ACTIVE=docker ENV LOADER_PATH="/opt/syncope/conf,/opt/syncope/lib" diff --git a/docker/console/src/main/resources/startup.sh b/docker/console/src/main/resources/startup.sh index 7f35946bfd2..229578a90df 100755 --- a/docker/console/src/main/resources/startup.sh +++ b/docker/console/src/main/resources/startup.sh @@ -17,4 +17,4 @@ # specific language governing permissions and limitations # under the License. -java $JAVA_OPTS -jar /opt/syncope/lib/syncope-console.war +java $JAVA_OPTS -jar /opt/syncope/lib/syncope-console.jar diff --git a/docker/core/pom.xml b/docker/core/pom.xml index deecd5f8d3a..5d35b2a226c 100644 --- a/docker/core/pom.xml +++ b/docker/core/pom.xml @@ -31,7 +31,7 @@ under the License. Apache Syncope Docker Core org.apache.syncope syncope-docker-core - war + jar ${basedir}/../.. @@ -195,26 +195,6 @@ under the License. - - org.apache.maven.plugins - maven-war-plugin - false - - ${basedir}/../../fit/core-reference/src/main/webapp/WEB-INF/web.xml - - - ${basedir} - META-INF - - LICENSE - NOTICE - - - - ${project.build.outputDirectory}/lib - - - org.springframework.boot spring-boot-maven-plugin @@ -245,10 +225,10 @@ under the License. ${project.build.outputDirectory} - - linux/amd64 - linux/arm64 - + + linux/amd64 + linux/arm64 + diff --git a/docker/core/src/main/resources/Dockerfile b/docker/core/src/main/resources/Dockerfile index 510cca67633..06c1d5bf372 100644 --- a/docker/core/src/main/resources/Dockerfile +++ b/docker/core/src/main/resources/Dockerfile @@ -36,7 +36,7 @@ COPY bundles/*.jar /opt/syncope/bundles/ COPY lib/*.jar /opt/syncope/lib/ COPY jpa-json/*.jar /opt/syncope/jpa-json/ -COPY lib/syncope-docker-core-*war /opt/syncope/lib/syncope.war +COPY lib/syncope-docker-core-*jar /opt/syncope/lib/syncope.jar ENV SPRING_PROFILES_ACTIVE=docker ENV LOADER_PATH="/opt/syncope/conf,/opt/syncope/lib" diff --git a/docker/core/src/main/resources/startup.sh b/docker/core/src/main/resources/startup.sh index a853dc5c46b..10a74a3e480 100755 --- a/docker/core/src/main/resources/startup.sh +++ b/docker/core/src/main/resources/startup.sh @@ -17,4 +17,4 @@ # specific language governing permissions and limitations # under the License. -java $JAVA_OPTS -jar /opt/syncope/lib/syncope.war +java $JAVA_OPTS -jar /opt/syncope/lib/syncope.jar diff --git a/docker/enduser/pom.xml b/docker/enduser/pom.xml index bd3022eef47..cc0f2d3a506 100644 --- a/docker/enduser/pom.xml +++ b/docker/enduser/pom.xml @@ -31,7 +31,7 @@ under the License. Apache Syncope Docker Enduser org.apache.syncope syncope-docker-enduser - war + jar ${basedir}/../.. @@ -81,26 +81,6 @@ under the License. - - org.apache.maven.plugins - maven-war-plugin - false - - ${basedir}/../../fit/enduser-reference/src/main/webapp/WEB-INF/web.xml - - - ${basedir} - META-INF - - LICENSE - NOTICE - - - - ${project.build.outputDirectory} - - - org.springframework.boot spring-boot-maven-plugin diff --git a/docker/enduser/src/main/resources/Dockerfile b/docker/enduser/src/main/resources/Dockerfile index bbf0200263b..e21766d2754 100644 --- a/docker/enduser/src/main/resources/Dockerfile +++ b/docker/enduser/src/main/resources/Dockerfile @@ -30,7 +30,7 @@ COPY *.properties /opt/syncope/conf/ COPY *.json /opt/syncope/conf/ COPY log4j2.xml /opt/syncope/conf/ -COPY syncope-docker-enduser-*war /opt/syncope/lib/syncope-enduser.war +COPY syncope-docker-enduser-*jar /opt/syncope/lib/syncope-enduser.jar ENV SPRING_PROFILES_ACTIVE=docker ENV LOADER_PATH="/opt/syncope/conf,/opt/syncope/lib" diff --git a/docker/enduser/src/main/resources/startup.sh b/docker/enduser/src/main/resources/startup.sh index 9dffc6a604d..b09d451c366 100755 --- a/docker/enduser/src/main/resources/startup.sh +++ b/docker/enduser/src/main/resources/startup.sh @@ -17,4 +17,4 @@ # specific language governing permissions and limitations # under the License. -java $JAVA_OPTS -jar /opt/syncope/lib/syncope-enduser.war +java $JAVA_OPTS -jar /opt/syncope/lib/syncope-enduser.jar diff --git a/docker/src/main/resources/docker-compose/docker-compose-all.yml b/docker/src/main/resources/docker-compose/docker-compose-all.yml index 403c12fe3dd..1c823513f22 100644 --- a/docker/src/main/resources/docker-compose/docker-compose-all.yml +++ b/docker/src/main/resources/docker-compose/docker-compose-all.yml @@ -22,7 +22,7 @@ services: keymaster: - image: zookeeper:3.8.1 + image: zookeeper:3.9.3 restart: always db: diff --git a/docker/wa/pom.xml b/docker/wa/pom.xml index d39803bb22b..f1f8be26f87 100644 --- a/docker/wa/pom.xml +++ b/docker/wa/pom.xml @@ -31,7 +31,7 @@ under the License. Apache Syncope Docker WA org.apache.syncope syncope-docker-wa - war + jar @@ -75,26 +75,6 @@ under the License. - - org.apache.maven.plugins - maven-war-plugin - false - - ${basedir}/../../fit/wa-reference/src/main/webapp/WEB-INF/web.xml - - - ${basedir} - META-INF - - LICENSE - NOTICE - - - - ${project.build.outputDirectory} - - - org.springframework.boot spring-boot-maven-plugin diff --git a/docker/wa/src/main/resources/Dockerfile b/docker/wa/src/main/resources/Dockerfile index 9d8a747abc0..336529206dd 100644 --- a/docker/wa/src/main/resources/Dockerfile +++ b/docker/wa/src/main/resources/Dockerfile @@ -29,7 +29,7 @@ RUN mkdir /opt/syncope/log COPY *.properties /opt/syncope/conf/ COPY log4j2.xml /opt/syncope/conf/ -COPY syncope-docker-wa-*war /opt/syncope/lib/syncope-wa.war +COPY syncope-docker-wa-*jar /opt/syncope/lib/syncope-wa.jar ENV SPRING_PROFILES_ACTIVE=docker ENV LOADER_PATH="/opt/syncope/conf,/opt/syncope/lib" diff --git a/docker/wa/src/main/resources/startup.sh b/docker/wa/src/main/resources/startup.sh index 71ee91a9e51..35b0d8dab1a 100755 --- a/docker/wa/src/main/resources/startup.sh +++ b/docker/wa/src/main/resources/startup.sh @@ -17,4 +17,4 @@ # specific language governing permissions and limitations # under the License. -java $JAVA_OPTS -jar /opt/syncope/lib/syncope-wa.war +java $JAVA_OPTS -jar /opt/syncope/lib/syncope-wa.jar