From da53f811f0a4757f504078fab1f373131f7baefc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Sat, 4 Mar 2023 07:00:42 +0000 Subject: [PATCH 01/10] Bump logback version to 1.3.5 --- build.gradle | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3d17a4b4..8ebf2a92 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ repositories { dependencies { implementation group: 'ome', name: 'formats-gpl', version: '6.11.1' - implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.11' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.5' } task sourcesJar(type: Jar, dependsOn: classes) { diff --git a/pom.xml b/pom.xml index 4ae67dec..8319d2b1 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 6.12.0 - 1.2.11 + 1.3.5 UTF-8 From 2764593207f268731f48719fa865eed1387064b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Sat, 4 Mar 2023 07:01:03 +0000 Subject: [PATCH 02/10] Declare slf4j-api 2.0.x Temporary commit which can be dropped when Bio-Formats ships slf4-api 2 --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 8319d2b1..756b743f 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,11 @@ + + org.slf4j + slf4j-api + 2.0.6 + ${project.groupId} formats-gpl From 6d289210bef4aabfbb2693ade93b3b94e90d8094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Sat, 4 Mar 2023 07:05:18 +0000 Subject: [PATCH 03/10] Set Gradle 7.6 --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0f84d60f..aa3052d7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -15,7 +15,7 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] runs-on: ${{ matrix.os }} env: - gradle_version: # set to empty to build with most recent version of gradle + gradle_version: 7.6 # set to empty to build with most recent version of gradle gradle_commands: publishToMavenLocal exec # default is build steps: - uses: actions/checkout@v2 From 110e921edc0deb9e103e63d7e71ec9e0387f89f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Sat, 4 Mar 2023 07:34:27 +0000 Subject: [PATCH 04/10] Temporarily remove Gradle workflow --- .github/workflows/gradle.yml | 39 ------------------------------------ 1 file changed, 39 deletions(-) delete mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml deleted file mode 100644 index aa3052d7..00000000 --- a/.github/workflows/gradle.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -name: Gradle - -on: - push: - pull_request: - schedule: - - cron: '0 0 * * 0' - -jobs: - build: - strategy: - matrix: - java: [1.8, 11] - os: [ubuntu-latest, windows-latest, macos-latest] - runs-on: ${{ matrix.os }} - env: - gradle_version: 7.6 # set to empty to build with most recent version of gradle - gradle_commands: publishToMavenLocal exec # default is build - steps: - - uses: actions/checkout@v2 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 - with: - java-version: ${{ matrix.java }} - - name: Cache Gradle packages - uses: actions/cache@v2 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: ${{ runner.os }}-gradle - - name: Wrap with specified version - run: gradle wrapper --gradle-version=${{ env.gradle_version }} - if: ${{ env.gradle_version != '' }} - - name: Wrap without version - run: gradle wrapper - if: ${{ env.gradle_version == '' }} - - name: Run commands - run: ./gradlew ${{ env.gradle_commands }} From 80fb3f4c073c4ecff1fe3c07c3c9751fc1c1f4c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 6 Mar 2023 11:29:36 +0000 Subject: [PATCH 05/10] Revert "Temporarily remove Gradle workflow" This reverts commit 110e921edc0deb9e103e63d7e71ec9e0387f89f4. --- .github/workflows/gradle.yml | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 00000000..aa3052d7 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,39 @@ +--- +name: Gradle + +on: + push: + pull_request: + schedule: + - cron: '0 0 * * 0' + +jobs: + build: + strategy: + matrix: + java: [1.8, 11] + os: [ubuntu-latest, windows-latest, macos-latest] + runs-on: ${{ matrix.os }} + env: + gradle_version: 7.6 # set to empty to build with most recent version of gradle + gradle_commands: publishToMavenLocal exec # default is build + steps: + - uses: actions/checkout@v2 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: Cache Gradle packages + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + - name: Wrap with specified version + run: gradle wrapper --gradle-version=${{ env.gradle_version }} + if: ${{ env.gradle_version != '' }} + - name: Wrap without version + run: gradle wrapper + if: ${{ env.gradle_version == '' }} + - name: Run commands + run: ./gradlew ${{ env.gradle_commands }} From 7b9b5796eeb1d3b889a1081c739e0c9c6f3e43c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 6 Mar 2023 11:30:37 +0000 Subject: [PATCH 06/10] Install desired Gradle version with gradle-build-action --- .github/workflows/gradle.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index aa3052d7..07707e23 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -23,17 +23,8 @@ jobs: uses: actions/setup-java@v1 with: java-version: ${{ matrix.java }} - - name: Cache Gradle packages - uses: actions/cache@v2 + - uses: gradle/gradle-build-action@v2 with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: ${{ runner.os }}-gradle - - name: Wrap with specified version - run: gradle wrapper --gradle-version=${{ env.gradle_version }} - if: ${{ env.gradle_version != '' }} - - name: Wrap without version - run: gradle wrapper - if: ${{ env.gradle_version == '' }} + gradle-version: ${{ env.gradle_version }} - name: Run commands - run: ./gradlew ${{ env.gradle_commands }} + run: gradle ${{ env.gradle_commands }} From 53edd3f850089d9ace75f56a2a3d42651a6e1f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Fri, 3 Nov 2023 06:53:08 -0400 Subject: [PATCH 07/10] Bump logback to version 1.3.11 --- build.gradle | 6 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 8ebf2a92..25372cd8 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java' apply plugin: 'maven-publish' group = "ome" -version = "6.12.0-SNAPSHOT" +version = "7.1.0-SNAPSHOT" repositories { mavenCentral() @@ -16,8 +16,8 @@ repositories { } dependencies { - implementation group: 'ome', name: 'formats-gpl', version: '6.11.1' - implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.5' + implementation group: 'ome', name: 'formats-gpl', version: '7.0.1' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.11' } task sourcesJar(type: Jar, dependsOn: classes) { diff --git a/pom.xml b/pom.xml index 65491762..2ec37653 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 7.0.1 - 1.3.5 + 1.3.11 UTF-8 From 55f42660e33938bdcc34b8f5c88fb37e3993a07e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Fri, 17 Nov 2023 18:01:31 +0000 Subject: [PATCH 08/10] Update pom.xml Co-authored-by: David Gault --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ec37653..d1ef7d1b 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ org.slf4j slf4j-api - 2.0.6 + 2.0.9 ${project.groupId} From 65ab1f1649f7a27adc49b47e1c56b13b14425a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Thu, 30 Nov 2023 09:24:59 +0000 Subject: [PATCH 09/10] Bump logback to version 1.3.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1ef7d1b..2864b01f 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 7.0.1 - 1.3.11 + 1.3.13 UTF-8 From 8be00ae2ae93214e28c5964e5c44b4489ecca941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Thu, 30 Nov 2023 09:27:21 +0000 Subject: [PATCH 10/10] Also bump logback in build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 25372cd8..f27c558c 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ repositories { dependencies { implementation group: 'ome', name: 'formats-gpl', version: '7.0.1' - implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.11' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.13' } task sourcesJar(type: Jar, dependsOn: classes) {