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

Jump to bottom

chore: update Gradle (7.1.1 >>> 7.5.1) and dependencies #685

Merged
merged 5 commits into from
Nov 6, 2022
Merged

chore: update Gradle (7.1.1 >>> 7.5.1) and dependencies #685

merged 5 commits into from
Nov 6, 2022

Conversation

skaldarnar
Copy link
Member

@skaldarnar skaldarnar commented Nov 5, 2022 •
edited
Loading

Contains

  • build: upgrade Gradle (7.1.1 >>> 7.5.1)
  • build: upgrade dependencies
  • build: enable locked dependencies

How to test

Build and run the launcher from source via Gradlew and ensure that everything is still working.

To generate or update the lockfiles for both the Java dependencies and the build plugin dependencies, run:

gradlew dependencies --write-locks

Outstanding before merging

Nothing.

@skaldarnar
build: upgrade Gradle (7.1.1 >>> 7.5.1)
b663791
@skaldarnar
build: upgrade dependencies
adb2b33
@skaldarnar
build: enable locked dependencies
f010960 
To generate or update the lockfiles for both the Java dependencies and the build plugin dependencies, run:

```
gradle dependencies --write-locks
```
@skaldarnar skaldarnar added this to the v4.7 milestone Nov 5, 2022
@skaldarnar skaldarnar added Status: Actionable An issue or task that can immediately be worked on Type: Maintenance Maintenance or chores not adding new features or fixing bugs. Topic: CI/CD Related to CI/CD and build infrastructure (excluded from the Changelog) labels Nov 5, 2022
@jdrueckert
Copy link
Member

@skaldarnar For some reasons, gradle seems to have issues to resolve requirements for the pmdTest check:

> Task :pmdTest FAILED
   > Could not resolve ch.qos.logback:logback-classic:1.3.0-alpha16.
18 actionable tasks: 4 executed, 14 up-to-date
     Required by:
         project :
      > Module 'ch.qos.logback:logback-classic' has been rejected:
           Cannot select module with conflict on capability 'logging:slf4j-impl-capability:0' also provided by [org.spf4j:spf4j-slf4j-test:8.9.5(runtime)]
   > Could not resolve org.spf4j:spf4j-slf4j-test:8.9.5.
     Required by:
         project :
      > Module 'org.spf4j:spf4j-slf4j-test' has been rejected:
           Cannot select module with conflict on capability 'logging:slf4j-impl-capability:0' also provided by [ch.qos.logback:logback-classic:1.3.0-alpha16(runtime)]
   > Could not resolve org.slf4j:jcl-over-slf4j:1.7.33.
     Required by:
         project : > org.spf4j:spf4j-slf4j-test:8.9.5
      > Module 'org.slf4j:jcl-over-slf4j' has been rejected:
           Cannot select module with conflict on capability 'logging:jcl-api-capability:0' also provided by [commons-logging:commons-logging:1.2(runtime)]
   > Could not resolve commons-logging:commons-logging:1.2.
     Required by:
         project : > com.github.everit-org.json-schema:org.everit.json.schema:1.14.1 > commons-validator:commons-validator:1.7
         project : > com.vladsch.flexmark:flexmark-all:0.64.0 > com.vladsch.flexmark:flexmark-pdf-converter:0.64.0 > com.openhtmltopdf:openhtmltopdf-pdfbox:1.0.10 > org.apache.pdfbox:pdfbox:2.0.24
         project : > com.vladsch.flexmark:flexmark-all:0.64.0 > com.vladsch.flexmark:flexmark-pdf-converter:0.64.0 > com.openhtmltopdf:openhtmltopdf-pdfbox:1.0.10 > org.apache.pdfbox:xmpbox:2.0.24
         project : > com.vladsch.flexmark:flexmark-all:0.64.0 > com.vladsch.flexmark:flexmark-pdf-converter:0.64.0 > com.openhtmltopdf:openhtmltopdf-pdfbox:1.0.10 > org.apache.pdfbox:pdfbox:2.0.24 > org.apache.pdfbox:fontbox:2.0.24
      > Module 'commons-logging:commons-logging' has been rejected:
           Cannot select module with conflict on capability 'logging:jcl-api-capability:0' also provided by [org.slf4j:jcl-over-slf4j:1.7.33(runtime), org.slf4j:jcl-over-slf4j:1.7.36(runtime)]

@skaldarnar
Copy link
Member Author

To be honest, the run of pmdTest on the main branch does not look ... clean either 🤔

> Task :pmdTest
The RuleSet rulesets/java/basic.xml has been deprecated and will be removed in PMD 7.0.0
The RuleSet rulesets/java/braces.xml has been deprecated and will be removed in PMD 7.0.0
The RuleSet rulesets/java/clone.xml has been deprecated and will be removed in PMD 7.0.0
The RuleSet rulesets/java/finalizers.xml has been deprecated and will be removed in PMD 7.0.0
The RuleSet rulesets/java/logging-java.xml has been deprecated and will be removed in PMD 7.0.0
The RuleSet rulesets/java/migrating.xml has been deprecated and will be removed in PMD 7.0.0
The RuleSet rulesets/java/sunsecure.xml has been deprecated and will be removed in PMD 7.0.0
The RuleSet rulesets/java/unusedcode.xml has been deprecated and will be removed in PMD 7.0.0
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
aktStatus is NULL: maximum Iterations exceeded, abort 1
69 PMD rule violations were found. See the report at: file:///home/skaldarnar/Code/movingblocks/terasologylauncher/build/reports/pmd/test.html

@skaldarnar
Copy link
Member Author

skaldarnar commented Nov 6, 2022 •
edited
Loading

We do have custom resolution strategies in place that look very related to the reported issues:

Cannot select module with conflict on capability 'logging:slf4j-impl-capability:0' also provided by [org.spf4j:spf4j-slf4j-test:8.9.5(runtime)]
...

TerasologyLauncher/build.gradle

Lines 154 to 164 in d54ced1

configurations.matching({ it =~ ~/test(Runtime|Compile|Implementation)Classpath/ }).all {
resolutionStrategy(gradlegoo.prefers("logging", "jcl-api-capability", "jcl-over-slf4j",
"jcl should prefer slf4j when available"))
resolutionStrategy(gradlegoo.prefers("logging", "slf4j-impl-capability",
"spf4j-slf4j-test", "tests use slf4j-test"))
// old hamcrest versions exist only to spite us
// http://hamcrest.org/JavaHamcrest/distributables#upgrading-from-hamcrest-1x
exclude group: "org.hamcrest", module: "hamcrest-core"
exclude group: "org.hamcrest", module: "hamcrest-library"
}

@keturn Are those already applied to the pmdTest task? Why does it fail now after the update 🤔 (I don't understand how those libs and how we usethem are intertwined 🙈 )

@jdrueckert jdrueckert merged commit 941506f into master Nov 6, 2022
@jdrueckert jdrueckert deleted the chore/update-dependencies branch November 6, 2022 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdrueckert jdrueckert jdrueckert approved these changes

@keturn keturn Awaiting requested review from keturn

Assignees
No one assigned
Labels
Status: Actionable An issue or task that can immediately be worked on Topic: CI/CD Related to CI/CD and build infrastructure (excluded from the Changelog) Type: Maintenance Maintenance or chores not adding new features or fixing bugs.
Projects
Terasology Stabilization
Status: ✅ Done
Milestone
v4.7
Development

Successfully merging this pull request may close these issues.
2 participants
@skaldarnar @jdrueckert