You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2022/04/11 16:30:14 UTC
[isis] branch master updated: ISIS-2998: adds -X for debug, bumps mvn-deploy-plugin to 3.0.0-M2, moves build/extensions to top-level pom
This is an automated email from the ASF dual-hosted git repository.
danhaywood 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 56f1e024c4 ISIS-2998: adds -X for debug, bumps mvn-deploy-plugin to 3.0.0-M2, moves build/extensions to top-level pom
56f1e024c4 is described below
commit 56f1e024c4dbcf2cee149d2e1e16bac388c86fc6
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Apr 11 17:30:06 2022 +0100
ISIS-2998: adds -X for debug, bumps mvn-deploy-plugin to 3.0.0-M2, moves build/extensions to top-level pom
---
.../workflows/ci-build-artifacts-push-maven.yml | 1 +
core/pom.xml | 32 ++++---------------
isis-parent/pom.xml | 37 +++++++++++++++-------
3 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/.github/workflows/ci-build-artifacts-push-maven.yml b/.github/workflows/ci-build-artifacts-push-maven.yml
index 474a0e1548..af1366f1fd 100644
--- a/.github/workflows/ci-build-artifacts-push-maven.yml
+++ b/.github/workflows/ci-build-artifacts-push-maven.yml
@@ -88,6 +88,7 @@ jobs:
-Denforcer.failFast=true
-Djacoco.skip=true
-DinstallAtEnd=true -DdeployAtEnd=true
+ -X
GITHUB_TOKEN: ${{ github.token }}
MVN_STAGES: deploy
SOURCE_MODE: attach
diff --git a/core/pom.xml b/core/pom.xml
index 7326a50550..f697fec215 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -90,7 +90,7 @@
<assertj-guava.version>3.4.0</assertj-guava.version>
<camel.version>3.14.2</camel.version>
-
+
<commons-email.version>1.5</commons-email.version>
<commons-httpclient.version>4.5.12</commons-httpclient.version>
<commons-io.version>2.11.0</commons-io.version>
@@ -246,26 +246,6 @@
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
- <extensions>
- <!-- scp and sftp support for deployments. -->
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>3.5.1</version>
- </extension>
- <!-- ftp support for deployments. -->
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ftp</artifactId>
- <version>3.5.1</version>
- </extension>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>3.2.1</version>
- </extension>
- </extensions>
-
<pluginManagement>
<plugins>
@@ -848,13 +828,13 @@
</dependency>
<!-- THIRD PARTY DEPENDENCIES -->
-
+
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
@@ -1027,7 +1007,7 @@
<version>${javax-servlet.version}</version>
</dependency>
- <!-- 3.2 not available yet, instead use org.datanucleus:javax.jdo
+ <!-- 3.2 not available yet, instead use org.datanucleus:javax.jdo
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
@@ -1378,7 +1358,7 @@
<artifactId>objenesis</artifactId>
<version>${objenesis.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
@@ -1434,7 +1414,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
- <version>${wicket-viewer-jquery.version}</version>
+ <version>${wicket-viewer-jquery.version}</version>
</dependency>
<dependency>
diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml
index 960e717bb5..b014606b6e 100644
--- a/isis-parent/pom.xml
+++ b/isis-parent/pom.xml
@@ -366,6 +366,21 @@ under the License.
-->
<build>
+ <extensions>
+ <!-- scp and sftp support for deployments. -->
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>3.5.1</version>
+ </extension>
+ <!-- ftp support for deployments. -->
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ftp</artifactId>
+ <version>3.5.1</version>
+ </extension>
+ </extensions>
+
<pluginManagement>
<plugins>
<!-- set versions of common plugins for reproducibility, ordered alphabetically -->
@@ -397,7 +412,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>3.0.0-M2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1092,7 +1107,7 @@ under the License.
</repository>
</distributionManagement>
</profile>
-
+
<profile>
<id>nightly-localfs-repo</id>
<activation>
@@ -1102,17 +1117,17 @@ under the License.
</activation>
<repositories>
<repository>
- <id>nightly-localfs-repo</id>
- <name>Temporary Local Filesystem Staging Repository</name>
- <url>file://${MVN_SNAPSHOTS_PATH}</url>
+ <id>nightly-localfs-repo</id>
+ <name>Temporary Local Filesystem Staging Repository</name>
+ <url>file://${MVN_SNAPSHOTS_PATH}</url>
</repository>
</repositories>
<distributionManagement>
<repository>
- <id>nightly-localfs-repo</id>
- <name>Temporary Local Filesystem Staging Repository</name>
- <url>file://${MVN_SNAPSHOTS_PATH}</url>
- </repository>
+ <id>nightly-localfs-repo</id>
+ <name>Temporary Local Filesystem Staging Repository</name>
+ <url>file://${MVN_SNAPSHOTS_PATH}</url>
+ </repository>
</distributionManagement>
<build>
<plugins>
@@ -1128,8 +1143,8 @@ under the License.
</plugins>
</build>
</profile>
-
-
+
+
<!-- APACHE ISIS customisation 15/15: end -->
</profiles>