diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c282ebc6..ca491604 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 193cd089..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Publish package to GitHub Packages -on: - release: - types: [created] -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.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: Build - run: mvn -P github-packages -DskipTests -Dfindbugs.skip=true -Dpmd.skip=true -Dcpd.skip=true -B package - - 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 407aec49..7f4d16f5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,6 @@ omod/src/main/compass/sass-external/* # Rubygems build directories # omod/.rubygems -omod/.rubygems-provided \ No newline at end of file +omod/.rubygems-provided + +.flattened-pom.xml diff --git a/api/pom.xml b/api/pom.xml index e271d372..e0411c0f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ org.openmrs.module registrationapp - 2.2.0-SNAPSHOT + ${revision} registrationapp-api diff --git a/omod/pom.xml b/omod/pom.xml index e321a73a..d8ee71d4 100644 --- a/omod/pom.xml +++ b/omod/pom.xml @@ -4,7 +4,7 @@ org.openmrs.module registrationapp - 2.2.0-SNAPSHOT + ${revision} registrationapp-omod diff --git a/pom.xml b/pom.xml index da59864e..ca479858 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.openmrs.module registrationapp - 2.2.0-SNAPSHOT + ${revision} pom Registration App Module Registration App for the Reference Application @@ -36,6 +36,7 @@ 1.9.9 + 2.2.0 3.13.0 2.9 3.0.5.RELEASE @@ -44,18 +45,18 @@ 1.18 1.2 2.5.0 - 2.2.0-SNAPSHOT + 2.2.0 0.10.4 2.9 3.3.0 1.9.0 - 1.20.1-SNAPSHOT + 1.20.1 0.2.12 2.5 1.8.7 UTF-8 - 1.2.0-SNAPSHOT - 2.2.0-SNAPSHOT + 1.2.0 + 2.2.0 @@ -294,6 +295,33 @@ + + + org.codehaus.mojo + flatten-maven-plugin + 1.1.0 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + diff --git a/web-1.9/pom.xml b/web-1.9/pom.xml index 1253c977..c2a455ab 100644 --- a/web-1.9/pom.xml +++ b/web-1.9/pom.xml @@ -4,7 +4,7 @@ org.openmrs.module registrationapp - 2.2.0-SNAPSHOT + ${revision} registrationapp-web-1.9 diff --git a/web-2.0/pom.xml b/web-2.0/pom.xml index b444fe79..8a30cfa1 100644 --- a/web-2.0/pom.xml +++ b/web-2.0/pom.xml @@ -4,7 +4,7 @@ org.openmrs.module registrationapp - 2.2.0-SNAPSHOT + ${revision} registrationapp-web-2.0