Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump logback to 1.3.13 #105

Merged
merged 12 commits into from
Dec 5, 2023
Merged

Bump logback to 1.3.13 #105

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
da53f81
Bump logback version to 1.3.5
sbesson Mar 4, 2023
2764593
Declare slf4j-api 2.0.x
sbesson Mar 4, 2023
6d28921
Set Gradle 7.6
sbesson Mar 4, 2023
110e921
Temporarily remove Gradle workflow
sbesson Mar 4, 2023
80fb3f4
Revert "Temporarily remove Gradle workflow"
sbesson Mar 6, 2023
7b9b579
Install desired Gradle version with gradle-build-action
sbesson Mar 6, 2023
d6f142f
Merge remote-tracking branch 'origin/master' into slf4api_2
sbesson Mar 7, 2023
cb536ec
Merge remote-tracking branch 'origin/master' into slf4api_2
sbesson Nov 3, 2023
53edd3f
Bump logback to version 1.3.11
sbesson Nov 3, 2023
55f4266
Update pom.xml
sbesson Nov 17, 2023
65ab1f1
Bump logback to version 1.3.13
sbesson Nov 30, 2023
8be00ae
Also bump logback in build.gradle
sbesson Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,16 @@ 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
- name: Set up JDK ${{ matrix.java }}
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 }}
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

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

<!-- NB: Avoid platform encoding warning when copying resources. -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -38,6 +38,11 @@
</properties>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.6</version>
sbesson marked this conversation as resolved.
Show resolved Hide resolved
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>formats-gpl</artifactId>
Expand Down