From 3fdb0508cf8d4fc2b8001c7e7fe143a6e348cc50 Mon Sep 17 00:00:00 2001
From: Piotr Mankowski <pmanko@uw.edu>
Date: Tue, 18 Jan 2022 20:47:02 -0800
Subject: [PATCH] Version bump (#87)

* Version bump
---
 .github/workflows/ci.yml                      | 16 ++++++-
 .github/workflows/release.yml                 | 43 -------------------
 .gitignore                                    |  4 +-
 .../org.openmrs.module/isanteplus-api/pom.xml |  2 +-
 api/pom.xml                                   |  2 +-
 omod/pom.xml                                  |  2 +-
 pom.xml                                       | 36 ++++++++++++++--
 7 files changed, 52 insertions(+), 53 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c282ebc..ca49160 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,8 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-
+  release:
+    types: [ created ]
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -47,6 +48,17 @@ jobs:
                 "username": "${{ secrets.RELEASE_USERNAME }}",
                 "password": "${{ secrets.RELEASE_TOKEN }}"
             }]
+          properties: |
+            [
+              { "maven.wagon.http.ssl.insecure": "true" },
+              { "maven.wagon.http.ssl.allowall": "true" },
+              { "maven.wagon.http.ssl.ignore.validity.dates": "true"}
+            ]
           githubServer: false
       - name: Build with Maven
-        run: mvn -P 'github-packages' -B install
+        run: mvn -P 'github-packages' install
+      - name: Publish package
+        run: mvn -P github-packages -DskipTests -Dfindbugs.skip=true -Dpmd.skip=true -Dcpd.skip=true -B deploy
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        if: github.event_name == 'release' && github.event.action == 'created'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 005a3aa..0000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Publish package to GitHub Packages
-on:
-  release:
-    types: [created]
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 8.0.232
-          server-id: github-packages # Value of the distributionManagement/repository/id field of the pom.xml
-          server-username: pmanko
-          server-password: ${{ secrets.RELEASE_TOKEN }} # env variable for token in deploy
-      - name: Set up Maven
-        uses: stCarolas/setup-maven@v4
-        with:
-          maven-version: 3.6.3
-      - name: Cache Maven packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - uses: s4u/maven-settings-action@v2.2.0
-        with:
-          servers: |
-            [{
-                "id": "github-packages",
-                "username": "${{ secrets.RELEASE_USERNAME }}",
-                "password": "${{ secrets.RELEASE_TOKEN }}"
-            }]
-          githubServer: false
-      - name: Publish package
-        run: mvn -P github-packages -DskipTests -Dfindbugs.skip=true -Dpmd.skip=true -Dcpd.skip=true -B deploy
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-
diff --git a/.gitignore b/.gitignore
index e68497c..69708a8 100755
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,6 @@ omod/target/
 api/bin/pom.xml
 
 # Mac OSX
-.DS_Store
\ No newline at end of file
+.DS_Store
+
+.flattened-pom.xml
diff --git a/META-INF/maven/org.openmrs.module/isanteplus-api/pom.xml b/META-INF/maven/org.openmrs.module/isanteplus-api/pom.xml
index e1e4ced..0bc40f4 100755
--- a/META-INF/maven/org.openmrs.module/isanteplus-api/pom.xml
+++ b/META-INF/maven/org.openmrs.module/isanteplus-api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>isanteplus</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 
 	<artifactId>isanteplus-api</artifactId>
diff --git a/api/pom.xml b/api/pom.xml
index e1e4ced..0bc40f4 100755
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>isanteplus</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 
 	<artifactId>isanteplus-api</artifactId>
diff --git a/omod/pom.xml b/omod/pom.xml
index 73ca173..8e2ef7d 100755
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>isanteplus</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 
 	<artifactId>isanteplus-omod</artifactId>
diff --git a/pom.xml b/pom.xml
index 1b3da02..7e1fc78 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.openmrs.module</groupId>
 	<artifactId>isanteplus</artifactId>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>${revision}</version>
 	<packaging>pom</packaging>
 	<name>iSantePlus Module</name>
 	<description>iSantePlus's customization of the reference app's patient dashboard, adds growth charts, treatment history etc</description>
@@ -43,14 +43,15 @@
 	</modules>
 
 	<properties>
+		<revision>1.4.0</revision>
 		<openMRSVersion>2.0.5</openMRSVersion>
 		<uiframeworkVersion>3.11.0</uiframeworkVersion>
 		<jsonVersion>20160212</jsonVersion>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<emrapiVersion>1.21.0</emrapiVersion>
-		<coreappsVersion>1.20.1-SNAPSHOT</coreappsVersion>
-		<registrationAppVersion>2.2.0-SNAPSHOT</registrationAppVersion>
+		<coreappsVersion>1.20.1</coreappsVersion>
+		<registrationAppVersion>2.2.1</registrationAppVersion>
 		<appuiVersion>1.8.0</appuiVersion>
 		<appframeworkVersion>2.10.0</appframeworkVersion>
 		<metadatadeployVersion>1.8.1</metadatadeployVersion>
@@ -61,7 +62,7 @@
 		<htmlformentryuiVersion>1.6.3</htmlformentryuiVersion>
 		<referenceapplicationVersion>2.6.0</referenceapplicationVersion>
 		<haiticoreVersion>1.0.0-SNAPSHOT</haiticoreVersion>
-		<xds-senderVersion>2.2.0-SNAPSHOT</xds-senderVersion>
+		<xds-senderVersion>2.2.1</xds-senderVersion>
 		<!-- Required to pass tests -->
 		<reportingVersion>1.12.0</reportingVersion>
 		<calculationVersion>1.2</calculationVersion>
@@ -350,6 +351,33 @@
 	</dependencyManagement>
 
 	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+					<updatePomFile>true</updatePomFile>
+					<flattenMode>resolveCiFriendliesOnly</flattenMode>
+				</configuration>
+				<executions>
+					<execution>
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>flatten.clean</id>
+						<phase>clean</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
 		<pluginManagement>
 			<plugins>
 				<plugin>