Upgrade dependencies (#65)

kaklakariada · web-flow · commit 9fbac0d7f216 · 2024-12-31T20:42:19.000+01:00
* Update vscode config files

* Upgrade dependencies

* Upgrade build scripts

* Add dependency submission &amp; doc publishing

---------

Co-authored-by: kaklakariada &lt;kaklakariada@users.noreply.github.com&gt;
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -5,8 +5,8 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
-  schedule:
-    - cron: '0 7 * * 6'
+#  schedule:
+#    - cron: '0 7 * * 6'
 
 jobs:
   analyze:
@@ -28,9 +28,9 @@ jobs:
       with:
         distribution: 'adopt'
         java-version: 11
-        cache: 'gradle'
 
-    - uses: gradle/wrapper-validation-action@v2
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
@@ -0,0 +1,23 @@
+name: Dependency Submission
+
+on:
+  # Only runs on main branch
+  push:
+    branches: [ main ]
+
+permissions:
+  contents: write # Required for dependency submission
+
+jobs:
+  dependency-submission:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v4
+    - name: Setup Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: 17
+    - name: Generate and submit dependency graph
+      uses: gradle/actions/dependency-submission@v4
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -0,0 +1,53 @@
+name: Deploy GitHub Pages
+
+on:
+  push:
+    branches: ["main"]
+  workflow_dispatch:
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Build Javadoc
+        run: ./gradlew javadoc --info
+      - name: Build Reports
+        run: ./gradlew check jacocoTestReport --info
+      - name: Collect artifacts
+        run: cp -r build/reports/ build/docs/
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: ./build/docs/
+
+  deploy:
+    if: ${{ github.ref == 'refs/heads/main' }}
+    permissions:
+      id-token: write
+      pages: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21, 23]
     env:
-      DEFAULT_JAVA: 17
+      DEFAULT_JAVA: 11
 
     steps:
     - uses: actions/checkout@v4
@@ -24,8 +24,9 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-        cache: 'gradle'
 
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
 
     - name: Cache SonarQube packages
       uses: actions/cache@v4
@@ -34,10 +35,8 @@ jobs:
         key: ${{ runner.os }}-java-${{ matrix.java }}-sonar
         restore-keys: ${{ runner.os }}-java-${{ matrix.java }}-sonar
 
-    - uses: gradle/wrapper-validation-action@v2
-
     - name: Build with Gradle
-      run: ./gradlew clean build --info --warning-mode all
+      run: ./gradlew clean build --info --warning-mode all -PjavaVersion=${{ matrix.java }}
 
     - name: Sonar analysis
       if: ${{ env.DEFAULT_JAVA == matrix.java && env.SONAR_TOKEN != null }}
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=ignore
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,13 +1,17 @@
 {
-  "java.configuration.updateBuildConfiguration": "automatic",
-  "editor.formatOnSave": true,
-  "editor.codeActionsOnSave": {
-    "source.organizeImports": true,
-    "source.generate.finalModifiers": true,
-    "source.fixAll": true
-  },
-  "java.codeGeneration.useBlocks": true,
-  "java.saveActions.organizeImports": true,
-  "java.sources.organizeImports.starThreshold": 3,
-  "java.sources.organizeImports.staticStarThreshold": 3
-}
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+        "source.organizeImports": "explicit",
+        "source.generate.finalModifiers": "explicit",
+        "source.fixAll": "explicit"
+    },
+    "java.codeGeneration.useBlocks": true,
+    "java.saveActions.organizeImports": true,
+    "java.sources.organizeImports.starThreshold": 3,
+    "java.sources.organizeImports.staticStarThreshold": 3,
+    "sonarlint.connectedMode.project": {
+        "connectionId": "kaklakariada-github",
+        "projectKey": "com.github.kaklakariada:fritzbox-java-api"
+    }
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.8.0] - unreleased
 
+- [#65](https://github.com/kaklakariada/fritzbox-java-api/pull/65) Upgrade dependencies
+
 ## [1.7.0] - 2023-10-07
 
 ### Added
diff --git a/build.gradle b/build.gradle
@@ -4,18 +4,19 @@ plugins {
     id "maven-publish"
     id "jacoco"
     id "com.github.hierynomus.license" version "0.16.1"
-    id "org.sonarqube" version "4.4.1.3373"
-    id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
-    id "com.github.ben-manes.versions" version "0.48.0"
-    id "org.sonatype.gradle.plugins.scan" version "2.6.1"
+    id "org.sonarqube" version "6.0.1.5171"
+    id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
+    id "com.github.ben-manes.versions" version "0.51.0"
+    id "org.sonatype.gradle.plugins.scan" version "2.8.3"
 }
 
-group 'com.github.kaklakariada'
+group = 'com.github.kaklakariada'
 version = '1.7.0'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
+        def javaVersion = project.hasProperty('javaVersion') ? project.getProperty('javaVersion') : 11
+        languageVersion = JavaLanguageVersion.of(javaVersion)
     }
     withJavadocJar()
     withSourcesJar()
@@ -40,15 +41,14 @@ testing {
 }
 
 dependencies {
-    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
-    implementation 'com.squareup.okio:okio:3.6.0' // Fix CVE-2023-3635
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.subshell.simpleframework:simple-xml:2.9.0'
-    implementation 'org.slf4j:slf4j-api:2.0.9'
+    implementation 'org.slf4j:slf4j-api:2.0.16'
     
-    testRuntimeOnly 'ch.qos.logback:logback-classic:1.4.11'
+    testRuntimeOnly 'ch.qos.logback:logback-classic:1.5.15'
     
-    testImplementation 'org.mockito:mockito-core:5.6.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.mockito:mockito-core:5.14.2'
+    testImplementation 'org.assertj:assertj-core:3.27.0'
 }
 
 license {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`eclipse.preferences.version=1`
	`2`	`+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=ignore`
`2`	`3`	`org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled`
`3`	`4`	`org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore`
`4`	`5`	`org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull`