Skip to content

Commit

Permalink
Merge branch 'develop' into refactoring/centralize-dependency-check
Browse files Browse the repository at this point in the history
  • Loading branch information
JaniruTEC authored Feb 6, 2024
2 parents dd50fdb + 29cfde5 commit d834423
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ jobs:
build:
name: Build and Test
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 11
java-version: 21
distribution: 'temurin'
cache: 'maven'
- name: Ensure to use tagged version
Expand All @@ -19,7 +18,7 @@ jobs:
- name: Build and Test
id: buildAndTest
run: mvn -B clean install jacoco:report -Pcoverage
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: artifacts
path: target/*.jar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
ref: "refs/tags/${{ github.event.inputs.tag }}"
- uses: actions/setup-java@v4
with:
java-version: 11
java-version: 21
distribution: 'temurin'
cache: 'maven'
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 11
java-version: 21
distribution: 'temurin'
cache: 'maven'
gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>webdav-nio-adapter-servlet</artifactId>
<version>1.2.4</version>
<version>1.3.0-SNAPSHOT</version>
<name>WebDAV-NIO Adapter Servlet</name>
<description>Servlet serving NIO directory contents as WebDAV resources.</description>
<url>https://github.com/cryptomator/webdav-nio-adapter-servlet</url>
Expand All @@ -19,13 +19,13 @@

<!-- dependencies -->
<servlet.version>4.0.1</servlet.version>
<jackrabbit.version>2.21.20</jackrabbit.version>
<guava.version>32.1.3-jre</guava.version>
<slf4j.version>2.0.9</slf4j.version>
<jackrabbit.version>2.21.22</jackrabbit.version>
<guava.version>33.0.0-jre</guava.version>
<slf4j.version>2.0.11</slf4j.version>

<!-- test dependencies -->
<junit.jupiter.version>5.10.1</junit.jupiter.version>
<mockito.version>5.8.0</mockito.version>
<mockito.version>5.10.0</mockito.version>
<hamcrest.version>2.2</hamcrest.version>

<!-- mvn plugins -->
Expand Down

0 comments on commit d834423

Please sign in to comment.