Skip to content

Commit

Permalink
Upgrade dependencies (#966)
Browse files Browse the repository at this point in the history 
In particular

* `com.diffplug.spotless` from `6.8.0` to `6.11.0`
* `com.github.spotbugs` from `5.0.9` to `5.0.12`
* `com.gradle.enterprise` from `3.10.2` to `3.11.1`
* `org.javamodularity.moduleplugin` from `1.8.11` to `1.8.12`
* `tzinfo` from `1.2.7` to `2.0.5` in `/docs`
* Gradle Wrapper from `7.5` to `7.5.1`
* `org.slf4j:slf4j-api` from `1.7.30` to `1.7.36` (or possibly even
`2.0.2`, if we include the last commit)

for tests:
* `org.apache.logging.log4j:log4j-api`/`log4j-core`/`log4j-slf4j-impl`
from `2.17.2` to `2.19.0`
* `org.assertj:assertj-core` form `3.22.0` to `3.23.1`
* `org.assertj;assertj-guava` from `3.4.0` to `3.5.0`
* `org.junit.jupiter` from `5.8.2` to `5.9.`1 & `org.junit.platform`
from `1.8.2` to `1.9.1`
   
for example projects:
* `org.springframework:spring-beans` from `5.2.18.RELEASE` to `5.3.23`
* `com.google.inject:guice` from `4.2.3` to `5.1.0`
* `joda-time:joda-time` from `2.10.13` to `2.11.2`
  • Loading branch information
@codecholeric
codecholeric authored Oct 1, 2022
2 parents ee1b43e + dc6f859 commit 9507764
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 35 deletions.
2 changes: 1 addition & 1 deletion archunit-java-modules-test/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'archunit.java-conventions'
id 'org.javamodularity.moduleplugin' version '1.8.11'
id 'org.javamodularity.moduleplugin' version '1.8.12'
}

ext.moduleName = 'com.tngtech.archunit.javamodulestest'
Expand Down
7 changes: 7 additions & 0 deletions .../engine/src/test/java/com/tngtech/archunit/junit/internal/EngineDiscoveryTestRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.Set;

import com.tngtech.archunit.core.domain.JavaClasses;
import com.tngtech.archunit.junit.engine_api.FieldSelector;
Expand All @@ -26,6 +27,7 @@

import static com.tngtech.archunit.junit.engine_api.FieldSelector.selectField;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptySet;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
Expand Down Expand Up @@ -169,5 +171,10 @@ public Optional<Boolean> getBoolean(String key) {
public int size() {
return 0;
}

@Override
public Set<String> keySet() {
return emptySet();
}
}
}
34 changes: 17 additions & 17 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
id 'archunit.base-conventions'
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
id 'com.github.spotbugs' version '5.0.9' apply false
id 'com.github.spotbugs' version '5.0.12' apply false
id "io.github.gradle-nexus.publish-plugin" version "1.1.0" apply false
id "com.diffplug.spotless" version "6.8.0" apply false
id "com.diffplug.spotless" version "6.11.0" apply false
id 'com.github.ben-manes.versions' version '0.42.0' apply false
}

Expand Down Expand Up @@ -46,34 +46,34 @@ ext {
exclude module: 'j2objc-annotations'
}
},
slf4j : [group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'],
log4j_api : [group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.2'],
log4j_core : [group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.2'],
log4j_slf4j : [group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.17.2'],
slf4j : [group: 'org.slf4j', name: 'slf4j-api', version: '2.0.3'],
log4j_api : [group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.19.0'],
log4j_core : [group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.19.0'],
log4j_slf4j : [group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.19.0'],

junit4 : [group: 'junit', name: 'junit', version: '4.13.2'],
junit5JupiterApi : [group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.8.2'],
junit5JupiterEngine : [group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2'],
junit5VintageEngine : [group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.8.2'],
junitPlatform : [group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.8.2'],
junitPlatformCommons: [group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.8.2'],
junitPlatformEngine : [group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.8.2'],
junit5JupiterApi : [group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.9.1'],
junit5JupiterEngine : [group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.1'],
junit5VintageEngine : [group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.9.1'],
junitPlatform : [group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.9.1'],
junitPlatformCommons: [group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.9.1'],
junitPlatformEngine : [group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.9.1'],
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.4.0'],
assertj : [group: 'org.assertj', name: 'assertj-core', version: '3.22.0'],
assertj_guava : [group: 'org.assertj', name: 'assertj-guava', version: '3.4.0'],
assertj : [group: 'org.assertj', name: 'assertj-core', version: '3.23.1'],
assertj_guava : [group: 'org.assertj', name: 'assertj-guava', version: '3.5.0'],

// Dependencies for example projects / tests
javaxAnnotationApi : [group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'],
springBeans : [group: 'org.springframework', name: 'spring-beans', version: '5.2.18.RELEASE'], // 5.3.0 requires Java 8.
springBeans : [group: 'org.springframework', name: 'spring-beans', version: '5.3.23'],
jakartaInject : [group: 'jakarta.inject', name: 'jakarta.inject-api', version: '1.0'],
jakartaAnnotations : [group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '1.3.5'],
guice : [group: 'com.google.inject', name: 'guice', version: '4.2.3'],
guice : [group: 'com.google.inject', name: 'guice', version: '5.1.0'],
// NOTE: The pure javaee-api dependencies are crippled, so to run any test we need to choose a full implementation provider
geronimoEjb : [group: 'org.apache.geronimo.specs', name: 'geronimo-ejb_3.1_spec', version: '1.0.2'],
geronimoJpa : [group: 'org.apache.geronimo.specs', name: 'geronimo-jpa_2.0_spec', version: '1.1'],
jodaTime : [group: 'joda-time', name: 'joda-time', version: '2.10.13'],
jodaTime : [group: 'joda-time', name: 'joda-time', version: '2.11.2'],
joox : [group: 'org.jooq', name: 'joox-java-6', version: '1.6.0']
]

Expand Down
25 changes: 11 additions & 14 deletions docs/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.3.1)
activesupport (7.0.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0)
concurrent-ruby (1.1.9)
concurrent-ruby (1.1.10)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
Expand All @@ -35,11 +34,11 @@ GEM
ffi (1.15.5)
forwardable-extended (2.6.0)
gemoji (3.0.1)
html-pipeline (2.12.3)
html-pipeline (2.14.2)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
i18n (1.10.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
jekyll (4.2.2)
addressable (~> 2.4)
Expand Down Expand Up @@ -81,9 +80,9 @@ GEM
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.8.0)
minitest (5.13.0)
minitest (5.16.2)
multipart-post (2.1.1)
nokogiri (1.13.6)
nokogiri (1.13.7)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (4.21.0)
Expand All @@ -107,11 +106,9 @@ GEM
faraday (> 0.8, < 2.0)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unicode-display_width (1.8.0)
zeitwerk (2.3.0)

PLATFORMS
ruby
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion settings.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.gradle.enterprise" version "3.10.2"
id "com.gradle.enterprise" version "3.11.1"
}

rootProject.name = 'archunit-root'
Expand Down

0 comments on commit 9507764

Please sign in to comment.