You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/11/29 14:46:06 UTC
[isis] branch master updated: ISIS-3297: poms: deduplicate maven-release-plugin entries
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new fe460702fe ISIS-3297: poms: deduplicate maven-release-plugin entries
fe460702fe is described below
commit fe460702fedd8522bece06c1a22c1eaa1c1499b3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Nov 29 15:45:59 2022 +0100
ISIS-3297: poms: deduplicate maven-release-plugin entries
---
bom/pom.xml | 71 ++++++++++++++++++++++++++++++++++++++---------
commons/pom.xml | 6 ----
core/pom.xml | 64 ++----------------------------------------
viewers/wicket/ui/pom.xml | 1 +
4 files changed, 61 insertions(+), 81 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 8b81762fc7..35ea470698 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -293,6 +293,18 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
</snapshots>
</pluginRepository>
</pluginRepositories>
+ <distributionManagement>
+ <repository>
+ <id>apache.releases.https</id>
+ <name>Apache Release Distribution Repository</name>
+ <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots.https</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>${distMgmtSnapshotsUrl}</url>
+ </snapshotRepository>
+ </distributionManagement>
<build>
<pluginManagement>
<plugins>
@@ -448,7 +460,20 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
<releaseProfiles>apache-release</releaseProfiles>
- </configuration>
+ <!-- overrides the default ('clean verify') -->
+ <preparationGoals>clean install</preparationGoals>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <localCheckout>true</localCheckout>
+ <pushChanges>false</pushChanges>
+ <waitBeforeTagging>1</waitBeforeTagging>
+ <!-- goal:clean (for aggregator modules) has no bindings; cleans up
+ release.properties and any backup POM files -->
+ <!-- goal:prepare (for aggregator modules) has no bindings; prepares
+ for release in SCM (modifying x.x-SNAPSHOT to x.x) -->
+ <!-- goal:update-versions (for aggregator modules) has no bindings;
+ updates versions eg to SNAPSHOT -->
+ <!-- etc; none of the goals has a binding. -->
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -712,6 +737,38 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
</licenseFamilies>
</configuration>
</plugin>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <version>1.5.1</version>
+ <configuration>
+ <statistics>true</statistics>
+ <jswarn>false</jswarn>
+ <suffix>.min</suffix>
+ <excludes>
+ <!-- -->
+ <exclude>**/*.nocompress.js</exclude>
+ <!-- select 2 -->
+ <exclude>**/i18n/*.js</exclude>
+ <exclude>**/select2*.js</exclude>
+ <!-- datetime picker -->
+ <exclude>**/moment-with-locales.js</exclude>
+ <exclude>**/moment-with-locales.min.js</exclude>
+ <exclude>**/tempusdominus-bootstrap-4.js</exclude>
+ <exclude>**/tempusdominus-bootstrap-4.min.js</exclude>
+ <!-- boostrap growl -->
+ <exclude>**/bootstrap-growl.js</exclude>
+ <exclude>**/bootstrap-growl.min.js</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-docck-plugin</artifactId>
@@ -1319,18 +1376,6 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<url>http://github.com/apache/causeway</url>
<tag>HEAD</tag>
</scm>
- <distributionManagement>
- <repository>
- <id>apache.releases.https</id>
- <name>Apache Release Distribution Repository</name>
- <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>${distMgmtSnapshotsUrl}</url>
- </snapshotRepository>
- </distributionManagement>
<inceptionYear>2010</inceptionYear>
<issueManagement>
<system>Jira</system>
diff --git a/commons/pom.xml b/commons/pom.xml
index e4453878f3..4e84adcce8 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -68,12 +68,6 @@
<artifactId>causeway-core-privileged</artifactId>
</dependency>
- <!-- provides @Nullable that's required by Spring 5.x (as Spring is on the module path) -->
-<!-- <dependency>-->
-<!-- <groupId>com.google.code.findbugs</groupId>-->
-<!-- <artifactId>jsr305</artifactId>-->
-<!-- </dependency>-->
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 92e4c4d62c..6126769dc5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -95,85 +95,25 @@
</plugin>
- <!-- release (is also configured in descendant modules) -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>${maven-release-plugin.version}</version>
- <configuration>
- <!-- overriddes the default ('clean verify') as workaround -->
- <preparationGoals>clean install</preparationGoals>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <localCheckout>true</localCheckout>
- <pushChanges>false</pushChanges>
- <waitBeforeTagging>1</waitBeforeTagging>
- </configuration>
- <!-- goal:clean (for aggregator modules) has no bindings; cleans up
- release.properties and any backup POM files -->
- <!-- goal:prepare (for aggregator modules) has no bindings; prepares
- for release in SCM (modifying x.x-SNAPSHOT to x.x) -->
- <!-- goal:update-versions (for aggregator modules) has no bindings;
- updates versions eg to SNAPSHOT -->
- <!-- etc; none of the goals has a binding. -->
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.5.1</version>
- <configuration>
- <statistics>true</statistics>
- <jswarn>false</jswarn>
- <suffix>.min</suffix>
- <excludes>
- <!-- -->
- <exclude>**/*.nocompress.js</exclude>
- <!-- select 2 -->
- <exclude>**/i18n/*.js</exclude>
- <exclude>**/select2*.js</exclude>
- <!-- datetime picker -->
- <exclude>**/moment-with-locales.js</exclude>
- <exclude>**/moment-with-locales.min.js</exclude>
- <exclude>**/tempusdominus-bootstrap-4.js</exclude>
- <exclude>**/tempusdominus-bootstrap-4.min.js</exclude>
- <!-- boostrap growl -->
- <exclude>**/bootstrap-growl.js</exclude>
- <exclude>**/bootstrap-growl.min.js</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
-
<!-- build plugins; apply to all inheriting modules. Note that some plugins
also come from the "super-POM" for the default bindings. For example, in
the 'default' lifecycle, the resources, compiler, surefire, jar, install
and deploy plugins are automatically included because they provide the default
bindings. For the 'site' lifecycle, the site plugin is automatically included. -->
<plugins>
-
<!-- run using: mvn org.apache.rat:apache-rat-plugin:check -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <inherited>true</inherited>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <configuration>
- <!-- overrides the default ('clean verify') -->
- <preparationGoals>clean install</preparationGoals>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
+ <inherited>true</inherited>
</plugin>
</plugins>
</build>
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index d2503abfe1..31f50599f1 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -50,6 +50,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
+ <inherited>true</inherited>
</plugin>
</plugins>
</build>