You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2021/05/21 15:14:49 UTC
[syncope] branch master updated: Removing ianal-maven-plugin for
Geronimo's tools-maven-plugin (#265)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 5df9c74 Removing ianal-maven-plugin for Geronimo's tools-maven-plugin (#265)
5df9c74 is described below
commit 5df9c74a881311f020eb53cb4e8612fa4e87edf5
Author: Francesco Chicchiriccò <il...@users.noreply.github.com>
AuthorDate: Fri May 21 17:14:38 2021 +0200
Removing ianal-maven-plugin for Geronimo's tools-maven-plugin (#265)
---
.github/workflows/crosschecks.yml | 6 +--
.github/workflows/fit_Payara.yml | 2 +-
.github/workflows/fit_Tomcat_H2_JSON.yml | 2 +-
.github/workflows/fit_Tomcat_H2_XML.yml | 2 +-
.github/workflows/fit_Tomcat_H2_YAML.yml | 2 +-
.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml | 2 +-
.github/workflows/fit_WA_SRA_CASClient.yml | 2 +-
.github/workflows/fit_WA_SRA_OAuth2.yml | 2 +-
.github/workflows/fit_WA_SRA_OIDC.yml | 2 +-
.github/workflows/fit_WA_SRA_SAML2.yml | 2 +-
.github/workflows/fit_Wildfly.yml | 2 +-
.travis.yml | 20 ++++----
.../main/resources/archetype-resources/fit/pom.xml | 11 -----
archetype/src/main/resources/meta-pom.xml | 19 +-------
fit/build-tools/pom.xml | 27 +++-------
.../webapp/WEB-INF/jboss-deployment-structure.xml | 2 +
fit/console-reference/pom.xml | 13 +----
fit/core-reference/pom.xml | 57 ++++++++++++----------
.../main/resources/application-wildfly.properties | 2 +-
.../webapp/WEB-INF/jboss-deployment-structure.xml | 3 ++
fit/enduser-reference/pom.xml | 13 +----
fit/wa-reference/pom.xml | 15 +-----
pom.xml | 31 ++++++------
.../getting-started/systemRequirements.adoc | 2 +-
.../systemadministration/javaeecontainer.adoc | 5 +-
standalone/pom.xml | 3 +-
26 files changed, 90 insertions(+), 159 deletions(-)
diff --git a/.github/workflows/crosschecks.yml b/.github/workflows/crosschecks.yml
index 275a02b..2f0d504 100644
--- a/.github/workflows/crosschecks.yml
+++ b/.github/workflows/crosschecks.yml
@@ -55,8 +55,8 @@ jobs:
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: Validate
- run: mvn -T 1C checkstyle:check ianal:verify-legal-files modernizer:modernizer apache-rat:check
+ run: mvn -T 1C checkstyle:check tools:verify-legal-files modernizer:modernizer apache-rat:check
- name: Test
- run: mvn -T 1C clean test '-Dinvoker.streamLogs=true' '-Dmodernizer.skip=true' '-Dianal.skip=true' '-Drat.skip=true' '-Dcheckstyle.skip=true' '-Dsass.skip=true'
+ run: mvn -T 1C clean test '-Dinvoker.streamLogs=true' '-Dmodernizer.skip=true' '-Dianal.phase=none' '-Drat.skip=true' '-Dcheckstyle.skip=true' '-Dsass.skip=true'
- name: Verify
- run: mvn -f fit/core-reference/pom.xml verify '-Dit.test=RESTITCase' '-Dinvoker.streamLogs=true' '-Dmodernizer.skip=true' '-Dianal.skip=true' '-Drat.skip=true' '-Dcheckstyle.skip=true' '-Djacoco.skip=true'
+ run: mvn -f fit/core-reference/pom.xml verify '-Dit.test=RESTITCase' '-Dinvoker.streamLogs=true' '-Dmodernizer.skip=true' '-Dianal.phase=none' '-Drat.skip=true' '-Dcheckstyle.skip=true' '-Djacoco.skip=true'
diff --git a/.github/workflows/fit_Payara.yml b/.github/workflows/fit_Payara.yml
index 3881961..175f11a 100644
--- a/.github/workflows/fit_Payara.yml
+++ b/.github/workflows/fit_Payara.yml
@@ -54,4 +54,4 @@ jobs:
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Payara / H2 / JSON'
- run: mvn -f fit/core-reference/pom.xml -P payara-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ run: mvn -f fit/core-reference/pom.xml -P payara-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
diff --git a/.github/workflows/fit_Tomcat_H2_JSON.yml b/.github/workflows/fit_Tomcat_H2_JSON.yml
index 39ff609..88a4673 100644
--- a/.github/workflows/fit_Tomcat_H2_JSON.yml
+++ b/.github/workflows/fit_Tomcat_H2_JSON.yml
@@ -54,4 +54,4 @@ jobs:
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Tomcat / H2 / JSON'
- run: mvn -f fit/core-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ run: mvn -f fit/core-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
diff --git a/.github/workflows/fit_Tomcat_H2_XML.yml b/.github/workflows/fit_Tomcat_H2_XML.yml
index 0e335a6..0b1bc4e 100644
--- a/.github/workflows/fit_Tomcat_H2_XML.yml
+++ b/.github/workflows/fit_Tomcat_H2_XML.yml
@@ -54,4 +54,4 @@ jobs:
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Tomcat / H2 / XML'
- run: mvn -f fit/core-reference/pom.xml verify -Djaxrs.content.type=application/xml -Dit.test=org.apache.syncope.fit.core.*ITCase -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ run: mvn -f fit/core-reference/pom.xml verify -Djaxrs.content.type=application/xml -Dit.test=org.apache.syncope.fit.core.*ITCase -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
diff --git a/.github/workflows/fit_Tomcat_H2_YAML.yml b/.github/workflows/fit_Tomcat_H2_YAML.yml
index c97dffe..1ac340e 100644
--- a/.github/workflows/fit_Tomcat_H2_YAML.yml
+++ b/.github/workflows/fit_Tomcat_H2_YAML.yml
@@ -54,4 +54,4 @@ jobs:
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Tomcat / H2 / YAML'
- run: mvn -f fit/core-reference/pom.xml verify -Djaxrs.content.type=application/yaml -Dit.test=org.apache.syncope.fit.core.*ITCase -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ run: mvn -f fit/core-reference/pom.xml verify -Djaxrs.content.type=application/yaml -Dit.test=org.apache.syncope.fit.core.*ITCase -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
diff --git a/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml b/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml
index 333f742..4e2c553 100644
--- a/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml
+++ b/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml
@@ -54,4 +54,4 @@ jobs:
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'WA / SAML2SP4UI, OIDCC4UI'
- run: mkdir -p fit/core-reference/target/test-classes && cp fit/core-reference/src/test/resources/saml.keystore.jks fit/core-reference/target/test-classes && mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.ui.*ITCase
+ run: mkdir -p fit/core-reference/target/test-classes && cp fit/core-reference/src/test/resources/saml.keystore.jks fit/core-reference/target/test-classes && mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.ui.*ITCase
diff --git a/.github/workflows/fit_WA_SRA_CASClient.yml b/.github/workflows/fit_WA_SRA_CASClient.yml
index bbcd6aa..1e0e3e3 100644
--- a/.github/workflows/fit_WA_SRA_CASClient.yml
+++ b/.github/workflows/fit_WA_SRA_CASClient.yml
@@ -54,4 +54,4 @@ jobs:
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'WA / SRA / CAS Client'
- run: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.CASSRAITCase
+ run: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.CASSRAITCase
diff --git a/.github/workflows/fit_WA_SRA_OAuth2.yml b/.github/workflows/fit_WA_SRA_OAuth2.yml
index a679e8a..3d989d5 100644
--- a/.github/workflows/fit_WA_SRA_OAuth2.yml
+++ b/.github/workflows/fit_WA_SRA_OAuth2.yml
@@ -54,4 +54,4 @@ jobs:
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'WA / SRA / OAuth 2.0'
- run: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.OAUTH2SRAITCase
+ run: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.OAUTH2SRAITCase
diff --git a/.github/workflows/fit_WA_SRA_OIDC.yml b/.github/workflows/fit_WA_SRA_OIDC.yml
index 8c9606f..67a7b39 100644
--- a/.github/workflows/fit_WA_SRA_OIDC.yml
+++ b/.github/workflows/fit_WA_SRA_OIDC.yml
@@ -54,4 +54,4 @@ jobs:
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'WA / SRA / OpenID Connect 1.0'
- run: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.OIDCSRAITCase
+ run: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.OIDCSRAITCase
diff --git a/.github/workflows/fit_WA_SRA_SAML2.yml b/.github/workflows/fit_WA_SRA_SAML2.yml
index d9941a5..88c40d4 100644
--- a/.github/workflows/fit_WA_SRA_SAML2.yml
+++ b/.github/workflows/fit_WA_SRA_SAML2.yml
@@ -54,4 +54,4 @@ jobs:
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'WA / SRA / SAML 2.0'
- run: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.SAML2SRAITCase
+ run: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.SAML2SRAITCase
diff --git a/.github/workflows/fit_Wildfly.yml b/.github/workflows/fit_Wildfly.yml
index d251564..575e8eb 100644
--- a/.github/workflows/fit_Wildfly.yml
+++ b/.github/workflows/fit_Wildfly.yml
@@ -54,4 +54,4 @@ jobs:
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Wildfly / H2 / JSON'
- run: mvn -f fit/core-reference/pom.xml -P wildfly-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ run: mvn -f fit/core-reference/pom.xml -P wildfly-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
diff --git a/.travis.yml b/.travis.yml
index 4a32720..585ef03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,34 +46,34 @@ jobs:
#######################################################
- stage: validate
name: "Checkstyle, Legal Files, Modernizer and Release Audit Tool (RAT) Analysis"
- script: mvn -T 1C checkstyle:check ianal:verify-legal-files modernizer:modernizer apache-rat:check
+ script: mvn -T 1C checkstyle:check tools:verify-legal-files modernizer:modernizer apache-rat:check
######################################################
- stage: test
name: "Persistence Unit Tests: PostgreSQL (JSONB)"
- script: mvn -f core/persistence-jpa-json/pom.xml -P postgres -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dsass.skip=true
+ script: mvn -f core/persistence-jpa-json/pom.xml -P postgres -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Dsass.skip=true
- stage: test
name: "Persistence Unit Tests: MySQL (JSON)"
- script: mvn -f core/persistence-jpa-json/pom.xml -P mysql -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dsass.skip=true
+ script: mvn -f core/persistence-jpa-json/pom.xml -P mysql -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Dsass.skip=true
######################################################
- stage: fit
name: "Integration Tests: Tomcat / PostgreSQL / JSON"
- script: mvn -f fit/core-reference/pom.xml -P postgres-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ script: mvn -f fit/core-reference/pom.xml -P postgres-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- stage: fit
name: "Integration Tests: Tomcat / PostgreSQL (JSONB) / JSON"
- script: mvn -f fit/core-reference/pom.xml -P pgjsonb-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ script: mvn -f fit/core-reference/pom.xml -P pgjsonb-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- stage: fit
name: "Integration Tests: Tomcat / MySQL / JSON"
- script: mvn -f fit/core-reference/pom.xml -P mysql-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ script: mvn -f fit/core-reference/pom.xml -P mysql-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- stage: fit
name: "Integration Tests: Tomcat / MySQL (JSON) / JSON"
- script: mvn -f fit/core-reference/pom.xml -P myjson-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ script: mvn -f fit/core-reference/pom.xml -P myjson-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- stage: fit
name: "Integration Tests: Tomcat / MariaDB / JSON"
- script: mvn -f fit/core-reference/pom.xml -P mariadb-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ script: mvn -f fit/core-reference/pom.xml -P mariadb-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- stage: fit
name: "Integration Tests: Tomcat / H2 / JSON + Elasticsearch"
- script: mvn -f fit/core-reference/pom.xml -P elasticsearch-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ script: mvn -f fit/core-reference/pom.xml -P elasticsearch-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- stage: fit
name: "Integration Tests: Tomcat / H2 / JSON + Zookeeper"
- script: mvn -f fit/core-reference/pom.xml -P zookeeper-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+ script: mvn -f fit/core-reference/pom.xml -P zookeeper-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
#####################################################
diff --git a/archetype/src/main/resources/archetype-resources/fit/pom.xml b/archetype/src/main/resources/archetype-resources/fit/pom.xml
index 7a8df05..03437a6 100644
--- a/archetype/src/main/resources/archetype-resources/fit/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/fit/pom.xml
@@ -44,11 +44,6 @@ under the License.
<type>war</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -213,12 +208,6 @@ under the License.
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${project.build.directory}/cargo/extract</extractDir>
</zipUrlInstaller>
- <dependencies>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- </dependencies>
<timeout>300000</timeout>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
diff --git a/archetype/src/main/resources/meta-pom.xml b/archetype/src/main/resources/meta-pom.xml
index 9141584..96518c0 100644
--- a/archetype/src/main/resources/meta-pom.xml
+++ b/archetype/src/main/resources/meta-pom.xml
@@ -36,6 +36,7 @@ under the License.
<jwsKey>${jwsKey}</jwsKey>
<adminPassword>${adminPassword}</adminPassword>
+ <ianal.phase>none</ianal.phase>
<rat.skip>true</rat.skip>
<checkstyle.skip>true</checkstyle.skip>
</properties>
@@ -117,24 +118,6 @@ under the License.
</dependencies>
</dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<modules>
<module>common</module>
<module>core</module>
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index 52d4c26..2b5808c 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -52,6 +52,12 @@ under the License.
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -185,7 +191,6 @@ under the License.
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -339,12 +344,6 @@ under the License.
<timeout>300000</timeout>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
- <dependencies>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- </dependencies>
</container>
<configuration>
<properties>
@@ -395,12 +394,6 @@ under the License.
<timeout>300000</timeout>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
- <dependencies>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- </dependencies>
</container>
<configuration>
<properties>
@@ -429,7 +422,7 @@ under the License.
<inherited>true</inherited>
<configuration>
<container>
- <containerId>wildfly19x</containerId>
+ <containerId>wildfly23x</containerId>
<zipUrlInstaller>
<url>https://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
@@ -438,12 +431,6 @@ under the License.
<timeout>300000</timeout>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
- <dependencies>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- </dependencies>
</container>
<configuration>
<properties>
diff --git a/fit/build-tools/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/fit/build-tools/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 1bff534..f854fc4 100644
--- a/fit/build-tools/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/fit/build-tools/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -42,7 +42,9 @@ under the License.
<module name="org.slf4j"/>
<module name="org.slf4j.impl"/>
<module name="org.apache.log4j"/>
+ <module name="org.apache.logging.log4j.api"/>
<module name="org.jboss.log4j.logmanager"/>
+ <module name="org.jboss.logmanager.log4j2"/>
<module name="com.h2database.h2"/>
</exclusions>
</deployment>
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index 20ac8d4..46bce9e 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -34,7 +34,7 @@ under the License.
<packaging>war</packaging>
<properties>
- <ianal.skip>true</ianal.skip>
+ <ianal.phase>none</ianal.phase>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
</properties>
@@ -89,11 +89,6 @@ under the License.
<!-- TEST -->
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.syncope.fit</groupId>
<artifactId>syncope-fit-build-tools</artifactId>
<version>${project.version}</version>
@@ -126,12 +121,6 @@ under the License.
<timeout>300000</timeout>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
- <dependencies>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- </dependencies>
</container>
<configuration>
<properties>
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index a5dcfa0..c10796d 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -34,7 +34,7 @@ under the License.
<packaging>war</packaging>
<properties>
- <ianal.skip>true</ianal.skip>
+ <ianal.phase>none</ianal.phase>
<jdbcdriver.groupId>com.h2database</jdbcdriver.groupId>
<jdbcdriver.artifactId>h2</jdbcdriver.artifactId>
@@ -68,6 +68,11 @@ under the License.
</dependency>
<dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.syncope.ext.self-keymaster</groupId>
<artifactId>syncope-ext-self-keymaster-rest-cxf</artifactId>
<version>${project.version}</version>
@@ -85,11 +90,6 @@ under the License.
<!-- TEST -->
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.syncope.fit</groupId>
<artifactId>syncope-fit-build-tools</artifactId>
<version>${project.version}</version>
@@ -323,10 +323,6 @@ under the License.
</systemProperties>
<dependencies>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- <dependency>
<groupId>${jdbcdriver.groupId}</groupId>
<artifactId>${jdbcdriver.artifactId}</artifactId>
</dependency>
@@ -1602,12 +1598,6 @@ under the License.
</zipUrlInstaller>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
- <dependencies>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- </dependencies>
</container>
<configuration>
<properties>
@@ -1641,8 +1631,27 @@ under the License.
<profile>
<id>wildfly-it</id>
+ <properties>
+ <!-- PostgreSQL JDBC Driver is not actually needed but we need this to avoid Wildfly messing up
+ by turning Cargo's H2 dependency into a module -->
+ <jdbcdriver.groupId>org.postgresql</jdbcdriver.groupId>
+ <jdbcdriver.artifactId>postgresql</jdbcdriver.artifactId>
+ </properties>
+
<dependencies>
<dependency>
+ <groupId>org.apache.syncope.core</groupId>
+ <artifactId>syncope-core-starter</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
</dependency>
@@ -1666,10 +1675,12 @@ under the License.
<artifactId>cxf-rt-wsdl</artifactId>
<version>${cxf.version}</version>
</dependency>
-
+
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${jdbc.postgresql.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -1683,7 +1694,7 @@ under the License.
<inherited>true</inherited>
<configuration>
<container>
- <containerId>wildfly21x</containerId>
+ <containerId>wildfly23x</containerId>
<zipUrlInstaller>
<url>https://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
@@ -1691,12 +1702,6 @@ under the License.
</zipUrlInstaller>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
- <dependencies>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- </dependencies>
</container>
<configuration>
<properties>
diff --git a/fit/core-reference/src/main/resources/application-wildfly.properties b/fit/core-reference/src/main/resources/application-wildfly.properties
index e9e3978..97ce62f 100644
--- a/fit/core-reference/src/main/resources/application-wildfly.properties
+++ b/fit/core-reference/src/main/resources/application-wildfly.properties
@@ -16,6 +16,6 @@
# under the License.
service.discovery.address=http://localhost:9080/syncope/rest/
-openjpaMetaDataFactory=jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly21x/deployments/syncope.war/WEB-INF/lib/syncope-core-persistence-jpa-${syncope.version}.jar; vfs:${project.build.directory}/cargo/configurations/wildfly21x/deployments/syncope.war/WEB-INF/lib/syncope-ext-self-keymaster-persistence-jpa-${syncope.version}.jar, Resources=##orm##)
+openjpaMetaDataFactory=jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly23x/deployments/syncope.war/WEB-INF/lib/syncope-core-persistence-jpa-${syncope.version}.jar; vfs:${project.build.directory}/cargo/configurations/wildfly23x/deployments/syncope.war/WEB-INF/lib/syncope-ext-self-keymaster-persistence-jpa-${syncope.version}.jar, Resources=##orm##)
javadocPaths=/WEB-INF/lib/syncope-common-idrepo-rest-api-${syncope.version}-javadoc.jar,\
/WEB-INF/lib/syncope-common-idm-rest-api-${syncope.version}-javadoc.jar
diff --git a/fit/core-reference/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/fit/core-reference/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index f5b65f8..94f7970 100644
--- a/fit/core-reference/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/fit/core-reference/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -41,7 +41,10 @@ under the License.
<module name="org.slf4j"/>
<module name="org.slf4j.impl"/>
<module name="org.apache.log4j"/>
+ <module name="org.apache.logging.log4j.api"/>
<module name="org.jboss.log4j.logmanager"/>
+ <module name="org.jboss.logmanager.log4j2"/>
+ <module name="com.h2database.h2"/>
</exclusions>
</deployment>
</jboss-deployment-structure>
\ No newline at end of file
diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml
index a4c24f1..8bc2218 100644
--- a/fit/enduser-reference/pom.xml
+++ b/fit/enduser-reference/pom.xml
@@ -34,7 +34,7 @@ under the License.
<packaging>war</packaging>
<properties>
- <ianal.skip>true</ianal.skip>
+ <ianal.phase>none</ianal.phase>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
</properties>
@@ -71,11 +71,6 @@ under the License.
<!-- TEST -->
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.syncope.fit</groupId>
<artifactId>syncope-fit-build-tools</artifactId>
<version>${project.version}</version>
@@ -115,12 +110,6 @@ under the License.
<timeout>300000</timeout>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
- <dependencies>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- </dependencies>
</container>
<configuration>
<properties>
diff --git a/fit/wa-reference/pom.xml b/fit/wa-reference/pom.xml
index 41e7aa2..e7f5357 100644
--- a/fit/wa-reference/pom.xml
+++ b/fit/wa-reference/pom.xml
@@ -34,9 +34,7 @@ under the License.
<packaging>war</packaging>
<properties>
- <nimbus-jose-jwt.version>8.20.1</nimbus-jose-jwt.version>
-
- <ianal.skip>true</ianal.skip>
+ <ianal.phase>none</ianal.phase>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
</properties>
@@ -74,11 +72,6 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.syncope.fit</groupId>
<artifactId>syncope-fit-build-tools</artifactId>
<version>${project.version}</version>
@@ -135,12 +128,6 @@ under the License.
<timeout>600000</timeout>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
- <dependencies>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- </dependencies>
</container>
<configuration>
<properties>
diff --git a/pom.xml b/pom.xml
index c8cf8d9..a168fd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -427,7 +427,7 @@ under the License.
<flowable.version>6.6.0</flowable.version>
- <camel.version>3.9.0</camel.version>
+ <camel.version>3.10.0</camel.version>
<slf4j.version>2.0.0-alpha1</slf4j.version>
@@ -458,7 +458,7 @@ under the License.
<mockito.version>3.10.0</mockito.version>
<swagger-core.version>2.1.8</swagger-core.version>
- <swagger-ui.version>3.48.0</swagger-ui.version>
+ <swagger-ui.version>3.49.0</swagger-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
@@ -477,8 +477,6 @@ under the License.
<wicket-bootstrap.version>5.0.4</wicket-bootstrap.version>
<wicket-spring-boot.version>3.0.4</wicket-spring-boot.version>
- <ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
-
<netbeans.version>RELEASE122</netbeans.version>
<antlr4.version>4.9.2</antlr4.version>
@@ -510,7 +508,7 @@ under the License.
<cargo.output>${log.directory}/cargo-output.log</cargo.output>
<tomcat.version>9.0.46</tomcat.version>
- <wildfly.version>21.0.1.Final</wildfly.version>
+ <wildfly.version>23.0.2.Final</wildfly.version>
<payara.version>5.2021.3</payara.version>
<javax.faces.version>2.3.14</javax.faces.version>
@@ -543,7 +541,7 @@ under the License.
-->
<argLine>-Xms512m -Xmx1024m -Xss256k</argLine>
- <ianal.skip>false</ianal.skip>
+ <ianal.phase>verify</ianal.phase>
<sass.skip>false</sass.skip>
<remote-resources.skip>true</remote-resources.skip>
@@ -2316,7 +2314,7 @@ under the License.
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven3-plugin</artifactId>
- <version>1.9.1</version>
+ <version>1.9.4</version>
<configuration>
<configuration>
<type>standalone</type>
@@ -2655,19 +2653,20 @@ under the License.
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <version>1.4</version>
+ <configuration>
+ <!-- Fail the build if any artifacts are missing legal files -->
+ <strict>true</strict>
+ </configuration>
<executions>
<execution>
+ <id>verify-legal-files</id>
+ <phase>${ianal.phase}</phase>
<goals>
<goal>verify-legal-files</goal>
</goals>
- <configuration>
- <!-- Fail the build if any artifacts are missing legal files -->
- <strict>true</strict>
- <skip>${ianal.skip}</skip>
- </configuration>
</execution>
</executions>
</plugin>
@@ -2951,7 +2950,7 @@ under the License.
<properties>
<skipTests>true</skipTests>
- <ianal.skip>true</ianal.skip>
+ <ianal.phase>none</ianal.phase>
<modernizer.skip>true</modernizer.skip>
<rat.skip>true</rat.skip>
<checkstyle.skip>true</checkstyle.skip>
diff --git a/src/main/asciidoc/getting-started/systemRequirements.adoc b/src/main/asciidoc/getting-started/systemRequirements.adoc
index e78e6dc..558f8b9 100644
--- a/src/main/asciidoc/getting-started/systemRequirements.adoc
+++ b/src/main/asciidoc/getting-started/systemRequirements.adoc
@@ -38,7 +38,7 @@ Apache Syncope {docVersion} is verified with the following Java EE containers:
. http://tomcat.apache.org/download-90.cgi[Apache Tomcat 9^]
. http://www.payara.fish/[Payara Server 5^]
- . http://www.wildfly.org/[Wildfly 21^]
+ . http://www.wildfly.org/[Wildfly 23^]
=== Internal Storage
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
index d4c4ef9..40edcbd 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
@@ -39,7 +39,7 @@ for the Master domain.
Each JavaEE Container provides its own way to accomplish this task:
* https://tomcat.apache.org/tomcat-9.0-doc/jdbc-pool.html[Apache Tomcat 9^]
* https://payara.gitbooks.io/payara-server/content/documentation/user-guides/connection-pools/connection-pools.html[Payara Server 5^]
- * http://docs.wildfly.org/21/Admin_Guide.html#DataSource[Wildfly 21^]
+ * http://docs.wildfly.org/23/Admin_Guide.html#DataSource[Wildfly 23^]
****
===== Apache Tomcat 9
@@ -152,7 +152,7 @@ For better performance under GNU / Linux, do not forget to include
among JVM options.
====
-===== Wildfly 20
+===== Wildfly 23
Add
@@ -161,7 +161,6 @@ Add
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
- <version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/standalone/pom.xml b/standalone/pom.xml
index a4ce40e..743fce9 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -179,8 +179,7 @@ under the License.
<fileset dir="../fit/core-reference/target/bundles/" includes="**/*"/>
</copy>
- <!-- Tomcat shared libraries: H2, StAX2 API, Woodstox -->
- <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib"/>
+ <!-- Tomcat shared libraries: StAX2 API, Woodstox -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/lib">
<fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="stax2-api-*.jar"/>
<fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="woodstox-core-asl-*.jar"/>