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/28 17:16:22 UTC

[isis] 10/10: ISIS-2158: isis-maven-mixins: fixes parent pom resolving

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 b3ff1b2392fbab7bdcd8a1d018f466172bb2dacf
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Oct 28 18:15:54 2019 +0100

    ISIS-2158: isis-maven-mixins: fixes parent pom resolving
    
    - not sure whether this solves or breaks CI build
---
 mixins/datanucleus-enhance/pom.xml | 6 +++---
 mixins/docker/pom.xml              | 4 ++--
 mixins/pom.xml                     | 5 ++++-
 mixins/standard/pom.xml            | 4 ++--
 mixins/surefire/pom.xml            | 4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/mixins/datanucleus-enhance/pom.xml b/mixins/datanucleus-enhance/pom.xml
index 06f48f5..8de14ce 100644
--- a/mixins/datanucleus-enhance/pom.xml
+++ b/mixins/datanucleus-enhance/pom.xml
@@ -18,12 +18,12 @@
  	<parent>
  		<groupId>org.apache.isis.mixins</groupId>
  		<artifactId>isis-mixins</artifactId>
- 		<version>1.0.0-SNAPSHOT</version>
+ 		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
  	</parent>
 
 	<artifactId>isis-mixin-datanucleus-enhance</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-
+	
 	<packaging>pom</packaging>
 
 	<name>Apache Isis Maven Mixin - Datanucleus Enhance Mixin</name>
diff --git a/mixins/docker/pom.xml b/mixins/docker/pom.xml
index 51aec72..75010f6 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>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
  	</parent>
 
 	<artifactId>isis-mixin-docker</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
 
diff --git a/mixins/pom.xml b/mixins/pom.xml
index d8434d4..33d544d 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</version>
+	<version>${revision}</version>
 
 	<name>Apache Isis Maven Mixins</name>
 	<description>
@@ -33,6 +33,9 @@
 	<packaging>pom</packaging>
 
 	<properties>
+	
+		<revision>1.0.0</revision>
+	
 		<jar-plugin.automaticModuleName>org.apache.isis.mixins</jar-plugin.automaticModuleName>
 		<git-plugin.propertiesDir>org/apache/isis/mixins</git-plugin.propertiesDir>
 
diff --git a/mixins/standard/pom.xml b/mixins/standard/pom.xml
index 33fc520..0b6fb18 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>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
  	</parent>
 
 	<artifactId>isis-mixin-standard</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
 
diff --git a/mixins/surefire/pom.xml b/mixins/surefire/pom.xml
index 62d93b0..5a29027 100644
--- a/mixins/surefire/pom.xml
+++ b/mixins/surefire/pom.xml
@@ -18,11 +18,11 @@
  	<parent>
  		<groupId>org.apache.isis.mixins</groupId>
  		<artifactId>isis-mixins</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
  	</parent>
 
 	<artifactId>isis-mixin-surefire</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
 
 	<packaging>pom</packaging>