This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 9fb1f64 Removing ianal-maven-plugin for Geronimo's tools-maven-plugin
9fb1f64 is described below
commit 9fb1f64de259937b4f119cf65802133d7887a6b5
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Fri May 21 17:50:04 2021 +0200
Removing ianal-maven-plugin for Geronimo's tools-maven-plugin
---
archetype/src/main/resources/meta-pom.xml | 19 +------------------
fit/console-reference/pom.xml | 9 +--------
fit/core-reference/pom.xml | 10 ++--------
fit/enduser-reference/pom.xml | 10 ++--------
pom.xml | 21 +++++++++++++--------
5 files changed, 19 insertions(+), 50 deletions(-)
diff --git a/archetype/src/main/resources/meta-pom.xml
b/archetype/src/main/resources/meta-pom.xml
index d68a0d0..af7861f 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>
@@ -84,24 +85,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/console-reference/pom.xml b/fit/console-reference/pom.xml
index 07c64d3..5049478 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -34,6 +34,7 @@ under the License.
<packaging>war</packaging>
<properties>
+ <ianal.phase>none</ianal.phase>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
</properties>
@@ -198,14 +199,6 @@ under the License.
<resourceIncludes>src/main/resources/**/*.properties</resourceIncludes>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
<resources>
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 23407fb..79b386d 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -34,6 +34,8 @@ under the License.
<packaging>war</packaging>
<properties>
+ <ianal.phase>none</ianal.phase>
+
<jdbcdriver.groupId>com.h2database</jdbcdriver.groupId>
<jdbcdriver.artifactId>h2</jdbcdriver.artifactId>
@@ -374,14 +376,6 @@ under the License.
<resourceIncludes>src/main/resources/**/*.properties</resourceIncludes>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
<resources>
diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml
index ed39d0e..8606830 100644
--- a/fit/enduser-reference/pom.xml
+++ b/fit/enduser-reference/pom.xml
@@ -34,6 +34,8 @@ under the License.
<packaging>war</packaging>
<properties>
+ <ianal.phase>none</ianal.phase>
+
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
<enduser-test.dir>${project.build.directory}/enduser-test</enduser-test.dir>
<protractor.cmd>${enduser-test.dir}/nodejs/bin/protractor</protractor.cmd>
@@ -349,14 +351,6 @@ under the License.
<resourceIncludes>src/main/resources/**/*.properties</resourceIncludes>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
<resources>
diff --git a/pom.xml b/pom.xml
index a14f4f0..9e08caf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -501,7 +501,6 @@ under the License.
<izpack.version>5.1.3</izpack.version>
<httpclient.version>4.5.13</httpclient.version>
<maven-invoker.version>3.0.1</maven-invoker.version>
- <ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
<tycho.version>1.2.0</tycho.version>
<netbeans.version>RELEASE122</netbeans.version>
@@ -554,6 +553,8 @@ under the License.
<secretKey>1abcdefghilmnopqrstuvz2!</secretKey>
<jwsKey>ZW7pRixehFuNUtnY5Se47IemgMryTzazPPJ9CGX5LTCmsOJpOgHAQEuPQeV9A28f</jwsKey>
+ <ianal.phase>verify</ianal.phase>
+
<!--
Surefire plugin argLine can be defined as a Maven property to avoid JVM
errors on startup with no jacaco-maven-plugin
https://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html
@@ -2417,18 +2418,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>
- </configuration>
</execution>
</executions>
</plugin>
@@ -2726,6 +2729,8 @@ under the License.
<properties>
<skipTests>true</skipTests>
+ <ianal.phase>none</ianal.phase>
+ <rat.skip>true</rat.skip>
</properties>
<build>
