Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
szysas committed May 31, 2024
1 parent 1a85926 commit 7a8e4fb
Show file tree
Hide file tree
Showing 11 changed files with 184 additions and 58 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ jobs:
with:
java-version: ${{ matrix.java }}
distribution: 'corretto'
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v3

- name: Build with Gradle
uses: gradle/gradle-build-action@v3
with:
arguments: build jacocoTestReport -i
cache-read-only: false
run: ./gradlew build jacocoTestReport -i
- uses: codecov/codecov-action@v4
if: matrix.java == '11'
if: matrix.java == '21'
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
12 changes: 4 additions & 8 deletions .github/workflows/jmh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,12 @@ jobs:
with:
java-version: 17
distribution: 'temurin'
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v3
- name: Build
uses: gradle/gradle-build-action@v3
with:
arguments: jmhJar
cache-read-only: false
run: ./gradlew jmhJar
- name: Run benchmarks
uses: gradle/gradle-build-action@v3
with:
arguments: jmh
cache-read-only: false
run: ./gradlew jmh
- name: print summary
run: |
echo '### JMH report' >> $GITHUB_STEP_SUMMARY
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
with:
java-version: '8'
distribution: 'temurin'
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v3
- name: Publish with Gradle
uses: gradle/gradle-build-action@v3
with:
arguments: publishToSonatype closeAndReleaseSonatypeStagingRepository -i
run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -i
env:
ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEY_ID }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
Expand Down
20 changes: 18 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (C) 2022-2024 java-coap contributors (https://github.com/open-coap/java-coap)
* SPDX-License-Identifier: Apache-2.0
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
import com.github.spotbugs.snom.Effort

Expand All @@ -8,9 +24,9 @@ plugins {
id("se.patrikerdes.use-latest-versions") version "0.2.18"
id("com.github.ben-manes.versions") version "0.51.0"
id("pmd")
id("com.github.spotbugs") version "6.0.7"
id("com.github.spotbugs") version "6.0.15"
id("org.gradle.signing")
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id("com.adarshr.test-logger") version "4.0.0"
}

Expand Down
28 changes: 22 additions & 6 deletions coap-cli/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (C) 2022-2024 java-coap contributors (https://github.com/open-coap/java-coap)
* SPDX-License-Identifier: Apache-2.0
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

plugins {
id("application")
}
Expand All @@ -9,14 +25,14 @@ dependencies {
implementation(project(":coap-tcp"))
implementation(project(":lwm2m"))
implementation(project(":coap-mbedtls"))
implementation("org.slf4j:slf4j-api:2.0.11")
implementation("ch.qos.logback:logback-classic:1.3.5")
implementation("info.picocli:picocli:4.7.5")
implementation("org.slf4j:slf4j-api:2.0.13")
implementation("ch.qos.logback:logback-classic:1.3.14")
implementation("info.picocli:picocli:4.7.6")

testImplementation("org.mockito:mockito-core:4.11.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
testImplementation("org.awaitility:awaitility:4.2.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testImplementation("org.awaitility:awaitility:4.2.1")
testImplementation(testFixtures(project(":coap-core")))
}

Expand Down
30 changes: 23 additions & 7 deletions coap-core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (C) 2022-2024 java-coap contributors (https://github.com/open-coap/java-coap)
* SPDX-License-Identifier: Apache-2.0
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

plugins {
id("java-library")
id("java-test-fixtures")
Expand All @@ -7,16 +23,16 @@ plugins {
description = "coap-core"

dependencies {
api("org.slf4j:slf4j-api:2.0.11")
api("org.slf4j:slf4j-api:2.0.13")

testFixturesApi("org.junit.jupiter:junit-jupiter-api:5.10.1")
testFixturesApi("org.assertj:assertj-core:3.25.2")
testFixturesApi("org.awaitility:awaitility:4.2.0")
testFixturesApi("org.junit.jupiter:junit-jupiter-api:5.10.2")
testFixturesApi("org.assertj:assertj-core:3.26.0")
testFixturesApi("org.awaitility:awaitility:4.2.1")

testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
testImplementation("ch.qos.logback:logback-classic:1.3.5")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testImplementation("ch.qos.logback:logback-classic:1.3.14")
testImplementation("org.mockito:mockito-core:4.11.0")
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.6")
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.16.1")
testImplementation("io.github.artsok:rerunner-jupiter:2.1.6")
}

Expand Down
26 changes: 21 additions & 5 deletions coap-mbedtls/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (C) 2022-2024 java-coap contributors (https://github.com/open-coap/java-coap)
* SPDX-License-Identifier: Apache-2.0
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

plugins {
id("java-library")
}
Expand All @@ -6,13 +22,13 @@ description = "coap-mbedtls"

dependencies {
api(project(":coap-core"))
api("io.github.open-coap:kotlin-mbedtls:1.23.0")
api("io.github.open-coap:kotlin-mbedtls:1.26.0")

testImplementation(project(":coap-netty"))
testImplementation("io.github.open-coap:kotlin-mbedtls-netty:1.23.0")
testImplementation("io.github.open-coap:kotlin-mbedtls-netty:1.26.0")

testImplementation(testFixtures(project(":coap-core")))
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
testImplementation("ch.qos.logback:logback-classic:1.3.5")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testImplementation("ch.qos.logback:logback-classic:1.3.14")
}
22 changes: 19 additions & 3 deletions coap-metrics/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (C) 2022-2024 java-coap contributors (https://github.com/open-coap/java-coap)
* SPDX-License-Identifier: Apache-2.0
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

plugins {
id("java-library")
}
Expand All @@ -7,8 +23,8 @@ description = "coap-metrics"
dependencies {
api(project(":coap-core"))

implementation("io.micrometer:micrometer-core:1.12.2")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
implementation("io.micrometer:micrometer-core:1.13.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testImplementation(testFixtures(project(":coap-core")))
}
26 changes: 21 additions & 5 deletions coap-netty/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (C) 2022-2024 java-coap contributors (https://github.com/open-coap/java-coap)
* SPDX-License-Identifier: Apache-2.0
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

plugins {
id("java-library")
id("me.champeau.jmh").version("0.7.0")
Expand All @@ -7,15 +23,15 @@ description = "coap-netty"

dependencies {
api(project(":coap-core"))
api("io.netty:netty-handler:4.1.106.Final")
api("io.netty:netty-handler:4.1.110.Final")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")

testImplementation(testFixtures(project(":coap-core")))
testImplementation("ch.qos.logback:logback-classic:1.3.5")
testImplementation("ch.qos.logback:logback-classic:1.3.14")

jmhImplementation("io.netty:netty-all:4.1.106.Final")
jmhImplementation("io.netty:netty-all:4.1.110.Final")
}

tasks {
Expand Down
30 changes: 23 additions & 7 deletions coap-tcp/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (C) 2022-2024 java-coap contributors (https://github.com/open-coap/java-coap)
* SPDX-License-Identifier: Apache-2.0
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

plugins {
id("java-library")
}
Expand All @@ -6,15 +22,15 @@ description = "coap-tcp"

dependencies {
api(project(":coap-core"))
api("org.slf4j:slf4j-api:2.0.11")
api("org.slf4j:slf4j-api:2.0.13")

testImplementation(testFixtures(project(":coap-core")))

testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
testImplementation("ch.qos.logback:logback-classic:1.3.5")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testImplementation("ch.qos.logback:logback-classic:1.3.14")
testImplementation("org.mockito:mockito-core:4.11.0")
testImplementation("org.assertj:assertj-core:3.25.2")
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.6")
testImplementation("org.awaitility:awaitility:4.2.0")
testImplementation("org.assertj:assertj-core:3.26.0")
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.16.1")
testImplementation("org.awaitility:awaitility:4.2.1")
}
30 changes: 23 additions & 7 deletions lwm2m/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,18 +1,34 @@
/*
* Copyright (C) 2022-2024 java-coap contributors (https://github.com/open-coap/java-coap)
* SPDX-License-Identifier: Apache-2.0
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

plugins {
id("java-library")
}

description = "lwm2m"

dependencies {
api("com.google.code.gson:gson:2.10.1")
api("org.slf4j:slf4j-api:2.0.11")
api("com.google.code.gson:gson:2.11.0")
api("org.slf4j:slf4j-api:2.0.13")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
testImplementation("commons-io:commons-io:2.15.1")
testImplementation("ch.qos.logback:logback-classic:1.3.5")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testImplementation("commons-io:commons-io:2.16.1")
testImplementation("ch.qos.logback:logback-classic:1.3.14")
testImplementation("org.mockito:mockito-core:4.11.0")
testImplementation("org.hamcrest:hamcrest-all:1.3")
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.6")
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.16.1")
}

0 comments on commit 7a8e4fb

Please sign in to comment.