You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/03/16 15:55:49 UTC
[syncope] 03/36: Now skipping maven-remote-resources-plugin by
default
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 5fb7ef6cb879fcd01bc0d20103197f5803495998
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Mar 3 09:56:09 2020 +0100
Now skipping maven-remote-resources-plugin by default
---
.travis.yml | 2 +-
client/am/console/pom.xml | 2 +-
client/idm/console/pom.xml | 2 +-
client/idrepo/common-ui/pom.xml | 2 +-
client/idrepo/console/pom.xml | 2 +-
client/idrepo/enduser/pom.xml | 2 +-
pom.xml | 20 ++++++++++----------
wa/pom.xml | 17 -----------------
8 files changed, 16 insertions(+), 33 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a1fa1b3..e2597fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,7 @@ jobs:
######################################################
- stage: test
name: "Unit Tests"
- script: mvn -T 1C clean test -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dskip.sass=true
+ script: mvn -T 1C clean test -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dsass.skip=true
######################################################
- stage: fit
name: "Full Integration Tests: Apache Tomcat / H2 / JSON Content-Type"
diff --git a/client/am/console/pom.xml b/client/am/console/pom.xml
index bfddc84..f79ac21 100644
--- a/client/am/console/pom.xml
+++ b/client/am/console/pom.xml
@@ -85,7 +85,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idm/console/pom.xml b/client/idm/console/pom.xml
index adb6a4d..028d8c7 100644
--- a/client/idm/console/pom.xml
+++ b/client/idm/console/pom.xml
@@ -85,7 +85,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idrepo/common-ui/pom.xml b/client/idrepo/common-ui/pom.xml
index 3c49f74..d8be621 100644
--- a/client/idrepo/common-ui/pom.xml
+++ b/client/idrepo/common-ui/pom.xml
@@ -134,7 +134,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/ui-commons/css/accessibility</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idrepo/console/pom.xml b/client/idrepo/console/pom.xml
index 86e69aa..e8447fd 100644
--- a/client/idrepo/console/pom.xml
+++ b/client/idrepo/console/pom.xml
@@ -177,7 +177,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idrepo/enduser/pom.xml b/client/idrepo/enduser/pom.xml
index 4291275..c80e81e 100644
--- a/client/idrepo/enduser/pom.xml
+++ b/client/idrepo/enduser/pom.xml
@@ -150,7 +150,7 @@ under the License.
<destination>${project.build.outputDirectory}/org/apache/syncope/client/enduser/assets/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index 4d3fcde..cda62e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -549,7 +549,8 @@ under the License.
<argLine>-Xms512m -Xmx1024m -Xss256k</argLine>
<ianal.skip>false</ianal.skip>
- <skip.sass>false</skip.sass>
+ <sass.skip>false</sass.skip>
+ <remote-resources.skip>true</remote-resources.skip>
<sonar.language>java</sonar.language>
<sonar.java.source>${targetJdk}</sonar.java.source>
@@ -2539,19 +2540,14 @@ under the License.
</executions>
</plugin>
- <!-- Drop inherited behavior (i.e. don't put any more default LICENSE and NOTICE files in all artifacts) -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <phase>none</phase>
- </execution>
- </executions>
+ <configuration>
+ <skip>${remote-resources.skip}</skip>
+ </configuration>
</plugin>
+
<!-- Put NOTICE and LICENSE files in all artifacts and javadocs -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -2711,6 +2707,10 @@ under the License.
<profile>
<id>apache-release</id>
+ <properties>
+ <remote-resources.skip>false</remote-resources.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/wa/pom.xml b/wa/pom.xml
index 2200324..aa8216d 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -40,7 +40,6 @@ under the License.
<bootstrap-select.version>1.13.11</bootstrap-select.version>
<slf4j.version>1.8.0-beta4</slf4j.version>
- <skip.maven-remote-resources-plugin>true</skip.maven-remote-resources-plugin>
<rootpom.basedir>${basedir}/..</rootpom.basedir>
</properties>
@@ -221,14 +220,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <configuration>
- <skip>${skip.maven-remote-resources-plugin}</skip>
- </configuration>
- </plugin>
</plugins>
<resources>
@@ -317,13 +308,5 @@ under the License.
</plugins>
</build>
</profile>
-
- <profile>
- <id>apache-release</id>
-
- <properties>
- <skip.maven-remote-resources-plugin>false</skip.maven-remote-resources-plugin>
- </properties>
- </profile>
</profiles>
</project>