diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5da9dd..65b3844 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: - name: Build with Java ${{ matrix.java }} with integration tests if: ${{ env.DEFAULT_JAVA == matrix.java }} - run: ./gradlew clean build --info -PjavaVersion=${{matrix.java}} + run: ./gradlew build --info -PjavaVersion=${{matrix.java}} - name: Sonar analysis if: ${{ env.DEFAULT_JAVA == matrix.java && env.SONAR_TOKEN != null }} diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml new file mode 100644 index 0000000..a25f0f3 --- /dev/null +++ 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/release.yml b/.github/workflows/release.yml index 92d4445..9d22e00 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Build - run: ./gradlew build --warning-mode all + run: ./gradlew build --info --warning-mode all - name: Publish to Maven Central if: ${{ !inputs.skip-deploy-maven-central }} diff --git a/CHANGELOG.md b/CHANGELOG.md index a414622..0251f82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.8.0] - unreleased +- [PR #27](https://github.com/itsallcode/simple-jdbc/pull/27): Update dependencies + ## [0.7.1] - 2024-09-01 - [PR #26](https://github.com/itsallcode/simple-jdbc/pull/26): Update dependencies diff --git a/README.md b/README.md index 675fafa..44a2aee 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,6 @@ dependencies { ``` ```java - // Define a model record or class record Name(int id, String name) { Object[] toRow() { @@ -67,7 +66,7 @@ try (SimpleConnection connection = connectionFactory.create("jdbc:h2:mem:", "use Install to local maven repository: ```sh -./gradlew clean publishToMavenLocal +./gradlew publishToMavenLocal ``` ### Test Coverage diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..df97d72 100644 --- 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 6d3b97d..2554f87 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,12 +13,12 @@ dependencyResolutionManagement { library('assertj', 'org.assertj:assertj-core:3.26.3') library('h2', 'com.h2database:h2:2.3.232') library('junitPioneer', 'org.junit-pioneer:junit-pioneer:2.2.0') - library('equalsverifier', 'nl.jqno.equalsverifier:equalsverifier:3.16.2') + library('equalsverifier', 'nl.jqno.equalsverifier:equalsverifier:3.17.1') library('tostringverifier', 'com.jparams:to-string-verifier:1.4.8') library('hamcrest', 'org.hamcrest:hamcrest:3.0') library('hamcrestResultSetMatcher', 'com.exasol:hamcrest-resultset-matcher:1.6.3') library('mockito', 'org.mockito:mockito-core:5.11.0') - library('mockitoJunit', 'org.mockito:mockito-junit-jupiter:5.13.0') + library('mockitoJunit', 'org.mockito:mockito-junit-jupiter:5.14.1') library('slf4jLogger', 'org.slf4j:slf4j-jdk14:2.0.16') library('exasolJdbc', 'com.exasol:exasol-jdbc:24.1.2') library('exasolTestcontainers', 'com.exasol:exasol-testcontainers:7.1.1') diff --git a/src/integrationTest/java/org/itsallcode/jdbc/ExasolTypeTest.java b/src/integrationTest/java/org/itsallcode/jdbc/ExasolTypeTest.java index e2f6ee1..088a654 100644 --- a/src/integrationTest/java/org/itsallcode/jdbc/ExasolTypeTest.java +++ b/src/integrationTest/java/org/itsallcode/jdbc/ExasolTypeTest.java @@ -22,7 +22,7 @@ class ExasolTypeTest { - private static final ExasolContainer container = new ExasolContainer<>("8.29.1") + private static final ExasolContainer container = new ExasolContainer<>("8.31.0") .withRequiredServices(ExasolService.JDBC).withReuse(true); @BeforeAll diff --git a/src/main/java/org/itsallcode/jdbc/resultset/DelegatingResultSet.java b/src/main/java/org/itsallcode/jdbc/resultset/DelegatingResultSet.java index 6d02e70..d40ca09 100644 --- a/src/main/java/org/itsallcode/jdbc/resultset/DelegatingResultSet.java +++ b/src/main/java/org/itsallcode/jdbc/resultset/DelegatingResultSet.java @@ -8,7 +8,7 @@ import java.util.Calendar; import java.util.Map; -@SuppressWarnings("java:S1448") // Long file required for implementing ResultSet +@SuppressWarnings({ "java:S1448", "java:S104" }) // Long file with many methods required for implementing ResultSet class DelegatingResultSet implements ResultSet { private final ResultSet delegate;