Skip to content

Bump to Logback 1.3.0-beta0 #832

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

Merged
merged 2 commits into from
Aug 14, 2022
Merged

Bump to Logback 1.3.0-beta0 #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f850f4
Bump to Logback 1.3.0-beta0
brenuart Aug 14, 2022
8ced2d8
Comment links to Logback javadoc
brenuart Aug 14, 2022
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
8 changes: 6 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,12 @@ jobs:
run: ./mvnw --batch-mode --no-transfer-progress --show-version --settings .github/maven/settings.xml verify

# Run tests against Jackson 2.12 to ensure runtime compatibility (do not recompile)
- name: Test Jackson 2.12
run: ./mvnw --batch-mode --no-transfer-progress --show-version --settings .github/maven/settings.xml -Djackson.version=2.12.5 surefire:test
- name: Test Jackson 2.12.x
run: ./mvnw --batch-mode --no-transfer-progress --show-version --settings .github/maven/settings.xml -Pcompat-jackson surefire:test

# Run tests against Logback 1.2 to ensure runtime compatibility (do not recompile)
- name: Test Logback 1.2.x
run: ./mvnw --batch-mode --no-transfer-progress --show-version --settings .github/maven/settings.xml -Pcompat-logback surefire:test

- name: Upload Test Reports to Github
uses: actions/upload-artifact@v2
Expand Down
65 changes: 56 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
<!-- runtime dependencies -->
<jackson.version>2.13.3</jackson.version>
<java-uuid-generator.version>4.0.1</java-uuid-generator.version>
<logback.version>1.2.11</logback.version>
<logback.version>1.3.0-beta0</logback.version>

<!-- shaded runtime dependencies -->
<disruptor.version>3.4.4</disruptor.version>

<!-- test dependencies -->
<assertj.version>3.22.0</assertj.version>
<awaitility.version>4.2.0</awaitility.version>
<javax-servlet-api.version>4.0.1</javax-servlet-api.version>
<jakarta-servlet-api.version>5.0.0</jakarta-servlet-api.version>
<junit.version>5.8.2</junit.version>
<mockito.version>4.5.1</mockito.version>

Expand Down Expand Up @@ -64,6 +64,11 @@

<!-- the server id the maven-release-plugin uses to obtain credentials to use when pushing tags/commits -->
<project.scm.id>github</project.scm.id>

<!-- Subdirectory below the surefire reports directory where to store test reports.
Used to differentiate between multiple test executions with different dependencies (used by Github CI)
-->
<surefire.reportsSubDir>default</surefire.reportsSubDir>
</properties>

<licenses>
Expand Down Expand Up @@ -155,12 +160,12 @@
-->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax-servlet-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta-servlet-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand Down Expand Up @@ -483,7 +488,7 @@
GitHub CI runs tests against different jackson versions.
Therefore, differentiate the report directories by jackson versions.
-->
<reportsDirectory>${project.build.directory}/surefire-reports/jackson-${jackson.version}</reportsDirectory>
<reportsDirectory>${project.build.directory}/surefire-reports/${surefire.reportsSubDir}</reportsDirectory>
</configuration>
</plugin>

Expand All @@ -499,9 +504,20 @@
<!-- Setup links to external api docs
-->
<links>
<!-- Javadoc generation fails under Java8 because the Logback javadoc does not contain a
"package-list" index file anymore since version 1.3.0. It seems to work however with
Java 9 and 11.

Note: "package-list" has been replaced by "element-list" in Java 9... Newer jdk versions
seem to look for "element-list" first and fallback to "package-list".

A possible workaround is to build the project (and generate javadoc) using Java 9 instead
of 8. In the meantime links to Logback apidoc are commented.

<link>https://javadoc.io/doc/ch.qos.logback/logback-core/${logback.version}</link>
<link>https://javadoc.io/doc/ch.qos.logback/logback-classic/${logback.version}</link>
<link>https://javadoc.io/doc/ch.qos.logback/logback-access/${logback.version}</link>
-->
<link>https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/${jackson.version}</link>
<link>https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/${jackson.version}</link>
</links>
Expand Down Expand Up @@ -694,6 +710,37 @@
<checkstyle.skip>true</checkstyle.skip>
</properties>
</profile>

<!--
Profile used to run backward compatibility tests against logback 1.2
-->
<profile>
<id>compat-logback</id>
<properties>
<logback.version>1.2.11</logback.version>
<surefire.reportsSubDir>logback-${logback.version}</surefire.reportsSubDir>
</properties>
<dependencies>
<!-- Logback moved from javax.servlet to jakarta since version 1.3 -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>

<!--
Profile used to run backward compatibility tests against jackson 2.12
-->
<profile>
<id>compat-jackson</id>
<properties>
<jackson.version>2.12.7</jackson.version>
<surefire.reportsSubDir>jackson-${jackson.version}</surefire.reportsSubDir>
</properties>
</profile>
</profiles>

<distributionManagement>
Expand Down