diff --git a/archetype/src/main/resources/archetype-resources/console/pom.xml b/archetype/src/main/resources/archetype-resources/console/pom.xml index ec9fddb8d2b..79bfd13a83a 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 + @@ -122,7 +126,11 @@ under the License. standalone - + + + jar + + diff --git a/archetype/src/main/resources/archetype-resources/core/pom.xml b/archetype/src/main/resources/archetype-resources/core/pom.xml index 64c1c384a05..39282e92af6 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 + + diff --git a/archetype/src/main/resources/archetype-resources/enduser/pom.xml b/archetype/src/main/resources/archetype-resources/enduser/pom.xml index 79b7f28b6dc..9acecc71fd1 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 + + diff --git a/archetype/src/main/resources/archetype-resources/wa/pom.xml b/archetype/src/main/resources/archetype-resources/wa/pom.xml index 00507a95895..c2619707b5b 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 + @@ -114,7 +118,11 @@ under the License. standalone - + + + jar + + diff --git a/docker/console/pom.xml b/docker/console/pom.xml index 11a332e1a12..2dbf444844d 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}/../.. @@ -87,26 +87,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 92017151a07..d6ba109082b 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 8438992b4d2..611dbccdd23 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}/../.. @@ -181,26 +181,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 @@ -231,10 +211,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 ead3d9df679..7978a026d16 100644 --- a/docker/core/src/main/resources/Dockerfile +++ b/docker/core/src/main/resources/Dockerfile @@ -34,7 +34,7 @@ COPY saml.keystore.jks /opt/syncope/conf/ COPY bundles/*.jar /opt/syncope/bundles/ COPY lib/*.jar /opt/syncope/lib/ -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 2ea5e77d109..3d3681c60e1 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}/../.. @@ -76,26 +76,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 3f94b09a184..d0ac13b6ece 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/wa/pom.xml b/docker/wa/pom.xml index 97a9d07ed62..8c0b762d8ae 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 @@ -70,26 +70,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 d0dd68e09f9..b3c71766938 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