Skip to content

Commit

Permalink
Upgrade ASM to 9.7.1 to support Java 24 / class file major version 68 (…
Browse files Browse the repository at this point in the history 
…#1364)

### Upgrade ASM to 9.7.1 to support Java 24 / class file major version
68

resolves #1362

### Upgrade further dependencies:

* `com.google.guava:guava`
  `33.1.0-jre` → `33.3.1-jre`

* `org.slf4j:slf4j-api`
  `2.0.12` → `2.0.16`
* `org.apache.logging.log4j:log4j-`{`api`,`core`,`slf4j2-impl`}
  `2.23.1` → `2.24.1`

*
`org.junit.jupiter:junit-`{`jupiter-api`,`jupiter-engine`,`vintage-engine`}
  `5.10.2` → `5.11.2`
* `org.junit.platform:junit-platform-`{`runner`,`commons`,`engine`}
  `1.10.2` → `1.11.2`

for tests:

* `org.assertj:assertj-`{`core`,`guava`}
  `3.25.3` → `3.26.3`
  • Loading branch information
@codecholeric
codecholeric authored Oct 13, 2024
2 parents 24a31bb + 36f857e commit a1add36
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
28 changes: 14 additions & 14 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ ext {
googleRelocationPackage = "${thirdPartyRelocationPackage}.com.google"

dependency = [
asm : [group: 'org.ow2.asm', name: 'asm', version: '9.7'],
guava : [group: 'com.google.guava', name: 'guava', version: '33.1.0-jre'],
asm : [group: 'org.ow2.asm', name: 'asm', version: '9.7.1'],
guava : [group: 'com.google.guava', name: 'guava', version: '33.3.1-jre'],
addGuava : { dependencyHandler ->
dependencyHandler(dependency.guava) {
exclude module: 'listenablefuture'
Expand All @@ -46,24 +46,24 @@ ext {
exclude module: 'j2objc-annotations'
}
},
slf4j : [group: 'org.slf4j', name: 'slf4j-api', version: '2.0.12'],
log4j_api : [group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.23.1'],
log4j_core : [group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.23.1'],
log4j_slf4j : [group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.23.1'],
slf4j : [group: 'org.slf4j', name: 'slf4j-api', version: '2.0.16'],
log4j_api : [group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.24.1'],
log4j_core : [group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.24.1'],
log4j_slf4j : [group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.24.1'],

junit4 : [group: 'junit', name: 'junit', version: '4.13.2'],
junit5JupiterApi : [group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.2'],
junit5JupiterEngine : [group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.2'],
junit5VintageEngine : [group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.10.2'],
junitPlatform : [group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.10.2'],
junitPlatformCommons: [group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.10.2'],
junitPlatformEngine : [group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.10.2'],
junit5JupiterApi : [group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.11.2'],
junit5JupiterEngine : [group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.11.2'],
junit5VintageEngine : [group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.11.2'],
junitPlatform : [group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.11.2'],
junitPlatformCommons: [group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.11.2'],
junitPlatformEngine : [group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.11.2'],
hamcrest : [group: 'org.hamcrest', name: 'hamcrest-core', version: '1.3'],
junit_dataprovider : [group: 'com.tngtech.java', name: 'junit-dataprovider', version: '1.11.0'],
mockito : [group: 'org.mockito', name: 'mockito-core', version: '4.11.0'], // mockito 5 requires Java 11
mockito_junit5 : [group: 'org.mockito', name: 'mockito-junit-jupiter', version: '4.6.1'],
assertj : [group: 'org.assertj', name: 'assertj-core', version: '3.25.3'],
assertj_guava : [group: 'org.assertj', name: 'assertj-guava', version: '3.25.3'],
assertj : [group: 'org.assertj', name: 'assertj-core', version: '3.26.3'],
assertj_guava : [group: 'org.assertj', name: 'assertj-guava', version: '3.26.3'],

// Dependencies for example projects / tests
javaxAnnotationApi : [group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'],
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/resources/release_check/archunit-junit5-engine-api.pom
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.10.2</version>
<version>1.11.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/resources/release_check/archunit.pom
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.12</version>
<version>2.0.16</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit a1add36

Please sign in to comment.