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 2b6f0cfc1a ISIS-3297: consolidate maven-source-plugin from core into
bom
2b6f0cfc1a is described below
commit 2b6f0cfc1a007d9cbfef30a73740d6b8230e0145
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Tue Nov 29 12:14:34 2022 +0100
ISIS-3297: consolidate maven-source-plugin from core into bom
---
bom/pom.xml | 28 ++++++++++++++++++++++------
core/pom.xml | 24 ------------------------
2 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 52e1848ae8..748dcdf250 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -72,6 +72,7 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<!-- PLUGIN DEPENDENCIES -->
+ <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>3.0.0-M7</maven-surefire-report-plugin.version>
<!-- for surefire, failsafe and surefire-report -->
@@ -435,7 +436,6 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
</pluginManagementExcludes>
</configuration>
</plugin>
- <!-- START SNIPPET: release-plugin-configuration -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -446,7 +446,6 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<releaseProfiles>apache-release</releaseProfiles>
</configuration>
</plugin>
- <!-- END SNIPPET: release-plugin-configuration -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -473,10 +472,27 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<version>3.12.1</version> <!--bumped-->
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
- </plugin>
+ <!-- Packaging: source jars of main and
test code -->
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-source-plugin</artifactId>
+
<version>${maven-source-plugin.version}</version>
+ <configuration>
+ <includePom>true</includePom>
+ </configuration>
+ <!-- goal:aggregate (for aggregator
modules) binds to phase:package -->
+ <!-- goal:jar and goal:test-jar are
meant to bind to phase:package,
+ but doesn't seem to so bound
explicitly -->
+ <executions>
+ <execution>
+ <id>package-jars</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+
<goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index c84dc1e4da..2f9ce6037f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -63,30 +63,6 @@
<pluginManagement>
<plugins>
- <!-- Packaging: source jars of main and test
code -->
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-source-plugin</artifactId>
-
<version>${maven-source-plugin.version}</version>
- <configuration>
- <includePom>true</includePom>
- </configuration>
- <!-- goal:aggregate (for aggregator
modules) binds to phase:package -->
- <!-- goal:jar and goal:test-jar are
meant to bind to phase:package,
- but doesn't seem to so bound
explicitly -->
- <executions>
- <execution>
- <id>package-jars</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
-
<goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
