Skip to content

Commit

Permalink
Version bump (#61)
Browse files Browse the repository at this point in the history
  • Loading branch information
pmanko authored Jan 19, 2022
1 parent 5d09d63 commit e9667ee
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 52 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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'
40 changes: 0 additions & 40 deletions .github/workflows/release.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ omod/src/main/compass/sass-external/*

# Rubygems build directories #
omod/.rubygems
omod/.rubygems-provided
omod/.rubygems-provided

.flattened-pom.xml
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>registrationapp</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>registrationapp-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion omod/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>registrationapp</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>registrationapp-omod</artifactId>
Expand Down
38 changes: 33 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>org.openmrs.module</groupId>
<artifactId>registrationapp</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>${revision}</version>
<packaging>pom</packaging>
<name>Registration App Module</name>
<description>Registration App for the Reference Application</description>
Expand Down Expand Up @@ -36,6 +36,7 @@

<properties>
<openMRSVersion>1.9.9</openMRSVersion>
<revision>2.2.0</revision>
<uiframeworkVersion>3.13.0</uiframeworkVersion>
<appframeworkVersion>2.9</appframeworkVersion>
<springVersion>3.0.5.RELEASE</springVersion>
Expand All @@ -44,18 +45,18 @@
<emrapiVersion>1.18</emrapiVersion>
<calculationVersion>1.2</calculationVersion>
<providerManagementVersion>2.5.0</providerManagementVersion>
<registrationcoreVersion>2.2.0-SNAPSHOT</registrationcoreVersion>
<registrationcoreVersion>2.2.0</registrationcoreVersion>
<reportingModuleVersion>0.10.4</reportingModuleVersion>
<addresshierarchyVersion>2.9</addresshierarchyVersion>
<htmlformentryVersion>3.3.0</htmlformentryVersion>
<appuiVersion>1.9.0</appuiVersion>
<coreappsVersion>1.20.1-SNAPSHOT</coreappsVersion>
<coreappsVersion>1.20.1</coreappsVersion>
<serializationXstreamModuleVersion>0.2.12</serializationXstreamModuleVersion>
<eventVersion>2.5</eventVersion>
<groovyVersion>1.8.7</groovyVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<m2SysVersion>1.2.0-SNAPSHOT</m2SysVersion>
<xds-senderVersion>2.2.0-SNAPSHOT</xds-senderVersion>
<m2SysVersion>1.2.0</m2SysVersion>
<xds-senderVersion>2.2.0</xds-senderVersion>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -294,6 +295,33 @@
</dependencies>

<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>
Expand Down
2 changes: 1 addition & 1 deletion web-1.9/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>registrationapp</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>registrationapp-web-1.9</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion web-2.0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>registrationapp</artifactId>
<version>2.2.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>

<artifactId>registrationapp-web-2.0</artifactId>
Expand Down

0 comments on commit e9667ee

Please sign in to comment.