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 e184d9e4ed [SYNCOPE-1729] Configuring Maven Build Cache Extension (#409) e184d9e4ed is described below commit e184d9e4ed52a1d5547f197b255af00b03d33d7c Author: Francesco Chicchiriccò <ilgro...@users.noreply.github.com> AuthorDate: Wed Feb 8 17:54:37 2023 +0100 [SYNCOPE-1729] Configuring Maven Build Cache Extension (#409) --- .github/workflows/codeql-analysis.yml | 11 +++-- .github/workflows/crosschecks.yml | 11 +++-- .github/workflows/fit_Elasticsearch.yml | 11 +++-- .github/workflows/fit_Payara.yml | 11 +++-- .github/workflows/fit_Tomcat_H2_JSON.yml | 11 +++-- .github/workflows/fit_Tomcat_H2_XML.yml | 11 +++-- .github/workflows/fit_Tomcat_H2_YAML.yml | 11 +++-- .github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml | 11 +++-- .github/workflows/fit_WA_SRA_CASClient.yml | 13 +++--- .github/workflows/fit_WA_SRA_OAuth2.yml | 11 +++-- .github/workflows/fit_WA_SRA_OIDC.yml | 11 +++-- .github/workflows/fit_WA_SRA_SAML2.yml | 11 +++-- .github/workflows/fit_Wildfly.yml | 11 +++-- .github/workflows/fit_Zookeeper.yml | 11 +++-- .github/workflows/mariadb.yml | 11 +++-- .github/workflows/mysql.yml | 24 +++++++---- .github/workflows/oracle.yml | 22 +++++++--- .github/workflows/postgresql.yml | 22 +++++++--- .mvn/extensions.xml | 26 ++++++++++++ .mvn/maven-build-cache-config.xml | 53 ++++++++++++++++++++++++ core/idm/logic/pom.xml | 4 +- core/persistence-jpa-json/pom.xml | 12 +++--- core/persistence-jpa/pom.xml | 4 +- core/provisioning-java/pom.xml | 4 +- core/starter/pom.xml | 1 - pom.xml | 4 +- wa/starter/pom.xml | 4 +- 27 files changed, 264 insertions(+), 83 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e986f03070..35a766bb02 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -47,11 +47,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/crosschecks.yml b/.github/workflows/crosschecks.yml index 53cca9847e..2b0f520452 100644 --- a/.github/workflows/crosschecks.yml +++ b/.github/workflows/crosschecks.yml @@ -44,11 +44,16 @@ jobs: with: distribution: 'zulu' java-version: ${{ matrix.java }} + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: Validate diff --git a/.github/workflows/fit_Elasticsearch.yml b/.github/workflows/fit_Elasticsearch.yml index ed15c929fb..ea9d6455fd 100644 --- a/.github/workflows/fit_Elasticsearch.yml +++ b/.github/workflows/fit_Elasticsearch.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Elasticsearch / H2 / JSON' diff --git a/.github/workflows/fit_Payara.yml b/.github/workflows/fit_Payara.yml index aab0c5c258..be355dc2ea 100644 --- a/.github/workflows/fit_Payara.yml +++ b/.github/workflows/fit_Payara.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Payara / H2 / JSON' diff --git a/.github/workflows/fit_Tomcat_H2_JSON.yml b/.github/workflows/fit_Tomcat_H2_JSON.yml index d8537cc21d..116afde556 100644 --- a/.github/workflows/fit_Tomcat_H2_JSON.yml +++ b/.github/workflows/fit_Tomcat_H2_JSON.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Tomcat / H2 / JSON' diff --git a/.github/workflows/fit_Tomcat_H2_XML.yml b/.github/workflows/fit_Tomcat_H2_XML.yml index 000c6b01af..fcddac7f49 100644 --- a/.github/workflows/fit_Tomcat_H2_XML.yml +++ b/.github/workflows/fit_Tomcat_H2_XML.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Tomcat / H2 / XML' diff --git a/.github/workflows/fit_Tomcat_H2_YAML.yml b/.github/workflows/fit_Tomcat_H2_YAML.yml index 9b5024ed29..fa7d40fa8a 100644 --- a/.github/workflows/fit_Tomcat_H2_YAML.yml +++ b/.github/workflows/fit_Tomcat_H2_YAML.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Tomcat / H2 / YAML' diff --git a/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml b/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml index 427569491f..3186159a95 100644 --- a/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml +++ b/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'WA / SAML2SP4UI, OIDCC4UI' diff --git a/.github/workflows/fit_WA_SRA_CASClient.yml b/.github/workflows/fit_WA_SRA_CASClient.yml index e7634eb4aa..e5a7fe652a 100644 --- a/.github/workflows/fit_WA_SRA_CASClient.yml +++ b/.github/workflows/fit_WA_SRA_CASClient.yml @@ -37,14 +37,17 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' -# - name: Setup tmate session -# uses: mxschmitt/action-tmate@v3 - name: 'WA / SRA / CAS Client' run: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -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 0d1fd8a636..a6f9299ef5 100644 --- a/.github/workflows/fit_WA_SRA_OAuth2.yml +++ b/.github/workflows/fit_WA_SRA_OAuth2.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'WA / SRA / OAuth 2.0' diff --git a/.github/workflows/fit_WA_SRA_OIDC.yml b/.github/workflows/fit_WA_SRA_OIDC.yml index df0db31615..cd0763822f 100644 --- a/.github/workflows/fit_WA_SRA_OIDC.yml +++ b/.github/workflows/fit_WA_SRA_OIDC.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'WA / SRA / OpenID Connect 1.0' diff --git a/.github/workflows/fit_WA_SRA_SAML2.yml b/.github/workflows/fit_WA_SRA_SAML2.yml index b9fa59f07a..61c4dca65c 100644 --- a/.github/workflows/fit_WA_SRA_SAML2.yml +++ b/.github/workflows/fit_WA_SRA_SAML2.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'WA / SRA / SAML 2.0' diff --git a/.github/workflows/fit_Wildfly.yml b/.github/workflows/fit_Wildfly.yml index 41bfac3273..1d342eaa18 100644 --- a/.github/workflows/fit_Wildfly.yml +++ b/.github/workflows/fit_Wildfly.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Wildfly / H2 / JSON' diff --git a/.github/workflows/fit_Zookeeper.yml b/.github/workflows/fit_Zookeeper.yml index f714f70bba..7c808842f3 100644 --- a/.github/workflows/fit_Zookeeper.yml +++ b/.github/workflows/fit_Zookeeper.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Zookeeper / H2 / JSON' diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml index c1fc08387f..873c24e881 100644 --- a/.github/workflows/mariadb.yml +++ b/.github/workflows/mariadb.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Integration Tests: MariaDB' diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index 1fb5fd9f49..113fd99b66 100644 --- a/.github/workflows/mysql.yml +++ b/.github/workflows/mysql.yml @@ -35,13 +35,18 @@ jobs: - name: Setup Java JDK uses: actions/setup-java@v3 with: - distribution: 'zulu' + distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Integration Tests: MySQL' @@ -58,11 +63,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Unit Tests: MySQL JPA JSON' diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml index 9931707e55..ea055def89 100644 --- a/.github/workflows/oracle.yml +++ b/.github/workflows/oracle.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Integration Tests: Oracle' @@ -58,11 +63,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Unit Tests: Oracle JPA JSON' diff --git a/.github/workflows/postgresql.yml b/.github/workflows/postgresql.yml index 373fd982a9..b9a92dadcd 100644 --- a/.github/workflows/postgresql.yml +++ b/.github/workflows/postgresql.yml @@ -37,11 +37,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Integration Tests: PostgreSQL' @@ -58,11 +63,16 @@ jobs: with: distribution: 'zulu' java-version: 17 + - name: Setup Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.0 - uses: actions/cache@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Build run: mvn -U -T 1C -P 'skipTests,all' - name: 'Unit Tests: PostgreSQL JPA JSON' diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000000..26be302595 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<extensions> + <extension> + <groupId>org.apache.maven.extensions</groupId> + <artifactId>maven-build-cache-extension</artifactId> + <version>1.0.0</version> + </extension> +</extensions> diff --git a/.mvn/maven-build-cache-config.xml b/.mvn/maven-build-cache-config.xml new file mode 100644 index 0000000000..0f0daea7fa --- /dev/null +++ b/.mvn/maven-build-cache-config.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<cache xmlns="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0 + http://maven.apache.org/xsd/cache-config-1.0.0.xsd"> + <configuration> + <enabled>true</enabled> + <hashAlgorithm>XX</hashAlgorithm> + </configuration> + <input> + <global> + <glob>{*.java,*.xml,*.properties}</glob> + </global> + </input> + <executionControl> + <runAlways> + <plugins> + <plugin artifactId="maven-failsafe-plugin"/> + </plugins> + <executions> + <execution artifactId="maven-dependency-plugin"> + <execIds> + <execId>unpack-autoupdate</execId> + </execIds> + </execution> + </executions> + <goalsLists> + <goalsList artifactId="maven-install-plugin"> + <goals> + <goal>install</goal> + </goals> + </goalsList> + </goalsLists> + </runAlways> + </executionControl> +</cache> diff --git a/core/idm/logic/pom.xml b/core/idm/logic/pom.xml index 9ec7bde15d..3dd6e522d4 100644 --- a/core/idm/logic/pom.xml +++ b/core/idm/logic/pom.xml @@ -132,9 +132,9 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <systemProperties> + <systemPropertyVariables> <syncope.connid.location>file:${bundles.directory}/</syncope.connid.location> - </systemProperties> + </systemPropertyVariables> </configuration> </plugin> diff --git a/core/persistence-jpa-json/pom.xml b/core/persistence-jpa-json/pom.xml index 0b32de86df..e7791456dc 100644 --- a/core/persistence-jpa-json/pom.xml +++ b/core/persistence-jpa-json/pom.xml @@ -248,12 +248,12 @@ under the License. <include>**/*Test.java</include> </includes> <excludedGroups>multitenancy,plainAttrTable</excludedGroups> - <systemProperties> + <systemPropertyVariables> <profileId>${project.activeProfiles[0].id}</profileId> <CORE_PROPERTIES>classpath:core-pgjsonb.properties,classpath:core-pgjsonb-test.properties</CORE_PROPERTIES> <DB_CONTAINER_IP>${docker.container.postgres.ip}</DB_CONTAINER_IP> <syncope.connid.location>file:${bundles.directory}/</syncope.connid.location> - </systemProperties> + </systemPropertyVariables> </configuration> </plugin> @@ -362,12 +362,12 @@ under the License. <include>**/*Test.java</include> </includes> <excludedGroups>multitenancy,plainAttrTable</excludedGroups> - <systemProperties> + <systemPropertyVariables> <profileId>${project.activeProfiles[0].id}</profileId> <CORE_PROPERTIES>classpath:core-myjson.properties,classpath:core-myjson-test.properties</CORE_PROPERTIES> <DB_CONTAINER_IP>${docker.container.mysql.ip}</DB_CONTAINER_IP> <syncope.connid.location>file:${bundles.directory}/</syncope.connid.location> - </systemProperties> + </systemPropertyVariables> </configuration> </plugin> @@ -477,12 +477,12 @@ under the License. <include>**/*Test.java</include> </includes> <excludedGroups>multitenancy,plainAttrTable</excludedGroups> - <systemProperties> + <systemPropertyVariables> <profileId>${project.activeProfiles[0].id}</profileId> <CORE_PROPERTIES>classpath:core-ojson.properties,classpath:core-ojson-test.properties</CORE_PROPERTIES> <DB_CONTAINER_IP>${docker.container.oracle.ip}</DB_CONTAINER_IP> <syncope.connid.location>file:${bundles.directory}/</syncope.connid.location> - </systemProperties> + </systemPropertyVariables> </configuration> </plugin> diff --git a/core/persistence-jpa/pom.xml b/core/persistence-jpa/pom.xml index a33beac8cc..641bd7295c 100644 --- a/core/persistence-jpa/pom.xml +++ b/core/persistence-jpa/pom.xml @@ -178,11 +178,11 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <systemProperties> + <systemPropertyVariables> <syncope.connid.location>file:${bundles.directory}/</syncope.connid.location> <h2.returnOffsetDateTime>true</h2.returnOffsetDateTime> <CORE_PROPERTIES>classpath:core-test.properties</CORE_PROPERTIES> - </systemProperties> + </systemPropertyVariables> </configuration> </plugin> diff --git a/core/provisioning-java/pom.xml b/core/provisioning-java/pom.xml index 16cce32ceb..290e675439 100644 --- a/core/provisioning-java/pom.xml +++ b/core/provisioning-java/pom.xml @@ -179,10 +179,10 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <systemProperties> + <systemPropertyVariables> <syncope.conf.dir>${project.build.directory}/test-classes</syncope.conf.dir> <syncope.connid.location>file:${bundles.directory}/</syncope.connid.location> - </systemProperties> + </systemPropertyVariables> </configuration> </plugin> diff --git a/core/starter/pom.xml b/core/starter/pom.xml index 7d9c6058bd..cfe261795e 100644 --- a/core/starter/pom.xml +++ b/core/starter/pom.xml @@ -99,7 +99,6 @@ under the License. <outputDirectory>${project.build.directory}/swagger-ui</outputDirectory> <includeGroupIds>org.webjars</includeGroupIds> <includeArtifactIds>swagger-ui</includeArtifactIds> - <overWrite>true</overWrite> <includes>**</includes> <excludes>**/*.gz</excludes> <scope>provided</scope> diff --git a/pom.xml b/pom.xml index 31d3567605..aea2884914 100644 --- a/pom.xml +++ b/pom.xml @@ -536,6 +536,7 @@ under the License. <targetJdk>17</targetJdk> <rootpom.basedir>${basedir}</rootpom.basedir> + <maven.multiModuleProjectDirectory>${rootpom.basedir}</maven.multiModuleProjectDirectory> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -1666,7 +1667,6 @@ under the License. <version>2.22.2</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> - <encoding>utf-8</encoding> <runOrder>alphabetical</runOrder> </configuration> <executions> @@ -1692,7 +1692,6 @@ under the License. </dependencies> <configuration> <configLocation>${rootpom.basedir}/src/main/resources/org/apache/syncope/checkstyle.xml</configLocation> - <targetJdk>${targetJdk}</targetJdk> <includeTestSourceDirectory>true</includeTestSourceDirectory> </configuration> </plugin> @@ -2263,6 +2262,7 @@ under the License. <id>skipTests</id> <properties> + <maven.build.cache.skipCache>true</maven.build.cache.skipCache> <skipTests>true</skipTests> <ianal.phase>none</ianal.phase> <modernizer.skip>true</modernizer.skip> diff --git a/wa/starter/pom.xml b/wa/starter/pom.xml index d1fab0f8d1..0599d7563f 100644 --- a/wa/starter/pom.xml +++ b/wa/starter/pom.xml @@ -443,9 +443,9 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <systemProperties> + <systemPropertyVariables> <syncope.conf.dir>${project.build.directory}/test-classes</syncope.conf.dir> - </systemProperties> + </systemPropertyVariables> </configuration> </plugin>