diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 5fe0c9a..d12218c 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -8,7 +8,7 @@ @@ -28,6 +28,9 @@ + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index cdbcf23..40dc3dc 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -5,33 +5,28 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - @@ -41,6 +36,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 42f5ff1..7840d67 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,9 +4,7 @@ - + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 30a11cb..4b5e315 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -36,5 +36,15 @@ - + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml deleted file mode 100644 index 75d3968..0000000 --- a/.idea/sqldialects.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/beanie-annotations/build.gradle b/beanie-annotations/build.gradle index 3c26d8c..6fdb23c 100644 --- a/beanie-annotations/build.gradle +++ b/beanie-annotations/build.gradle @@ -3,6 +3,6 @@ plugins { } dependencies { - implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.11.0' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.14.3' } diff --git a/beanie-annotations/src/main/java/com/nosto/beanie/JacksonBean.java b/beanie-annotations/src/main/java/com/nosto/beanie/JacksonBean.java index 5fc8d75..a03695c 100644 --- a/beanie-annotations/src/main/java/com/nosto/beanie/JacksonBean.java +++ b/beanie-annotations/src/main/java/com/nosto/beanie/JacksonBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-annotations/src/main/java/com/nosto/beanie/JacksonOnlySerialize.java b/beanie-annotations/src/main/java/com/nosto/beanie/JacksonOnlySerialize.java index 0d73241..1f4f40d 100644 --- a/beanie-annotations/src/main/java/com/nosto/beanie/JacksonOnlySerialize.java +++ b/beanie-annotations/src/main/java/com/nosto/beanie/JacksonOnlySerialize.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-annotations/src/test/java/com/nosto/beanie/BeanTest.java b/beanie-annotations/src/test/java/com/nosto/beanie/BeanTest.java index 3b21556..87155ff 100644 --- a/beanie-annotations/src/test/java/com/nosto/beanie/BeanTest.java +++ b/beanie-annotations/src/test/java/com/nosto/beanie/BeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/build.gradle b/beanie-core/build.gradle index 74840e7..76a768a 100644 --- a/beanie-core/build.gradle +++ b/beanie-core/build.gradle @@ -4,12 +4,12 @@ plugins { dependencies { implementation project(':beanie-annotations') - implementation group: 'junit', name: 'junit', version: '4.12' + + implementation group: 'junit', name: 'junit', version: '4.13.2' implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.14.1' - implementation group: 'org.reflections', name: 'reflections', version: '0.9.12' + implementation group: 'org.reflections', name: 'reflections', version: '0.10.2' implementation group: 'org.jeasy', name: 'easy-random-core', version: '5.0.0' - implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.0' - implementation group: 'javax.annotation', name: 'jsr305', version: '1.0' - + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.14.3' + implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' } diff --git a/beanie-core/src/main/java/com/nosto/beanie/AbstractJacksonBeanTest.java b/beanie-core/src/main/java/com/nosto/beanie/AbstractJacksonBeanTest.java index 17af772..e3fc01e 100644 --- a/beanie-core/src/main/java/com/nosto/beanie/AbstractJacksonBeanTest.java +++ b/beanie-core/src/main/java/com/nosto/beanie/AbstractJacksonBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/main/java/com/nosto/beanie/BeanieProvider.java b/beanie-core/src/main/java/com/nosto/beanie/BeanieProvider.java index e63bc71..1b8081d 100644 --- a/beanie-core/src/main/java/com/nosto/beanie/BeanieProvider.java +++ b/beanie-core/src/main/java/com/nosto/beanie/BeanieProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/main/java/com/nosto/beanie/JacksonBeanTest.java b/beanie-core/src/main/java/com/nosto/beanie/JacksonBeanTest.java index f69556c..0cadf74 100644 --- a/beanie-core/src/main/java/com/nosto/beanie/JacksonBeanTest.java +++ b/beanie-core/src/main/java/com/nosto/beanie/JacksonBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not @@ -7,10 +7,8 @@ * accordance with the terms of the agreement you entered into with * Nosto Solutions Ltd. */ - package com.nosto.beanie; - import static org.junit.Assert.assertFalse; import java.lang.reflect.Modifier; diff --git a/beanie-core/src/main/java/com/nosto/beanie/jeasy/ExcludedMapAndCollectionsAsEmptyRandomizerRegistry.java b/beanie-core/src/main/java/com/nosto/beanie/jeasy/ExcludedMapAndCollectionsAsEmptyRandomizerRegistry.java index fb1a53e..0f88646 100644 --- a/beanie-core/src/main/java/com/nosto/beanie/jeasy/ExcludedMapAndCollectionsAsEmptyRandomizerRegistry.java +++ b/beanie-core/src/main/java/com/nosto/beanie/jeasy/ExcludedMapAndCollectionsAsEmptyRandomizerRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/main/java/com/nosto/beanie/jeasy/ForceAllNonPrimitivesAsNullRandomizerRegistry.java b/beanie-core/src/main/java/com/nosto/beanie/jeasy/ForceAllNonPrimitivesAsNullRandomizerRegistry.java index 7842d00..c2d7deb 100644 --- a/beanie-core/src/main/java/com/nosto/beanie/jeasy/ForceAllNonPrimitivesAsNullRandomizerRegistry.java +++ b/beanie-core/src/main/java/com/nosto/beanie/jeasy/ForceAllNonPrimitivesAsNullRandomizerRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/AbstractTestBean.java b/beanie-core/src/test/java/com/nosto/beanie/AbstractTestBean.java index c69006a..42265ea 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/AbstractTestBean.java +++ b/beanie-core/src/test/java/com/nosto/beanie/AbstractTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/ConstructorNullPointerTest.java b/beanie-core/src/test/java/com/nosto/beanie/ConstructorNullPointerTest.java index b063392..3faee08 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/ConstructorNullPointerTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/ConstructorNullPointerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/DefaultBeanieProvider.java b/beanie-core/src/test/java/com/nosto/beanie/DefaultBeanieProvider.java index 4f38597..4cff60d 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/DefaultBeanieProvider.java +++ b/beanie-core/src/test/java/com/nosto/beanie/DefaultBeanieProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/InconsistentConstructorParamsTest.java b/beanie-core/src/test/java/com/nosto/beanie/InconsistentConstructorParamsTest.java index 2d124db..f8f4955 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/InconsistentConstructorParamsTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/InconsistentConstructorParamsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/InconsistentPropertyNamesTest.java b/beanie-core/src/test/java/com/nosto/beanie/InconsistentPropertyNamesTest.java index bd6069b..a5c1be9 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/InconsistentPropertyNamesTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/InconsistentPropertyNamesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/InvalidSnakeCasePropertyNamingStrategyTest.java b/beanie-core/src/test/java/com/nosto/beanie/InvalidSnakeCasePropertyNamingStrategyTest.java index f27bf2d..0f0e875 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/InvalidSnakeCasePropertyNamingStrategyTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/InvalidSnakeCasePropertyNamingStrategyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/MixedPropertyNamingStrategyTest.java b/beanie-core/src/test/java/com/nosto/beanie/MixedPropertyNamingStrategyTest.java index d1043f0..5d2c3ac 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/MixedPropertyNamingStrategyTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/MixedPropertyNamingStrategyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/MutabilityTest.java b/beanie-core/src/test/java/com/nosto/beanie/MutabilityTest.java index 2806f34..a872e2b 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/MutabilityTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/MutabilityTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/NoNullCollectionsTest.java b/beanie-core/src/test/java/com/nosto/beanie/NoNullCollectionsTest.java index acd8c1d..e2a07e9 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/NoNullCollectionsTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/NoNullCollectionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/PolymorphicJacksonBeanTest.java b/beanie-core/src/test/java/com/nosto/beanie/PolymorphicJacksonBeanTest.java index 24ee4c0..bc185f6 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/PolymorphicJacksonBeanTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/PolymorphicJacksonBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/PrimitiveUnboxingGetterTest.java b/beanie-core/src/test/java/com/nosto/beanie/PrimitiveUnboxingGetterTest.java index 4069899..16caa02 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/PrimitiveUnboxingGetterTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/PrimitiveUnboxingGetterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/TypeVariableJacksonBeanTest.java b/beanie-core/src/test/java/com/nosto/beanie/TypeVariableJacksonBeanTest.java index 6309950..e37f8c6 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/TypeVariableJacksonBeanTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/TypeVariableJacksonBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/ValidCamelCasePropertyNamingStrategyTest.java b/beanie-core/src/test/java/com/nosto/beanie/ValidCamelCasePropertyNamingStrategyTest.java index ae87167..9219d2c 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/ValidCamelCasePropertyNamingStrategyTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/ValidCamelCasePropertyNamingStrategyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/beanie-core/src/test/java/com/nosto/beanie/ValidSnakeCasePropertyNamingStrategyTest.java b/beanie-core/src/test/java/com/nosto/beanie/ValidSnakeCasePropertyNamingStrategyTest.java index 09f81f8..ded9d0b 100644 --- a/beanie-core/src/test/java/com/nosto/beanie/ValidSnakeCasePropertyNamingStrategyTest.java +++ b/beanie-core/src/test/java/com/nosto/beanie/ValidSnakeCasePropertyNamingStrategyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Nosto Solutions Ltd All Rights Reserved. + * Copyright (c) 2024 Nosto Solutions Ltd All Rights Reserved. * * This software is the confidential and proprietary information of * Nosto Solutions Ltd ("Confidential Information"). You shall not diff --git a/build.gradle b/build.gradle index 6d7332e..8bd8586 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -//file:noinspection GrUnresolvedAccess -//file:noinspection GroovyAssignabilityCheck import org.gradle.api.tasks.testing.logging.TestLogEvent buildscript { @@ -7,9 +5,9 @@ buildscript { google() mavenCentral() gradlePluginPortal() +// mavenLocal() } dependencies { - classpath "org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:1.0.1" classpath "com.diffplug.spotless:spotless-plugin-gradle:5.12.4" classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.1" classpath "net.ltgt.gradle:gradle-errorprone-plugin:2.0.1" @@ -19,11 +17,8 @@ buildscript { } allprojects { project -> - apply plugin: 'java' apply plugin: 'checkstyle' - //apply plugin: 'scalaStyle' - //apply plugin: 'scala' apply plugin: "com.github.spotbugs" apply plugin: 'maven-publish' apply plugin: 'java-library' @@ -34,24 +29,34 @@ allprojects { project -> apply plugin: "jacoco" group 'com.nosto' - version '1.0.9' + version '1.1.0' repositories { +// mavenLocal() mavenCentral() + gradlePluginPortal() + google() maven { - url 'https://maven.onehippo.com/maven2/' + url 'https://repo.nos.to/content/repositories/NostoDependencies/' + credentials { + username "$mavenUser" + password "$mavenPassword" + } } } dependencies { - testImplementation group: 'junit', name: 'junit', version: '4.12' - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.2.0' - testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.2.0' - compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '3.1.3' - testCompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '3.1.3' - errorprone group: 'com.uber.nullaway', name: 'nullaway', version: '0.9.1' - errorprone group: 'com.google.errorprone', name: 'error_prone_core', version: '2.6.0' - spotbugsPlugins group: 'com.h3xstream.findsecbugs', name: 'findsecbugs-plugin', version: '1.10.1' + implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.8.6' + + testImplementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.8.6' + testImplementation group: 'junit', name: 'junit', version: '4.13.2' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.11.0' + testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.11.0' + + errorprone group: 'com.uber.nullaway', name: 'nullaway', version: '0.11.2' + errorprone group: 'com.google.errorprone', name: 'error_prone_core', version: '2.30.0' + + spotbugsPlugins group: 'com.h3xstream.findsecbugs', name: 'findsecbugs-plugin', version: '1.13.0' } // Configuration for the nullaway extension. The rest of the parameters must be @@ -62,65 +67,54 @@ allprojects { project -> annotatedPackages.add("com.nosto") } -// Configuration for the Scalastyle plugin. It seems that it isn't possible to define -// the output report formats here and those seem to be defined on the individual -// task level. - /*scalaStyle { - configLocation "project/scalastyle_config.xml" - }*/ - // Configuration for the Jacoco plugin. It seems that it isn't possible to define // the output report formats here and those seem to be defined on the individual // task level. // I'm not sure why the tool version is defined here and it isn't managed as a // dependency. jacoco { - toolVersion = "0.8.5" + toolVersion = "0.8.12" } // We only need the XML report so that the CI tools can parse it. The HTML isn't needed. jacocoTestReport { reports { - csv.enabled = true - xml.enabled = false - html.enabled = true + csv.required.set(true) + xml.required.set(false) + html.required.set(true) } } test { useJUnitPlatform() - testLogging.events.addAll([TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED]) + testLogging { + events = [TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED] + } reports { - junitXml.enabled = true - html.enabled = true + junitXml.required.set(true) + html.required.set(true) } - maxParallelForks = (int) (Runtime.runtime.availableProcessors() / 2 + 1) - finalizedBy jacocoTestReport // report is always generated after tests run + maxParallelForks = (Runtime.runtime.availableProcessors() / 2 + 1) as int + finalizedBy(tasks.named('jacocoTestReport')) // report is always generated after tests run } jacocoTestReport { dependsOn test // tests are required to run before generating the report } - + javadoc { options.addBooleanOption('html5', true) } - /*scaladoc { - scalaDocOptions.additionalParameters = ['-no-link-warnings'] - }*/ - task sourcesJar(type: Jar, dependsOn: classes) { archiveClassifier.set("sources") from sourceSets.main.allSource } - /*task scaladocJar(type: Jar, dependsOn: scaladoc) { - archiveClassifier.set("javadoc") - from scaladoc.destinationDir - }*/ - java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + withSourcesJar() withJavadocJar() } @@ -132,7 +126,7 @@ allprojects { project -> // dependency. spotbugs { //noinspection GroovyAccessibility,GrFinalVariableAccess,GroovyAssignabilityCheck - toolVersion = '4.0.2' + toolVersion = '4.8.6' //noinspection GroovyAccessibility,GrFinalVariableAccess,GroovyAssignabilityCheck ignoreFailures = true //noinspection GroovyAccessibility,GrFinalVariableAccess,GroovyAssignabilityCheck @@ -164,7 +158,7 @@ allprojects { project -> // I'm not sure why the tool version is defined here and it isn't managed as a // dependency. checkstyle { - toolVersion "7.6.1" + toolVersion "10.18.0" config rootProject.resources.text.fromFile("gradle/config/checkstyle/checkstyle.xml") } @@ -172,16 +166,16 @@ allprojects { project -> // and must be explicitly disabled checkstyleMain { reports { - xml.enabled = true - html.enabled = false + xml.required.set(true) + html.required.set(false) } } // We only need the XML report so that the CI tools can parse it. The HTML isn't needed. checkstyleTest { reports { - xml.enabled = true - html.enabled = false + xml.required.set(true) + html.required.set(false) } } @@ -190,66 +184,38 @@ allprojects { project -> maven { name = "github" url = uri("https://maven.pkg.github.com/nosto/beanie") - credentials(PasswordCredentials) + credentials { + username = "$mavenUser" + password = "$mavenPassword" + } } } publications { - //noinspection GroovyAssignabilityCheck maven(MavenPublication) { - //noinspection GroovyAssignabilityCheck from components.java pom { - //noinspection GroovyAssignabilityCheck name = 'Beanie' - //noinspection GroovyAssignabilityCheck description = 'A simple library to sanity-check your bean ser-deser' - //noinspection GroovyAssignabilityCheck url = 'https://github.com/nosto/beanie' licenses { license { - //noinspection GroovyAssignabilityCheck name = 'The Apache Software License, Version 2.0' - //noinspection GroovyAssignabilityCheck url = 'https://www.apache.org/licenses/LICENSE-2.0.txt' - //noinspection GroovyAssignabilityCheck distribution = 'repo' } } - developers { - developer { - //noinspection GroovyAssignabilityCheck - id = 'ollik1' - //noinspection GroovyAssignabilityCheck - name = 'Olli Kuonanoja' - //noinspection GroovyAssignabilityCheck - email = 'olli@nosto.com' - } - developer { - //noinspection GroovyAssignabilityCheck - id = 'mridang' - //noinspection GroovyAssignabilityCheck - name = 'Mridang Agarwalla' - //noinspection GroovyAssignabilityCheck - email = 'mridang@nosto.com' - } - } scm { - //noinspection GroovyAssignabilityCheck connection = 'scm:git:git://github.com/nosto/beanie.git' - //noinspection GroovyAssignabilityCheck developerConnection = 'scm:git:ssh://github.com/nosto/beanie.git' - //noinspection GroovyAssignabilityCheck url = 'https://github.com/nosto/beanie' } issueManagement { - //noinspection GroovyAssignabilityCheck system = "Github" - //noinspection GroovyAssignabilityCheck url = "https://github.com/nosto/beanie/issues" } } } } } -} \ No newline at end of file +} diff --git a/gradle/config/checkstyle/checkstyle.xml b/gradle/config/checkstyle/checkstyle.xml index c11e53b..6e9060c 100644 --- a/gradle/config/checkstyle/checkstyle.xml +++ b/gradle/config/checkstyle/checkstyle.xml @@ -1,6 +1,6 @@