Skip to content

Commit

Permalink
Bump jupiter.version from 5.8.2 to 5.9.0 (#113)
Browse files Browse the repository at this point in the history
* Bump jupiter.version from 5.8.2 to 5.9.0

Bumps `jupiter.version` from 5.8.2 to 5.9.0.

Updates `junit-jupiter-engine` from 5.8.2 to 5.9.0
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.8.2...r5.9.0)

Updates `junit-vintage-engine` from 5.8.2 to 5.9.0
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.8.2...r5.9.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.junit.vintage:junit-vintage-engine
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* fjerner whelk gha action

* Fjerner whelk fra build.yml

* Update release.yml

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frode Carlsen <frode.odde.carlsen@nav.no>
  • Loading branch information
dependabot[bot] and frode-carlsen authored Aug 5, 2022
1 parent 37a7099 commit b059b71
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 30 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ jobs:

steps:
- uses: actions/checkout@v3

- name: Setup maven
uses: whelk-io/maven-settings-xml-action@v20
with:
repositories: '[{ "id": "github", "name": "github", "url": "https://maven.pkg.github.com/${{ github.repository }}", "releases": { "enabled": "true" }, "snapshots": { "enabled": "false" } }]'
servers: '[{ "id": "github", "username": "${{ github.actor }}", "password": "${{ secrets.READER_TOKEN }}" }]'
output_file: settings.xml

- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand All @@ -36,6 +28,4 @@ jobs:
shell: bash
run: |
echo "Building $TAG"
mvn package -B -q -s settings.xml -Drevision=${TAG}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
mvn package -B -q -Drevision=${TAG}
11 changes: 1 addition & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ jobs:

steps:
- uses: actions/checkout@v3

- name: Setup maven
uses: whelk-io/maven-settings-xml-action@v20
with:
repositories: '[{ "id": "github", "name": "github", "url": "https://maven.pkg.github.com/${{ github.repository }}", "releases": { "enabled": "true" }, "snapshots": { "enabled": "false" } }]'
servers: '[{ "id": "github", "username": "${{ github.actor }}", "password": "${{ secrets.READER_TOKEN }}" }]'
output_file: settings.xml

- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand All @@ -50,8 +42,7 @@ jobs:
- name: Build artifacts & deploy
shell: bash
run: |
mvn jacoco:prepare-agent install jacoco:report sonar:sonar -q -B -s settings.xml -Drevision=${MVN_VERSION} -Djacoco.destFile=$(pwd)/target/jacoco.exec -Dsonar.exclusions="**/testutilities/**/*,**/pom.xml,**/src/test/**/*"
mvn jacoco:prepare-agent install jacoco:report sonar:sonar -q -B -Drevision=${MVN_VERSION} -Djacoco.destFile=$(pwd)/target/jacoco.exec -Dsonar.exclusions="**/testutilities/**/*,**/pom.xml,**/src/test/**/*"
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

9 changes: 1 addition & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ jobs:
- name: Checkout latest code
uses: actions/checkout@v3

- name: Setup maven
uses: whelk-io/maven-settings-xml-action@v20
with:
repositories: '[{ "id": "github", "name": "github", "url": "https://maven.pkg.github.com/${{ github.repository }}", "releases": { "enabled": "true" }, "snapshots": { "enabled": "false" } }]'
servers: '[{ "id": "github", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
output_file: settings.xml

- name: Set up JDK
uses: actions/setup-java@v3
with:
Expand All @@ -34,6 +27,6 @@ jobs:
REPO_NAME: ${{ github.repository }}
run: |
echo "-- Setting new release version ${NEW_VERSION} for ${REPO_NAME} --"
mvn versions:set -B -s settings.xml -DnewVersion="${NEW_VERSION}" -DprocessAllModules -DgenerateBackupPoms=false
mvn versions:set -B -DnewVersion="${NEW_VERSION}" -DprocessAllModules -DgenerateBackupPoms=false
echo "-- Build, test and deploy release to GPR --"
mvn clean deploy -B -s settings.xml -DskipTests
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<revision>1.0-SNAPSHOT</revision>
<java.version>17</java.version>
<jupiter.version>5.8.2</jupiter.version>
<jupiter.version>5.9.0</jupiter.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down

0 comments on commit b059b71

Please sign in to comment.