Merge pull request #6162 from davidwatkins73/waltz-6161-version

Update maven versioning and github actions to set maven release
finos · Jul 27, 2022 · 9037d0d · 9037d0d
2 parents 5374681 + c62e62e
commit 9037d0d
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 36 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -41,6 +41,10 @@ jobs:
         key: ${{ runner.os }}-m2
         restore-keys: ${{ runner.os }}-m2
 
+    - name: Update Maven Project Version
+      if: ${{ github.ref_type == 'tag' }}
+      run: mvn versions:set -DnewVersion=${{ github.ref_name }} -Pci,build-postgres,waltz-postgres;
+
     - name: Build with Maven
       run: mvn -B -s .build.settings.xml -Pci,build-postgres,waltz-postgres clean package;
 

diff --git a/pom.xml b/pom.xml
@@ -19,11 +19,20 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <!--
+    <parent>
+        <groupId>org.finos</groupId>
+        <artifactId>finos</artifactId>
+        <version>4</version>
+    </parent>
+    -->
+
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.finos</groupId>
     <artifactId>waltz</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.43-SNAPSHOT</version>
     <modules>
         <module>waltz-common</module>
         <module>waltz-model</module>
@@ -611,4 +620,6 @@
 
         </plugins>
     </reporting>
+
+
 </project>
diff --git a/waltz-common/pom.xml b/waltz-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.43-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-data/pom.xml b/waltz-data/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.43-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.finos</groupId>
             <artifactId>waltz-model</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.finos</groupId>
             <artifactId>waltz-schema</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Database -->

diff --git a/waltz-integration-test/pom.xml b/waltz-integration-test/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.43-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.finos</groupId>
             <artifactId>waltz-service</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Testing -->

diff --git a/waltz-jobs/pom.xml b/waltz-jobs/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.43-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.finos</groupId>
             <artifactId>waltz-service</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/waltz-model/pom.xml b/waltz-model/pom.xml
@@ -17,31 +17,13 @@
   ~
   -->
 
-<!--
-  ~ Waltz - Enterprise Architecture
-  ~ Copyright (C) 2016, 2017, 2018, 2019 Waltz open source project
-  ~ See README.md for more information
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific
-  ~
-  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.43-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -52,7 +34,7 @@
         <dependency>
             <groupId>org.finos</groupId>
             <artifactId>waltz-common</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/waltz-schema/pom.xml b/waltz-schema/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.43-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/waltz-service/pom.xml b/waltz-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.43-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -36,13 +36,13 @@
         <dependency>
             <groupId>org.finos</groupId>
             <artifactId>waltz-data</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.finos</groupId>
             <artifactId>waltz-common</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
 

diff --git a/waltz-web/pom.xml b/waltz-web/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.43-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>waltz-web</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.finos</groupId>
             <artifactId>waltz-service</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -75,7 +75,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- TEST -->
         <!-- TEST -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>