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 2018/09/01 11:17:52 UTC

[isis] branch maint-1.16.2 updated: ISIS-1965: replaces ${revision} for ${isis.version} within dependencyManagement section

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/maint-1.16.2 by this push:
     new f0b0e09  ISIS-1965: replaces ${revision} for ${isis.version} within dependencyManagement section
f0b0e09 is described below

commit f0b0e09027b465a6176e59265df9737c1cdcd147
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Sep 1 12:17:25 2018 +0100

    ISIS-1965: replaces ${revision} for ${isis.version} within dependencyManagement section
    
    otherwise consuming POMs that also use -Drevision for their own versioning, eg incode-platform
---
 core/pom.xml | 71 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 3e934fa..4681a92 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -47,6 +47,7 @@
 
     <properties>
         <revision>1.16.3-SNAPSHOT</revision>
+        <isis.version>${revision}</isis.version>
 
         <jar-plugin.automaticModuleName>org.apache.isis.core</jar-plugin.automaticModuleName>
         <git-plugin.propertiesDir>org/apache/isis/core</git-plugin.propertiesDir>
@@ -853,7 +854,7 @@
 								no requirement as of yet.
                                 <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
                                 <Bundle-Name>${jar-plugin.automaticModuleName}</Bundle-Name>
-                                <Bundle-Version>${revision}</Bundle-Version>
+                                <Bundle-Version>${isis.version}</Bundle-Version>
                                 <Bundle-Vendor>Apache Isis™ Project</Bundle-Vendor>
 								-->
                             </manifestEntries>
@@ -1150,12 +1151,12 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-unittestsupport</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-unittestsupport</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -1164,14 +1165,14 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-applib</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-applib</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -1180,14 +1181,14 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-schema</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-schema</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -1196,7 +1197,7 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-log4j</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
@@ -1205,14 +1206,14 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-metamodel</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-metamodel</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -1221,76 +1222,76 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-runtime</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-runtime</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-wrapper</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
 
             <!-- webserver -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-webserver</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
 
             <!-- specsupport -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-specsupport</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
 
             <!-- integtestsupport -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-integtestsupport</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
 
             <!-- Restful Objects viewer -->
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -1299,12 +1300,12 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-security</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-security-shiro</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
 
             
@@ -1312,41 +1313,41 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-applib</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-model</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-model</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-ui</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-ui</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-impl</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.core</groupId>
                 <artifactId>isis-core-viewer-wicket-impl</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
@@ -1355,26 +1356,26 @@ ${license.additional-notes}
             <dependency>
                 <groupId>org.apache.isis.tool</groupId>
                 <artifactId>isis-maven-plugin</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
             </dependency>
 
             <!-- Maven dependencies -->
             <dependency>
                 <groupId>org.apache.isis.mavendeps</groupId>
                 <artifactId>isis-mavendeps-intellij</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.mavendeps</groupId>
                 <artifactId>isis-mavendeps-testing</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.mavendeps</groupId>
                 <artifactId>isis-mavendeps-webapp</artifactId>
-                <version>${revision}</version>
+                <version>${isis.version}</version>
                 <type>pom</type>
             </dependency>