This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new d580900ecb [SYNCOPE-1860] Switching to JAR executables
d580900ecb is described below
commit d580900ecbe2661ad5cb8eb41c9c0b58c65ab455
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Sat Feb 1 14:24:20 2025 +0100
[SYNCOPE-1860] Switching to JAR executables
---
.../resources/archetype-resources/console/pom.xml | 10 +++++++-
.../resources/archetype-resources/core/pom.xml | 12 +++++++--
.../resources/archetype-resources/enduser/pom.xml | 10 +++++++-
.../main/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 ca0a693f0e..5292c723a5 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.
<name>Apache Syncope sample project - Console</name>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
+ <packaging>${packaging}</packaging>
+
+ <properties>
+ <packaging>war</packaging>
+ </properties>
<dependencies>
<dependency>
@@ -123,6 +127,10 @@ under the License.
<profile>
<id>standalone</id>
+ <properties>
+ <packaging>jar</packaging>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/archetype/src/main/resources/archetype-resources/core/pom.xml
b/archetype/src/main/resources/archetype-resources/core/pom.xml
index 13e2b72dbc..93a046ac73 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.
<name>Apache Syncope sample project - Core</name>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
+ <packaging>${packaging}</packaging>
+
+ <properties>
+ <packaging>war</packaging>
+ </properties>
<dependencies>
<dependency>
@@ -169,7 +173,11 @@ under the License.
<profile>
<id>standalone</id>
-
+
+ <properties>
+ <packaging>jar</packaging>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/archetype/src/main/resources/archetype-resources/enduser/pom.xml
b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
index d9bf3513bb..46458139da 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.
<name>Apache Syncope sample project - Enduser</name>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
+ <packaging>${packaging}</packaging>
+
+ <properties>
+ <packaging>war</packaging>
+ </properties>
<dependencies>
<dependency>
@@ -150,6 +154,10 @@ under the License.
<profile>
<id>standalone</id>
+ <properties>
+ <packaging>jar</packaging>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/archetype/src/main/resources/archetype-resources/wa/pom.xml
b/archetype/src/main/resources/archetype-resources/wa/pom.xml
index 960599dbef..6e9082af02 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.
<name>Apache Syncope sample project - WA</name>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
+ <packaging>${packaging}</packaging>
+
+ <properties>
+ <packaging>war</packaging>
+ </properties>
<dependencyManagement>
<dependencies>
@@ -142,6 +146,10 @@ under the License.
<profile>
<id>standalone</id>
+ <properties>
+ <packaging>jar</packaging>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/docker/console/pom.xml b/docker/console/pom.xml
index f3f1687e50..2b7cd20ee5 100644
--- a/docker/console/pom.xml
+++ b/docker/console/pom.xml
@@ -31,7 +31,7 @@ under the License.
<description>Apache Syncope Docker Console</description>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-docker-console</artifactId>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<properties>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
@@ -92,26 +92,6 @@ under the License.
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
-
<webXml>${basedir}/../../fit/console-reference/src/main/webapp/WEB-INF/web.xml</webXml>
- <webResources>
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </resource>
- </webResources>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/docker/console/src/main/resources/Dockerfile
b/docker/console/src/main/resources/Dockerfile
index ae7d3fdb1d..c882a9e1a5 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 7f35946bfd..229578a90d 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 deecd5f8d3..5d35b2a226 100644
--- a/docker/core/pom.xml
+++ b/docker/core/pom.xml
@@ -31,7 +31,7 @@ under the License.
<description>Apache Syncope Docker Core</description>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-docker-core</artifactId>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<properties>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
@@ -195,26 +195,6 @@ under the License.
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
-
<webXml>${basedir}/../../fit/core-reference/src/main/webapp/WEB-INF/web.xml</webXml>
- <webResources>
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </resource>
- </webResources>
-
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -245,10 +225,10 @@ under the License.
<build>
<dockerFileDir>${project.build.outputDirectory}</dockerFileDir>
<buildx>
- <platforms>
- <platform>linux/amd64</platform>
- <platform>linux/arm64</platform>
- </platforms>
+ <platforms>
+ <platform>linux/amd64</platform>
+ <platform>linux/arm64</platform>
+ </platforms>
</buildx>
</build>
</image>
diff --git a/docker/core/src/main/resources/Dockerfile
b/docker/core/src/main/resources/Dockerfile
index 510cca6763..06c1d5bf37 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 a853dc5c46..10a74a3e48 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 bd3022eef4..cc0f2d3a50 100644
--- a/docker/enduser/pom.xml
+++ b/docker/enduser/pom.xml
@@ -31,7 +31,7 @@ under the License.
<description>Apache Syncope Docker Enduser</description>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-docker-enduser</artifactId>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<properties>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
@@ -81,26 +81,6 @@ under the License.
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
-
<webXml>${basedir}/../../fit/enduser-reference/src/main/webapp/WEB-INF/web.xml</webXml>
- <webResources>
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </resource>
- </webResources>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/docker/enduser/src/main/resources/Dockerfile
b/docker/enduser/src/main/resources/Dockerfile
index bbf0200263..e21766d275 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 9dffc6a604..b09d451c36 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 403c12fe3d..1c823513f2 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 d39803bb22..f1f8be26f8 100644
--- a/docker/wa/pom.xml
+++ b/docker/wa/pom.xml
@@ -31,7 +31,7 @@ under the License.
<description>Apache Syncope Docker WA</description>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-docker-wa</artifactId>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<dependencyManagement>
<dependencies>
@@ -75,26 +75,6 @@ under the License.
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
-
<webXml>${basedir}/../../fit/wa-reference/src/main/webapp/WEB-INF/web.xml</webXml>
- <webResources>
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </resource>
- </webResources>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/docker/wa/src/main/resources/Dockerfile
b/docker/wa/src/main/resources/Dockerfile
index 9d8a747abc..336529206d 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 71ee91a9e5..35b0d8dab1 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
