diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02e45402a..aada6dcb8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,12 +36,9 @@ jobs: matrix: # os: [ ubuntu-latest, windows-latest] include: - - os: ubuntu-latest - java: 17 - target: 'deploy' - os: ubuntu-latest java: 21 - target: 'test' + target: 'deploy' - os: windows-latest java: 21 target: 'test' @@ -96,7 +93,7 @@ jobs: continue-on-error: ${{ matrix.target != 'deploy' }} - name: Publish to codecov if: steps.os_check.outputs.not_skipped && matrix.target == 'deploy' && github.event_name != 'pull_request' - uses: codecov/codecov-action@v6 + uses: codecov/codecov-action@v7 continue-on-error: true - name: Publish Unit Test Results uses: EnricoMi/publish-unit-test-result-action@v2 diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index e8538e981..fcae30ec4 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -3,7 +3,7 @@ name: build pull request on: pull_request: - branches: [main] + branches: [main, "REL-*"] types: [opened, synchronize, reopened] permissions: @@ -26,7 +26,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Build with Maven run: mvn -fae -DskipITs=false -B package - name: Publish Unit Test Results diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c50acaa4..f71674c8f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: 17 + java-version: 21 server-id: central server-username: CENTRAL_USERNAME server-password: CENTRAL_PASSWORD diff --git a/.github/workflows/touch-javadocio.yml b/.github/workflows/touch-javadocio.yml index 3755a3dd6..c0cd10e38 100644 --- a/.github/workflows/touch-javadocio.yml +++ b/.github/workflows/touch-javadocio.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: 17 + java-version: 21 cache: maven - name: touch run: | diff --git a/pom.xml b/pom.xml index 742e07427..699072623 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ nl.vpro.shared vpro-shared-parent - 5.17-SNAPSHOT + 6.0-SNAPSHOT pom vpro-shared-parent @@ -15,10 +15,12 @@ UTF-8 true - 17 + 21 + + 7.0.8 + 7.1.0 + - 6.2.18 - 6.5.10 2.21.4 2.22 3.2.0 @@ -50,21 +52,21 @@ 4.5.14 4.4.16 - 6.6.44.Final - 7.2.1.Final + 7.4.1.Final + 8.4.0.Final + 9.1.0.Final 6.1.0 3.1.1 - 3.1.0 + 3.2.0 3.0.0 4.0.5 - 9.1.0.Final + 4.20.0 2.2.50 - 1.18.46 ${project.build.directory}/delombok ${project.build.directory}/delombok-input @@ -83,7 +85,7 @@ --add-opens java.base/java.lang=ALL-UNNAMED OVERRIDE - INFO + INFO @@ -134,7 +136,7 @@ vpro-shared-elasticsearch-client vpro-shared-elasticsearch-high-level-client - vpro-shared-hibernate + vpro-shared-hibernate7 @@ -245,14 +247,28 @@ + + maven-dependency-plugin + + + mockito-agent + + properties + + + + maven-surefire-plugin 3.5.6 - ${EXTRA_TEST_OPTS} + ${EXTRA_TEST_OPTS} -javaagent:${org.mockito:mockito-core:jar} + ${project.artifactId} - ${log4j2.root.level} + ${log4j2.stdout.level} + %d{HH:mm:ss.SS} %highlight{%5.5p} %c{1} %M.%L %m%n + true @@ -423,29 +439,24 @@ org.hibernate.orm - hibernate-core + hibernate-platform ${hibernate.version} - - - org.hibernate.orm - hibernate-micrometer - ${hibernate.version} - - - org.hibernate.search - hibernate-search-mapper-orm - ${hibernate.search.version} + pom + import org.hibernate.search - hibernate-search-backend-lucene + hibernate-search-bom ${hibernate.search.version} + pom + import org.hibernate.validator - hibernate-validator + hibernate-validator-bom ${hibernate.validator.version} - test + pom + import @@ -516,6 +527,7 @@ pom import + org.assertj assertj-core @@ -601,7 +613,6 @@ jakarta.persistence jakarta.persistence-api ${persistence.api.version} - provided org.meeuw.math diff --git a/vpro-shared-bom/pom.xml b/vpro-shared-bom/pom.xml index d65e22168..b93d0d962 100644 --- a/vpro-shared-bom/pom.xml +++ b/vpro-shared-bom/pom.xml @@ -2,7 +2,7 @@ 4.0.0 nl.vpro.shared vpro-shared-bom - 5.17-SNAPSHOT + 6.0-SNAPSHOT pom vpro-shared-bom Bill of Materials of modules in vpro shared @@ -88,7 +88,7 @@ nl.vpro.shared - vpro-shared-hibernate + vpro-shared-hibernate7 ${project.version} @@ -259,6 +259,11 @@ vpro-shared-swagger 3.0.1 + + nl.vpro.shared + vpro-shared-hibernate + 5.16.0 + diff --git a/vpro-shared-client-resteasy/pom.xml b/vpro-shared-client-resteasy/pom.xml index 7e8ec9878..bb27cfe62 100644 --- a/vpro-shared-client-resteasy/pom.xml +++ b/vpro-shared-client-resteasy/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-client-resteasy vpro-shared-client-resteasy diff --git a/vpro-shared-configuration/pom.xml b/vpro-shared-configuration/pom.xml index b4cf021ab..282cc5ff7 100644 --- a/vpro-shared-configuration/pom.xml +++ b/vpro-shared-configuration/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-configuration vpro-shared-configuration diff --git a/vpro-shared-elasticsearch-client/pom.xml b/vpro-shared-elasticsearch-client/pom.xml index a7c7b724d..34dc1eb42 100644 --- a/vpro-shared-elasticsearch-client/pom.xml +++ b/vpro-shared-elasticsearch-client/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-elasticsearch-client diff --git a/vpro-shared-elasticsearch-high-level-client/pom.xml b/vpro-shared-elasticsearch-high-level-client/pom.xml index 75644a0bb..4b08d3ab5 100644 --- a/vpro-shared-elasticsearch-high-level-client/pom.xml +++ b/vpro-shared-elasticsearch-high-level-client/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-elasticsearch-high-level-client diff --git a/vpro-shared-elasticsearch/pom.xml b/vpro-shared-elasticsearch/pom.xml index bf563a244..ea56c7e83 100644 --- a/vpro-shared-elasticsearch/pom.xml +++ b/vpro-shared-elasticsearch/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-elasticsearch diff --git a/vpro-shared-guice/pom.xml b/vpro-shared-guice/pom.xml index 4605adcea..a9426f89d 100644 --- a/vpro-shared-guice/pom.xml +++ b/vpro-shared-guice/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-guice diff --git a/vpro-shared-hibernate-search6/pom.xml b/vpro-shared-hibernate-search6/pom.xml index 57dd3cbfd..4d96cfb5b 100644 --- a/vpro-shared-hibernate-search6/pom.xml +++ b/vpro-shared-hibernate-search6/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-hibernate-search6 @@ -53,7 +53,7 @@ nl.vpro.shared - vpro-shared-hibernate + vpro-shared-hibernate7 org.testcontainers diff --git a/vpro-shared-hibernate-search6/src/test/resources/META-INF/persistence.xml b/vpro-shared-hibernate-search6/src/test/resources/META-INF/persistence.xml index 1d91caeb4..9a62673f5 100644 --- a/vpro-shared-hibernate-search6/src/test/resources/META-INF/persistence.xml +++ b/vpro-shared-hibernate-search6/src/test/resources/META-INF/persistence.xml @@ -1,14 +1,16 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence + https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" + version="3.0"> Persistence unit to test hibernate search org.hibernate.jpa.HibernatePersistenceProvider + nl.vpro.hibernate.search6.domain.TestEntity + nl.vpro.hibernate.search6.domain.SubObject false diff --git a/vpro-shared-hibernate/pom.xml b/vpro-shared-hibernate7/pom.xml similarity index 76% rename from vpro-shared-hibernate/pom.xml rename to vpro-shared-hibernate7/pom.xml index 237aaff17..ffb52ffa7 100644 --- a/vpro-shared-hibernate/pom.xml +++ b/vpro-shared-hibernate7/pom.xml @@ -5,13 +5,13 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT - vpro-shared-hibernate - vpro-shared-hibernate + vpro-shared-hibernate7 + vpro-shared-hibernate7 - hibernate + hibernate7 @@ -20,13 +20,7 @@ org.hibernate.orm hibernate-core - + nl.vpro.shared vpro-shared-test diff --git a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/DurationToLongType.java b/vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/DurationToLongType.java similarity index 100% rename from vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/DurationToLongType.java rename to vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/DurationToLongType.java diff --git a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/FalseToNullType.java b/vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/FalseToNullType.java similarity index 100% rename from vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/FalseToNullType.java rename to vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/FalseToNullType.java diff --git a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/InstantToTimestampType.java b/vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/InstantToTimestampType.java similarity index 100% rename from vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/InstantToTimestampType.java rename to vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/InstantToTimestampType.java diff --git a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/QueryIterator.java b/vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/QueryIterator.java similarity index 100% rename from vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/QueryIterator.java rename to vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/QueryIterator.java diff --git a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/ScrollableResultsIterator.java b/vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/ScrollableResultsIterator.java similarity index 100% rename from vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/ScrollableResultsIterator.java rename to vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/ScrollableResultsIterator.java diff --git a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java b/vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/URIType.java similarity index 75% rename from vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java rename to vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/URIType.java index 4ce519788..f61b54b26 100644 --- a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java +++ b/vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/URIType.java @@ -1,12 +1,15 @@ package nl.vpro.hibernate; -import org.hibernate.metamodel.mapping.*; +import java.io.Serial; +import java.net.URI; + +import org.hibernate.metamodel.mapping.DiscriminatorConverter; +import org.hibernate.metamodel.mapping.DiscriminatorType; +import org.hibernate.metamodel.mapping.internal.UnifiedAnyDiscriminatorConverter; import org.hibernate.type.AbstractSingleColumnStandardBasicType; import org.hibernate.type.BasicType; import org.hibernate.type.descriptor.jdbc.VarcharJdbcType; -import java.net.URI; - /** * A type that maps between {@link java.sql.Types#VARCHAR VARCHAR} and {@link java.net.URI} * @@ -14,6 +17,10 @@ */ public class URIType extends AbstractSingleColumnStandardBasicType implements DiscriminatorType { + + @Serial + private static final long serialVersionUID = 1L; + public URIType() { super(VarcharJdbcType.INSTANCE, URITypeDescriptor.INSTANCE); } @@ -25,7 +32,7 @@ public String getName() { @Override public DiscriminatorConverter getValueConverter() { - return new MappedDiscriminatorConverter(null, null, null, null) { + return new UnifiedAnyDiscriminatorConverter(null, null, null, null, null, null) { @Override public URI toDomainValue(CharSequence relationalValue) { return URI.create((String) relationalValue); diff --git a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java b/vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java similarity index 90% rename from vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java rename to vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java index 8e0cb936c..dd74f89e3 100644 --- a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java +++ b/vpro-shared-hibernate7/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java @@ -1,12 +1,13 @@ package nl.vpro.hibernate; +import java.io.Serial; +import java.net.URI; +import java.net.URISyntaxException; + import org.hibernate.HibernateException; import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.type.descriptor.java.AbstractClassJavaType; -import java.net.URI; -import java.net.URISyntaxException; - /** * Descriptor for {@link java.net.URI} handling. @@ -15,8 +16,10 @@ */ class URITypeDescriptor extends AbstractClassJavaType { public static final URITypeDescriptor INSTANCE = new URITypeDescriptor(URI.class); + @Serial + private static final long serialVersionUID = -8084874037847068699L; - protected URITypeDescriptor(Class type) { + protected URITypeDescriptor(Class type) { super(type); } diff --git a/vpro-shared-hibernate/src/test/java/nl/vpro/jpa/A.java b/vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/A.java similarity index 100% rename from vpro-shared-hibernate/src/test/java/nl/vpro/jpa/A.java rename to vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/A.java diff --git a/vpro-shared-hibernate/src/test/java/nl/vpro/jpa/A3Listener.java b/vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/A3Listener.java similarity index 100% rename from vpro-shared-hibernate/src/test/java/nl/vpro/jpa/A3Listener.java rename to vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/A3Listener.java diff --git a/vpro-shared-hibernate/src/test/java/nl/vpro/jpa/AListener.java b/vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/AListener.java similarity index 100% rename from vpro-shared-hibernate/src/test/java/nl/vpro/jpa/AListener.java rename to vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/AListener.java diff --git a/vpro-shared-hibernate/src/test/java/nl/vpro/jpa/B.java b/vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/B.java similarity index 100% rename from vpro-shared-hibernate/src/test/java/nl/vpro/jpa/B.java rename to vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/B.java diff --git a/vpro-shared-hibernate/src/test/java/nl/vpro/jpa/C.java b/vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/C.java similarity index 100% rename from vpro-shared-hibernate/src/test/java/nl/vpro/jpa/C.java rename to vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/C.java diff --git a/vpro-shared-hibernate/src/test/java/nl/vpro/jpa/D.java b/vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/D.java similarity index 100% rename from vpro-shared-hibernate/src/test/java/nl/vpro/jpa/D.java rename to vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/D.java diff --git a/vpro-shared-hibernate/src/test/java/nl/vpro/jpa/E.java b/vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/E.java similarity index 100% rename from vpro-shared-hibernate/src/test/java/nl/vpro/jpa/E.java rename to vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/E.java diff --git a/vpro-shared-hibernate/src/test/java/nl/vpro/jpa/I.java b/vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/I.java similarity index 100% rename from vpro-shared-hibernate/src/test/java/nl/vpro/jpa/I.java rename to vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/I.java diff --git a/vpro-shared-hibernate/src/test/java/nl/vpro/jpa/JpaTest.java b/vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/JpaTest.java similarity index 100% rename from vpro-shared-hibernate/src/test/java/nl/vpro/jpa/JpaTest.java rename to vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/JpaTest.java diff --git a/vpro-shared-hibernate/src/test/java/nl/vpro/jpa/X.java b/vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/X.java similarity index 100% rename from vpro-shared-hibernate/src/test/java/nl/vpro/jpa/X.java rename to vpro-shared-hibernate7/src/test/java/nl/vpro/jpa/X.java diff --git a/vpro-shared-hibernate/src/test/resources/META-INF/orm.xml b/vpro-shared-hibernate7/src/test/resources/META-INF/orm.xml similarity index 100% rename from vpro-shared-hibernate/src/test/resources/META-INF/orm.xml rename to vpro-shared-hibernate7/src/test/resources/META-INF/orm.xml diff --git a/vpro-shared-i18n/pom.xml b/vpro-shared-i18n/pom.xml index 3489d93a8..0abd5f4d8 100644 --- a/vpro-shared-i18n/pom.xml +++ b/vpro-shared-i18n/pom.xml @@ -4,7 +4,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-i18n vpro-shared-i18n diff --git a/vpro-shared-jackson2/pom.xml b/vpro-shared-jackson2/pom.xml index 75f5a2181..19d556ace 100644 --- a/vpro-shared-jackson2/pom.xml +++ b/vpro-shared-jackson2/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-jackson2 diff --git a/vpro-shared-jackson3/pom.xml b/vpro-shared-jackson3/pom.xml index 9f91aecf0..513fb2cf5 100644 --- a/vpro-shared-jackson3/pom.xml +++ b/vpro-shared-jackson3/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-jackson3 diff --git a/vpro-shared-jcache/pom.xml b/vpro-shared-jcache/pom.xml index c143b425a..1e772b0f0 100644 --- a/vpro-shared-jcache/pom.xml +++ b/vpro-shared-jcache/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-jcache diff --git a/vpro-shared-log4j2/pom.xml b/vpro-shared-log4j2/pom.xml index 92b0e8a5a..ce841a534 100644 --- a/vpro-shared-log4j2/pom.xml +++ b/vpro-shared-log4j2/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-log4j2 diff --git a/vpro-shared-logging/pom.xml b/vpro-shared-logging/pom.xml index 1244a64fe..5c31d7c3b 100644 --- a/vpro-shared-logging/pom.xml +++ b/vpro-shared-logging/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-logging diff --git a/vpro-shared-mediainfo/pom.xml b/vpro-shared-mediainfo/pom.xml index 8843d0b43..6c6526b6d 100644 --- a/vpro-shared-mediainfo/pom.xml +++ b/vpro-shared-mediainfo/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-mediainfo diff --git a/vpro-shared-monitoring/pom.xml b/vpro-shared-monitoring/pom.xml index 1c0429191..f9477e857 100644 --- a/vpro-shared-monitoring/pom.xml +++ b/vpro-shared-monitoring/pom.xml @@ -4,7 +4,7 @@ nl.vpro.shared vpro-shared-parent - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-monitoring vpro-shared-monitoring diff --git a/vpro-shared-persistence/pom.xml b/vpro-shared-persistence/pom.xml index 294b1414a..ad1147dd4 100644 --- a/vpro-shared-persistence/pom.xml +++ b/vpro-shared-persistence/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-persistence diff --git a/vpro-shared-rs-client/pom.xml b/vpro-shared-rs-client/pom.xml index dbca722f6..e80a5678e 100644 --- a/vpro-shared-rs-client/pom.xml +++ b/vpro-shared-rs-client/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-rs-client vpro-shared-rs-client diff --git a/vpro-shared-rs/pom.xml b/vpro-shared-rs/pom.xml index adf006d02..1e8ed8593 100644 --- a/vpro-shared-rs/pom.xml +++ b/vpro-shared-rs/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-rs vpro-shared-rs diff --git a/vpro-shared-swagger3-taglib/pom.xml b/vpro-shared-swagger3-taglib/pom.xml index b11e38e16..32ef13133 100644 --- a/vpro-shared-swagger3-taglib/pom.xml +++ b/vpro-shared-swagger3-taglib/pom.xml @@ -5,11 +5,11 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-swagger3-taglib vpro-shared-swagger3-taglib - 5.17-SNAPSHOT + 6.0-SNAPSHOT swagger_taglib diff --git a/vpro-shared-swagger3/pom.xml b/vpro-shared-swagger3/pom.xml index 775d99acb..b7ac9bb11 100644 --- a/vpro-shared-swagger3/pom.xml +++ b/vpro-shared-swagger3/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-swagger3 vpro-shared-swagger3 diff --git a/vpro-shared-test/pom.xml b/vpro-shared-test/pom.xml index 9101b3f09..e973a2722 100644 --- a/vpro-shared-test/pom.xml +++ b/vpro-shared-test/pom.xml @@ -4,7 +4,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-test vpro-shared-test diff --git a/vpro-shared-util/pom.xml b/vpro-shared-util/pom.xml index 39e18f054..cf34bebdf 100644 --- a/vpro-shared-util/pom.xml +++ b/vpro-shared-util/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-util diff --git a/vpro-shared-util/src/test/java/nl/vpro/util/URLResourceTest.java b/vpro-shared-util/src/test/java/nl/vpro/util/URLResourceTest.java index 0e0ae2b18..d6418e560 100644 --- a/vpro-shared-util/src/test/java/nl/vpro/util/URLResourceTest.java +++ b/vpro-shared-util/src/test/java/nl/vpro/util/URLResourceTest.java @@ -21,7 +21,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*; import static nl.vpro.util.URLResource.PROPERTIES; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -103,7 +103,7 @@ public void broadcasters(WireMockRuntimeInfo info) throws InterruptedException { public void broadcastersRedirect(WireMockRuntimeInfo runtimeInfo) { URLResource broadcasters = URLResource.properties(URI.create(runtimeInfo.getHttpBaseUrl() + "/redirect")); - assertTrue(broadcasters.get().size() > 0); + assertFalse(broadcasters.get().isEmpty()); } @@ -112,7 +112,7 @@ public void broadcastersRedirect(WireMockRuntimeInfo runtimeInfo) { public void broadcastersFromClassPath() throws InterruptedException { URLResource broadcasters = URLResource.properties(URI.create("classpath:/broadcasters.properties")); broadcasters.setMinAge(Duration.ofMillis(100)); - assertTrue(broadcasters.get().size() > 0); + assertFalse(broadcasters.get().isEmpty()); assertThat(broadcasters.getNotCheckedCount()).isEqualTo(0); assertThat(broadcasters.getCheckedCount()).isEqualTo(1); @@ -133,7 +133,7 @@ public void broadcastersFromClassPath() throws InterruptedException { @Test public void broadcastersFromClassPathMap() { URLResource> broadcasters = URLResource.map(URI.create("classpath:/broadcasters.properties")); - assertTrue(broadcasters.get().size() > 0); + assertFalse(broadcasters.get().isEmpty()); assertThat(broadcasters.getNotCheckedCount()).isEqualTo(0); broadcasters.get(); assertThat(broadcasters.getNotCheckedCount()).isEqualTo(1); @@ -145,7 +145,7 @@ public void broadcasters503() throws IOException { when(connection.getResponseCode()).thenReturn(503, 200, 500, 200); when(connection.getInputStream()).thenAnswer(invocation -> new ByteArrayInputStream("VPRO=VPRO".getBytes())); - URLResource broadcasters = new URLResource(URI.create("https://poms.omroep.nl/broadcasters/"), PROPERTIES, new Properties()) { + URLResource broadcasters = new URLResource<>(URI.create("https://poms.omroep.nl/broadcasters/"), PROPERTIES, new Properties()) { @Override public URLConnection openConnection() { return connection; @@ -187,7 +187,7 @@ public void broadcastersReal(String env) { broadcasters.setMinAge(Duration.ZERO); Properties properties = broadcasters.get(); if (broadcasters.getCode() != 503) { - assertTrue(properties.size() > 0); + assertFalse(properties.isEmpty()); assertThat(broadcasters.getChangesCount()).isEqualTo(1); assertThat(broadcasters.getNotModifiedCount()).isEqualTo(0); assertThat(broadcasters.getNotCheckedCount()).isEqualTo(0); @@ -201,7 +201,7 @@ public void broadcastersReal(String env) { } else { log.info("Skipping because code = {}", broadcasters.getCode()); } - System.out.println(broadcasters.get()); + log.info("{}", broadcasters.get()); } } diff --git a/vpro-shared-validation/pom.xml b/vpro-shared-validation/pom.xml index d4666d7dd..244fd01e0 100644 --- a/vpro-shared-validation/pom.xml +++ b/vpro-shared-validation/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-validation diff --git a/vpro-shared-web/pom.xml b/vpro-shared-web/pom.xml index 372e04342..1e74f5e1c 100644 --- a/vpro-shared-web/pom.xml +++ b/vpro-shared-web/pom.xml @@ -4,7 +4,7 @@ nl.vpro.shared vpro-shared-parent - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-web vpro-shared-web diff --git a/vpro-shared-xml/pom.xml b/vpro-shared-xml/pom.xml index 5961becbd..09d3012d6 100644 --- a/vpro-shared-xml/pom.xml +++ b/vpro-shared-xml/pom.xml @@ -5,7 +5,7 @@ vpro-shared-parent nl.vpro.shared - 5.17-SNAPSHOT + 6.0-SNAPSHOT vpro-shared-xml