Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Version bump #86

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Version bump #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 14 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
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'
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ omod/target/
api/bin/pom.xml

# Mac OSX
.DS_Store
.DS_Store

.flattened-pom.xml
2 changes: 1 addition & 1 deletion META-INF/maven/org.openmrs.module/isanteplus-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion omod/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
36 changes: 32 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down