From f5e2b22dd936030292e8a10daffb4a66bc157d03 Mon Sep 17 00:00:00 2001 From: Klemens Muthmann Date: Mon, 27 Jan 2020 15:45:30 +0100 Subject: [PATCH 1/5] Creat Github Actions Datei --- .github/workflows/maven.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..79addd2 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,23 @@ +name: Publish to Github Packages + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Maven + run: mvn -B package --file pom.xml + - name: Deploy to Github Package Registry + env: + GITHUB_USERNAME: x-access-token + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: + mvn --settings settings.xml deploy From 789d6b173f8db636c9a60e2e941579236d6958f5 Mon Sep 17 00:00:00 2001 From: Klemens Muthmann Date: Mon, 27 Jan 2020 23:02:55 +0100 Subject: [PATCH 2/5] Add settings for package deployment --- settings.xml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 settings.xml diff --git a/settings.xml b/settings.xml new file mode 100644 index 0000000..0687772 --- /dev/null +++ b/settings.xml @@ -0,0 +1,39 @@ + + + + github + + + + + github + + + central + https://repo1.maven.org/maven2 + + true + + + true + + + + github + GitHub OWNER Apache Maven Packages + https://maven.pkg.github.com/cyface-de + + + + + + + + github + ${env.GITHUB_USERNAME} + ${env.GITHUB_TOKEN} + + + From f9fa0088c07b32b1a3ee8b7fbc0aa1abe31b0b53 Mon Sep 17 00:00:00 2001 From: Klemens Muthmann Date: Mon, 27 Jan 2020 23:03:17 +0100 Subject: [PATCH 3/5] Fix build command in Github Workflow --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 79addd2..0b4028a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -14,10 +14,10 @@ jobs: with: java-version: 1.8 - name: Build with Maven - run: mvn -B package --file pom.xml + run: mvn -B package --file pom.xml -pl '!brouter-routing-app' - name: Deploy to Github Package Registry env: GITHUB_USERNAME: x-access-token GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: - mvn --settings settings.xml deploy + mvn --settings settings.xml deploy -pl '!brouter-routing-app' From 8a033e311cfb238ade702e6c986d30d2f8573ca8 Mon Sep 17 00:00:00 2001 From: Klemens Muthmann Date: Tue, 28 Jan 2020 09:43:45 +0100 Subject: [PATCH 4/5] Add repository to POM file --- pom.xml | 292 ++++++++++++++++++++++++++------------------------- settings.xml | 4 +- 2 files changed, 152 insertions(+), 144 deletions(-) diff --git a/pom.xml b/pom.xml index fe2bfff..b495775 100644 --- a/pom.xml +++ b/pom.xml @@ -1,158 +1,166 @@ - 4.0.0 - org.btools - brouter - 1.5.5 - pom - http://brouter.de/brouter/ - brouter - configurable OSM offline router with elevation awareness, Java + Android + 4.0.0 + org.btools + brouter + 1.5.5 + pom + http://brouter.de/brouter/ + brouter + configurable OSM offline router with elevation awareness, Java + Android - - brouter-util - brouter-codec - brouter-expressions - brouter-mapaccess - brouter-core - brouter-map-creator - brouter-server - brouter-routing-app - + + brouter-util + brouter-codec + brouter-expressions + brouter-mapaccess + brouter-core + brouter-map-creator + brouter-server + brouter-routing-app + - - - arndt.brenschede - Arndt Brenschede - Arndt.Brenschede@web.de - - - norbert.truchsess - Norbert Truchsess - norbert.truchsess@t-online.de - - + + + arndt.brenschede + Arndt Brenschede + Arndt.Brenschede@web.de + + + norbert.truchsess + Norbert Truchsess + norbert.truchsess@t-online.de + + - - UTF-8 - UTF-8 - 1.6 - + + UTF-8 + UTF-8 + 1.6 + - - - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - 3.6.0 - true - - gen - gen - true - - 28 - - - - -Xmn16m - -Xms256m - -Xmx512m - - - - + + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + 3.6.0 + true + + gen + gen + true + + 28 + + + + -Xmn16m + -Xms256m + -Xmx512m + + + + - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - - - jar-with-dependencies - - - + + org.apache.maven.plugins + maven-assembly-plugin + 2.4 + + + jar-with-dependencies + + + - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${targetJdk} - ${targetJdk} - -Xlint:unchecked - - + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + ${targetJdk} + ${targetJdk} + -Xlint:unchecked + + - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - false - brensche.de/brouter]]> - true - protected - false - - + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + false + brensche.de/brouter]]> + true + protected + false + + - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - + + org.apache.maven.plugins + maven-resources-plugin + 2.6 + - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadoc - package - - jar - - - - + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadoc + package + + jar + + + + - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - package - - jar-no-fork - - - - - - + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + package + + jar-no-fork + + + + + + - - - - junit - junit - 4.12 - test - - - + + + + junit + junit + 4.12 + test + + + + + + + github + GitHub OWNER Apache Maven Packages + https://maven.pkg.github.com/cyface-de/brouter + + diff --git a/settings.xml b/settings.xml index 0687772..59d8e41 100644 --- a/settings.xml +++ b/settings.xml @@ -22,8 +22,8 @@ github - GitHub OWNER Apache Maven Packages - https://maven.pkg.github.com/cyface-de + GitHub Cyface Apache Maven Packages + https://maven.pkg.github.com/cyface-de/brouter From aef31e0447b9d08ef1793ae6f22c6d36aa8a803b Mon Sep 17 00:00:00 2001 From: Klemens Muthmann Date: Tue, 28 Jan 2020 10:46:56 +0100 Subject: [PATCH 5/5] Make Workflow more generic --- .github/workflows/maven.yml | 6 +++++- pom.xml | 4 ++-- settings.xml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0b4028a..9eb957c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,6 +1,9 @@ name: Publish to Github Packages -on: [push] +on: + push: + branches: + - master jobs: build: @@ -19,5 +22,6 @@ jobs: env: GITHUB_USERNAME: x-access-token GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_REPOSITORY: ${{ github.repository }} run: mvn --settings settings.xml deploy -pl '!brouter-routing-app' diff --git a/pom.xml b/pom.xml index b495775..8e92396 100644 --- a/pom.xml +++ b/pom.xml @@ -159,8 +159,8 @@ github - GitHub OWNER Apache Maven Packages - https://maven.pkg.github.com/cyface-de/brouter + GitHub brouter Apache Maven Packages + https://maven.pkg.github.com/${env.GITHUB_REPOSITORY} diff --git a/settings.xml b/settings.xml index 59d8e41..3ecb113 100644 --- a/settings.xml +++ b/settings.xml @@ -23,7 +23,7 @@ github GitHub Cyface Apache Maven Packages - https://maven.pkg.github.com/cyface-de/brouter + https://maven.pkg.github.com/${env.GITHUB_REPOSITORY}