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 2019/10/29 20:28:01 UTC
[isis] 06/23: ISIS-2094: debugging simpleapp build
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9f398eedd4197c7b3fba9e8de1bb637f3c02118f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 28 13:17:54 2019 +0000
ISIS-2094: debugging simpleapp build
---
examples/pom.xml | 11 -----------
mixins/datanucleus-enhance/pom.xml | 4 ++--
mixins/docker/pom.xml | 4 ++--
mixins/pom.xml | 40 ++++++++++++++++++++++++++------------
mixins/standard/pom.xml | 4 ++--
mixins/surefire/pom.xml | 2 +-
6 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index d7e5afd..17c5e44 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -47,17 +47,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <!-- MIXINS -->
-
- <!-- <mavenmixin-standard.version>0.0.4</mavenmixin-standard.version> -->
- <!-- <mavenmixin-datanucleusenhance.version>0.0.5</mavenmixin-datanucleusenhance.version> -->
- <!-- <mavenmixin-surefire.version>0.0.6</mavenmixin-surefire.version> -->
- <!-- <mavenmixin-docker.version>0.0.4</mavenmixin-docker.version> -->
- <!-- <mavenmixin-enforcerrelaxed.version>0.0.2</mavenmixin-enforcerrelaxed.version> -->
- <!-- <mavenmixin-sourceandjavadoc.version>0.0.2</mavenmixin-sourceandjavadoc.version> -->
- <!-- <mavenmixin-staticanalysis.version>0.0.2</mavenmixin-staticanalysis.version> -->
- <!-- <mavenmixin-cucumberreporting.version>0.0.2</mavenmixin-cucumberreporting.version> -->
-
</properties>
<profiles>
diff --git a/mixins/datanucleus-enhance/pom.xml b/mixins/datanucleus-enhance/pom.xml
index 06f48f5..fe9edb5 100644
--- a/mixins/datanucleus-enhance/pom.xml
+++ b/mixins/datanucleus-enhance/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-M3-SNAPSHOT</version>
</parent>
<artifactId>isis-mixin-datanucleus-enhance</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-M3-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/mixins/docker/pom.xml b/mixins/docker/pom.xml
index 51aec72..b3ef1d2 100644
--- a/mixins/docker/pom.xml
+++ b/mixins/docker/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-M3-SNAPSHOT</version>
</parent>
<artifactId>isis-mixin-docker</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-M3-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/mixins/pom.xml b/mixins/pom.xml
index 6ae7b97..1d76f0d 100644
--- a/mixins/pom.xml
+++ b/mixins/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-M3-SNAPSHOT</version>
<name>Apache Isis Maven Mixins</name>
<description>
@@ -41,6 +41,30 @@
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.mixins</groupId>
+ <artifactId>isis-mixin-datanucleus-enhance</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.mixins</groupId>
+ <artifactId>isis-mixin-docker</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.mixins</groupId>
+ <artifactId>isis-mixin-standard</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.mixins</groupId>
+ <artifactId>isis-mixin-surefire</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<modules>
<module>standard</module>
<module>surefire</module>
@@ -49,17 +73,9 @@
</modules>
<profiles>
- <!-- this profile allows builds to be deployed to GCP, hosting a Maven
- repo backed by Google Storage see: https://github.com/renaudcerrato/appengine-maven-repository
- export GCPAPPENGINEREPO_USERNAME=... export GCPAPPENGINEREPO_PASSWORD=...
- export GCPAPPENGINEREPO_URL=... export REVISION=... mvn -s .m2/settings.xml
- \ -B \ clean deploy \ -Dgcpappenginerepo-deploy \ -Dgcpappenginerepo-deploy.repositoryUrl=$GCPAPPENGINEREPO_URL
- \ -Drevision=$REVISION \ -Dskip.assemble-zip \ $CORE_ADDITIONAL_OPTS with
- .m2/settings.xml as: <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
- http://maven.apache.org/xsd/settings-1.0.0.xsd"> <servers> <server> <id>gcpappenginerepo-deploy.serverId</id>
- <username>${env.GCPAPPENGINEREPO_USERNAME}</username> <password>${env.GCPAPPENGINEREPO_PASSWORD}</password>
- </server> </servers> </settings> -->
+ <!--
+ this profile allows builds to be deployed to GCP. See build-mixins.sh script.
+ -->
<profile>
<id>gcpappenginerepo-deploy</id>
<activation>
diff --git a/mixins/standard/pom.xml b/mixins/standard/pom.xml
index 33fc520..55a6f87 100644
--- a/mixins/standard/pom.xml
+++ b/mixins/standard/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-M3-SNAPSHOT</version>
</parent>
<artifactId>isis-mixin-standard</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-M3-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/mixins/surefire/pom.xml b/mixins/surefire/pom.xml
index 62d93b0..ea5e717 100644
--- a/mixins/surefire/pom.xml
+++ b/mixins/surefire/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-M3-SNAPSHOT</version>
</parent>
<artifactId>isis-mixin-surefire</artifactId>