Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: maproulette/maproulette-java-client
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 27a4f887453a5b666ce71ec67a46631c2fee0e13
Choose a base ref
..
head repository: maproulette/maproulette-java-client
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ce3c97eec6fbf7fd1ad0e7b4261c91140b20eed9
Choose a head ref
Showing with 8 additions and 7 deletions.
  1. +2 −2 .github/workflows/publish-release.yml
  2. +1 −1 .github/workflows/publish-snapshot.yml
  3. +4 −3 .github/workflows/pull-request.yml
  4. +1 −1 build.gradle
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'temurin'
cache: 'gradle'
- uses: gradle/wrapper-validation-action@v1
- uses: gradle/wrapper-validation-action@v3
- name: Publish maproulette-java-client
env:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
2 changes: 1 addition & 1 deletion .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ jobs:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'temurin'
7 changes: 4 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
# Jdk 17 requires gradle 7.3+ https://docs.gradle.org/current/userguide/compatibility.html
java: [11]
java: [11, 17]

steps:
- uses: actions/checkout@v4
@@ -31,7 +31,7 @@ jobs:
path: 'maproulette-backend'
fetch-depth: 0
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
@@ -52,6 +52,7 @@ jobs:
pushd maproulette-backend
touch ./conf/dev.conf
echo 'include "application.conf"' >> ./conf/dev.conf
echo 'play.http.secret.key = "GHACTION_9GcV9VDuy5JjYXBFldfD1Q+4/O8z2AAo3e9ID/tE9iM="' >> ./conf/dev.conf
echo 'db.default {' >> ./conf/dev.conf
echo ' url="jdbc:postgresql://localhost:5432/mr_test"' >> ./conf/dev.conf
echo ' username="osm"' >> ./conf/dev.conf
@@ -88,4 +89,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v1
- uses: gradle/wrapper-validation-action@v3
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ ext {
depJacksonVersion = "2.15.3"
depJacocoVersion = "0.8.3"
depJunitVersion = "5.10.2"
depLombokVersion = "1.18.16"
depLombokVersion = "1.18.32"
depMockitoVersion = "5.12.0"
depSlf4jVersion = "2.0.13"
}