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 2019/10/28 11:56:22 UTC
[isis] 01/04: ISIS-2094: trying to get mavenmixin + flatten to work
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 44a65e296f7275037b2fe1eb8becbc72456ebe95
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 28 10:44:32 2019 +0000
ISIS-2094: trying to get mavenmixin + flatten to work
---
.gitlab-ci.yml | 4 ++++
mixins/pom.xml | 17 +++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34d3bf1..6cc126d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,6 +63,10 @@ build-package-push:
-Dgcpappenginerepo-deploy.repositoryUrl=$GCPAPPENGINEREPO_URL \
-Drevision=$REVISION \
-Dskip.assemble-zip \
+ -Dskip.mavenmixin-standard \
+ -Dskip.mavenmixin-docker \
+ -Dskip.mavenmixin-surefire \
+ -Dskip.mavenmixin-datanucleus-enhance \
$CORE_ADDITIONAL_OPTS
- cd ..
- echo ""
diff --git a/mixins/pom.xml b/mixins/pom.xml
index 946e519..129e55a 100644
--- a/mixins/pom.xml
+++ b/mixins/pom.xml
@@ -15,14 +15,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>${revision}</version>
- <relativePath>../core/pom.xml</relativePath>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>21</version>
+ <relativePath />
</parent>
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
+ <version>${revision}</version>
<name>Apache Isis Maven Mixins</name>
<description>
@@ -66,17 +67,13 @@
</resources>
<plugins>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
- <pomElements>
- <dependencyManagement>resolve</dependencyManagement>
- <dependencies>resolve</dependencies>
- </pomElements>
+ <flattenMode>minimum</flattenMode>
</configuration>
<executions>
<execution>