Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into slf4api_2
Browse files Browse the repository at this point in the history
  • Loading branch information
sbesson committed Nov 3, 2023
2 parents d6f142f + f1c7758 commit cb536ec
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,12 @@ jobs:
env:
server: ome.staging
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Repository
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: 1.8
java-version: 8
distribution: 'zulu'
server-id: ${{ env.server }}
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>ome</groupId>
<artifactId>bio-formats-examples</artifactId>
<version>6.12.1-SNAPSHOT</version>
<version>7.1.0-SNAPSHOT</version>

<name>Bio-Formats examples</name>
<description>Bio-Formats examples</description>
Expand All @@ -23,7 +23,7 @@
</licenses>

<properties>
<formats-gpl.version>6.12.0</formats-gpl.version>
<formats-gpl.version>7.0.1</formats-gpl.version>
<logback.version>1.3.5</logback.version>

<!-- NB: Avoid platform encoding warning when copying resources. -->
Expand Down

0 comments on commit cb536ec

Please sign in to comment.