diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bd09be..c18b8f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,9 +22,9 @@ jobs: jdk: [ 17 ] steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v6 - name: Set up OpenJDK version ... - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: ${{ matrix.jdk }} @@ -48,9 +48,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v6 - name: Set up OpenJDK version ... - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: ${{ env.currentBuildVersion }} @@ -59,6 +59,6 @@ jobs: - name: Build with Gradle (JDK ${{ env.currentBuildVersion }}) run: ./gradlew clean check jacocoTestReport - name: Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v6 with: files: ./build/reports/jacoco/test/jacocoTestReport.xml #optional diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6b72495..a54131e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,11 +38,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -53,7 +53,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v4 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -67,4 +67,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v4 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index dba2a95..fa254b0 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -6,9 +6,9 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Set up Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v5 with: java-version: 17 - name: Publish package diff --git a/build.gradle b/build.gradle index 8be4b3e..aecacc9 100644 --- a/build.gradle +++ b/build.gradle @@ -15,18 +15,17 @@ */ plugins { - id "org.springframework.boot" version "3.2.0" - id "io.freefair.lombok" version "8.4" - id "io.freefair.maven-publish-java" version "8.4" - id "io.spring.dependency-management" version "1.1.4" - id "org.owasp.dependencycheck" version "9.0.5" - id "com.jfrog.bintray" version "1.8.5" + id "org.springframework.boot" version "3.5.14" + id "io.freefair.lombok" version "9.5.0" + id "io.freefair.maven-publish-java" version "9.5.0" + id "io.spring.dependency-management" version "1.1.7" + id "org.owasp.dependencycheck" version "12.2.2" id "java" id "jacoco" // plugins for release and publishing to maven repo id "signing" - id "net.researchgate.release" version "3.0.2" - id "io.github.gradle-nexus.publish-plugin" version "1.3.0" + id "net.researchgate.release" version "3.1.0" + id "io.github.gradle-nexus.publish-plugin" version "2.0.0" id 'maven-publish' } @@ -42,19 +41,22 @@ repositories { mavenCentral() } -sourceCompatibility = 1.17 -targetCompatibility = 1.17 +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} dependencies { implementation "org.springframework.boot:spring-boot-starter-web" implementation "org.springframework.boot:spring-boot-starter-amqp" - implementation "commons-io:commons-io:2.15.1" + implementation "commons-io:commons-io:2.22.0" implementation "org.apache.httpcomponents:httpclient:4.5.14" - implementation "edu.kit.datamanager:service-base:1.2.0" + implementation "edu.kit.datamanager:service-base:1.3.6" //driver for h2 - implementation "com.h2database:h2:2.2.224" + implementation "com.h2database:h2:2.4.240" testImplementation "junit:junit" } @@ -65,8 +67,7 @@ if (project.hasProperty('deploy')) { } bootJar { - baseName = 'generic-message-consumer' - classifier = 'boot' + archiveFileName = 'generic-message-consumer' duplicatesStrategy = DuplicatesStrategy.EXCLUDE } @@ -77,7 +78,7 @@ jar { } jacoco { - toolVersion = "0.8.10" + toolVersion = "0.8.14" } tasks.withType(Test) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..9937dae 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sample-handler/build.gradle b/sample-handler/build.gradle index 9dba06c..cac262a 100644 --- a/sample-handler/build.gradle +++ b/sample-handler/build.gradle @@ -6,17 +6,17 @@ buildscript { } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.2.2.RELEASE") + classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.14") classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.9.2' //classpath 'org.kordamp.gradle:stats-gradle-plugin:0.2.2' } } plugins { - id 'io.franzbecker.gradle-lombok' version '1.14' - id "io.spring.dependency-management" version "1.0.8.RELEASE" + id 'io.franzbecker.gradle-lombok' version '5.0.0' + id "io.spring.dependency-management" version "1.1.7" // id "com.github.kt3k.coveralls" version "2.8.1" - id "org.owasp.dependencycheck" version "3.1.2" + id "org.owasp.dependencycheck" version "12.2.2" // id "org.asciidoctor.convert" version "1.5.3" } @@ -46,17 +46,17 @@ repositories { } lombok { - version = '1.18.10' + version = '1.18.46' sha256 = "" } dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. - implementation 'com.google.guava:guava:27.0.1-jre' - implementation 'edu.kit.datamanager:service-base:0.1' - implementation('edu.kit.datamanager:generic-message-consumer:0.1.0') + implementation 'com.google.guava:guava:33.6.0-jre' + implementation 'edu.kit.datamanager:service-base:1.3.6' + implementation('edu.kit.datamanager:generic-message-consumer:1.1.1') // Use JUnit test framework - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' } \ No newline at end of file