Fixed build

obsidiandynamics · Jul 18, 2022 · 96f218c · 96f218c
1 parent 6640d77
commit 96f218c
Show file tree

Hide file tree

Showing 35 changed files with 161 additions and 178 deletions.
diff --git a/assert/src/main/java/com/obsidiandynamics/assertion/Assertions.java b/assert/src/main/java/com/obsidiandynamics/assertion/Assertions.java
@@ -100,7 +100,7 @@ public static void assertToStringOverride(Object obj) {
   }
 
   /**
-   *  Verifies that a utility class is well defined.
+   *  Verifies that a utility class is well-defined.
    *
    *  Adapted from
    *  https://github.com/trajano/maven-jee6/blob/master/maven-jee6-test/src/test/java/net/trajano/maven_jee6/test/test/UtilityClassTestUtilTest.java

diff --git a/await/build.gradle b/await/build.gradle
@@ -2,7 +2,7 @@ def packageName = "fulcrum-await"
 version = project(":").version
 
 dependencies {
-  testCompile project(":fulcrum-assert")
+  testImplementation project(":fulcrum-assert")
 }
 
 jar {

diff --git a/build.gradle b/build.gradle
@@ -36,16 +36,19 @@ def baseJvmArgs = [
 project.ext.set("baseJvmArgs", baseJvmArgs)
 
 allprojects {
-  apply plugin: "java"
+  apply plugin: "java-library"
   apply plugin: "jacoco"
   apply plugin: "maven-publish"
   apply plugin: "com.jfrog.bintray"
 
   sourceCompatibility = 1.8
   targetCompatibility = 1.8
 
+  //TODO remove when Javadoc errors have been resolved
+  javadoc.options.addStringOption('Xdoclint:none', '-quiet')
+
   repositories {
-    jcenter()
+    mavenCentral()
     maven {
       url "https://oss.sonatype.org/content/repositories/snapshots"
     }
@@ -54,8 +57,8 @@ allprojects {
   ext {
     antVersion = "1.10.6"
     assertjVersion = "3.13.2"
-    chronicleQueueVersion = "5.17.18"
-    equalsverifierVersion = "3.1.9"
+    chronicleQueueVersion = "5.23ea24"
+    equalsverifierVersion = "3.10"
     glassfishELVersion = "3.0.1-b11"
     hamcrestVersion = "2.1"
     hibernateValidatorVersion = "6.0.13.Final"
@@ -76,12 +79,12 @@ allprojects {
   }
 
   dependencies {
-    testCompile "junit:junit:${junitVersion}"
-    testCompile "com.obsidiandynamics.pojotester:pojotester:${pojotesterVersion}"
-    testCompile "nl.jqno.equalsverifier:equalsverifier:${equalsverifierVersion}"
-    testCompile "org.mockito:mockito-core:${mockitoVersion}"
-    testCompile "org.assertj:assertj-core:${assertjVersion}"
-    testCompile "org.hamcrest:hamcrest-library:${hamcrestVersion}"
+    testImplementation "junit:junit:${junitVersion}"
+    testImplementation "com.obsidiandynamics.pojotester:core:${pojotesterVersion}"
+    testImplementation "nl.jqno.equalsverifier:equalsverifier:${equalsverifierVersion}"
+    testImplementation "org.mockito:mockito-core:${mockitoVersion}"
+    testImplementation "org.assertj:assertj-core:${assertjVersion}"
+    testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
   }
 
   compileJava {
@@ -118,7 +121,7 @@ allprojects {
   }
 
   jacoco {
-    toolVersion = "0.8.4"
+    toolVersion = "0.8.8"
   }
 
   task verify {  

diff --git a/combinations/build.gradle b/combinations/build.gradle
@@ -2,9 +2,9 @@ def packageName = "fulcrum-combinations"
 version = project(":").version
 
 dependencies {
-  compile project(":fulcrum-func")
-  
-  testCompile project(":fulcrum-assert")
+  api project(":fulcrum-func")
+
+  testImplementation project(":fulcrum-assert")
 }
 
 jar {

diff --git a/constraints/build.gradle b/constraints/build.gradle
@@ -3,11 +3,11 @@ version = project(":").version
 
 dependencies {
   compileOnly "javax.validation:validation-api:${validationApiVersion}"
-  
-  testCompile project (":fulcrum-assert")
-  testCompile "javax.validation:validation-api:${validationApiVersion}"
-  testRuntime "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
-  testRuntime "org.glassfish:javax.el:${glassfishELVersion}"
+
+  testImplementation project (":fulcrum-assert")
+  testImplementation "javax.validation:validation-api:${validationApiVersion}"
+  testImplementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
+  testImplementation "org.glassfish:javax.el:${glassfishELVersion}"
 }
 
 jar {

diff --git a/docker-compose/build.gradle b/docker-compose/build.gradle
@@ -2,10 +2,10 @@ def packageName = "fulcrum-docker-compose"
 version = project(":").version
 
 dependencies {
-  compile project(":fulcrum-concat")
-  compile project(":fulcrum-shell")
+  api project(":fulcrum-concat")
+  api project(":fulcrum-shell")
 
-  testCompile "org.hamcrest:hamcrest-library:1.3"
+  testImplementation "org.hamcrest:hamcrest-library:1.3"
 }
 
 jar {

diff --git a/dyno/build.gradle b/dyno/build.gradle
@@ -1,38 +1,17 @@
 def packageName = "fulcrum-dyno"
 version = project(":").version
 
-repositories {
-  jcenter()
-}
-
-buildscript {
-  repositories {
-    maven {
-      url 'https://plugins.gradle.org/m2/'
-    }
-  }
-  dependencies {
-    classpath 'net.ltgt.gradle:gradle-apt-plugin:0.21'
-  }
-}
-
-apply plugin: 'net.ltgt.apt'
-
 dependencies {
-  compile project(":fulcrum-func")
+  api project(":fulcrum-func")
   compileOnly "org.openjdk.jmh:jmh-core:${jmhVersion}"
 
   annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:${jmhVersion}"
-
-  testCompile project(":fulcrum-assert")
-  testCompile project(":fulcrum-resolver")
-  testCompile "org.openjdk.jmh:jmh-core:${jmhVersion}"
-}
 
-compileJava {
-  aptOptions.annotationProcessing = false
+  testImplementation project(":fulcrum-assert")
+  testImplementation project(":fulcrum-resolver")
+  testImplementation "org.openjdk.jmh:jmh-core:${jmhVersion}"
 }
-    
+
 task copySrc(type: Copy, dependsOn: compileJava) {
   from 'build/generated/source/apt/main/com/obsidiandynamics/dyno/generated'
   into 'src/main/java/com/obsidiandynamics/dyno/generated'

diff --git a/flow/build.gradle b/flow/build.gradle
@@ -2,12 +2,12 @@ def packageName = "fulcrum-flow"
 version = project(":").version
 
 dependencies {
-  compile project(":fulcrum-worker")
-  
-  testCompile project(":fulcrum-assert")
-  testCompile project(":fulcrum-await")
-  testCompile project(":fulcrum-junit")
-  testCompile project(":fulcrum-threads")
+  api project(":fulcrum-worker")
+
+  testImplementation project(":fulcrum-assert")
+  testImplementation project(":fulcrum-await")
+  testImplementation project(":fulcrum-junit")
+  testImplementation project(":fulcrum-threads")
 }
 
 jar {

diff --git a/flux-offheap/build.gradle b/flux-offheap/build.gradle
@@ -2,24 +2,24 @@ def packageName = "fulcrum-flux-offheap"
 version = project(":").version
 
 dependencies {
-  compile project(":fulcrum-flux")
-  compile project(":fulcrum-format")
-  compile project(":fulcrum-fslock")
-  compile project(":fulcrum-io")
-  compile project(":fulcrum-random")
+  api project(":fulcrum-flux")
+  api project(":fulcrum-format")
+  api project(":fulcrum-fslock")
+  api project(":fulcrum-io")
+  api project(":fulcrum-random")
 
   compileOnly "net.openhft:chronicle-queue:${chronicleQueueVersion}"
   compileOnly "com.esotericsoftware:kryo:${kryoVersion}"
-  
-  testCompile project(":fulcrum-assert")
-  testCompile project(":fulcrum-await")
-  testCompile project(":fulcrum-junit")
-  testCompile project(":fulcrum-verifier")
-  testCompile project(":fulcrum-flux").sourceSets.test.output
-  testCompile "net.openhft:chronicle-queue:${chronicleQueueVersion}"
-  testCompile "com.esotericsoftware:kryo:${kryoVersion}"
-  
-  testRuntime "org.slf4j:slf4j-nop:${slf4jVersion}"
+
+  testImplementation project(":fulcrum-assert")
+  testImplementation project(":fulcrum-await")
+  testImplementation project(":fulcrum-junit")
+  testImplementation project(":fulcrum-verifier")
+  testImplementation project(":fulcrum-flux").sourceSets.test.output
+  testImplementation "net.openhft:chronicle-queue:${chronicleQueueVersion}"
+  testImplementation "com.esotericsoftware:kryo:${kryoVersion}"
+
+  testImplementation "org.slf4j:slf4j-nop:${slf4jVersion}"
 }
 
 jar {

diff --git a/flux/build.gradle b/flux/build.gradle
@@ -2,16 +2,16 @@ def packageName = "fulcrum-flux"
 version = project(":").version
 
 dependencies {
-  compile project(":fulcrum-func")
-  compile project(":fulcrum-threads")
-  compile project(":fulcrum-worker")
-  
-  testCompile project(":fulcrum-assert")
-  testCompile project(":fulcrum-await")
-  testCompile project(":fulcrum-junit")
-  testCompile project(":fulcrum-verifier")
-  
-  testRuntime "org.slf4j:slf4j-nop:${slf4jVersion}"
+  api project(":fulcrum-func")
+  api project(":fulcrum-threads")
+  api project(":fulcrum-worker")
+
+  testImplementation project(":fulcrum-assert")
+  testImplementation project(":fulcrum-await")
+  testImplementation project(":fulcrum-junit")
+  testImplementation project(":fulcrum-verifier")
+
+  testImplementation "org.slf4j:slf4j-nop:${slf4jVersion}"
 }
 
 jar {

diff --git a/format/build.gradle b/format/build.gradle
@@ -2,9 +2,10 @@ def packageName = "fulcrum-format"
 version = project(":").version
 
 dependencies {
-  compile project (":fulcrum-func")
-  compile project (":fulcrum-threads")
-  testCompile project (":fulcrum-assert")
+  api project (":fulcrum-func")
+  api project (":fulcrum-threads")
+
+  testImplementation project (":fulcrum-assert")
 }
 
 jar {

diff --git a/fslock/build.gradle b/fslock/build.gradle
@@ -2,16 +2,16 @@ def packageName = "fulcrum-fslock"
 version = project(":").version
 
 dependencies {
-  compile project(":fulcrum-format")
-  compile project(":fulcrum-func")
-  
-  testCompile project(":fulcrum-await")
-  testCompile project(":fulcrum-httpclient")
-  testCompile project(":fulcrum-threads")
-  testCompile "org.apache.ant:ant:${antVersion}"
-  testCompile "io.undertow:undertow-core:${undertowVersion}"
-  testCompile "org.apache.httpcomponents:httpclient:${httpclientVersion}"
-  testCompile "org.apache.httpcomponents:httpasyncclient:${httpasyncclientVersion}"
+  api project(":fulcrum-format")
+  api project(":fulcrum-func")
+
+  testImplementation project(":fulcrum-await")
+  testImplementation project(":fulcrum-httpclient")
+  testImplementation project(":fulcrum-threads")
+  testImplementation "org.apache.ant:ant:${antVersion}"
+  testImplementation "io.undertow:undertow-core:${undertowVersion}"
+  testImplementation "org.apache.httpcomponents:httpclient:${httpclientVersion}"
+  testImplementation "org.apache.httpcomponents:httpasyncclient:${httpasyncclientVersion}"
 }
 
 jar {

diff --git a/func/build.gradle b/func/build.gradle
@@ -2,9 +2,9 @@ def packageName = "fulcrum-func"
 version = project(":").version
 
 dependencies {
-  testCompile project (":fulcrum-assert")
-  testCompile project (":fulcrum-await")
-  testCompile project (":fulcrum-junit")
+  testImplementation project (":fulcrum-assert")
+  testImplementation project (":fulcrum-await")
+  testImplementation project (":fulcrum-junit")
 }
 
 jar {

diff --git 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-5.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/httpclient/build.gradle b/httpclient/build.gradle
@@ -2,16 +2,16 @@ def packageName = "fulcrum-httpclient"
 version = project(":").version
 
 dependencies {
-  compile project (":fulcrum-func")
-  compile project (":fulcrum-io")
+  api project (":fulcrum-func")
+  api project (":fulcrum-io")
   compileOnly "org.apache.httpcomponents:httpclient:${httpclientVersion}"
   compileOnly "org.apache.httpcomponents:httpasyncclient:${httpasyncclientVersion}"
-  
-  testCompile project (":fulcrum-assert")
-  testCompile project (":fulcrum-junit")
-  testCompile "com.github.tomakehurst:wiremock-standalone:${wiremockVersion}"
-  testCompile "org.apache.httpcomponents:httpclient:${httpclientVersion}"
-  testCompile "org.apache.httpcomponents:httpasyncclient:${httpasyncclientVersion}"
+
+  testImplementation project (":fulcrum-assert")
+  testImplementation project (":fulcrum-junit")
+  testImplementation "com.github.tomakehurst:wiremock-standalone:${wiremockVersion}"
+  testImplementation "org.apache.httpcomponents:httpclient:${httpclientVersion}"
+  testImplementation "org.apache.httpcomponents:httpasyncclient:${httpasyncclientVersion}"
 }
 
 jar {

diff --git a/io/build.gradle b/io/build.gradle
@@ -2,9 +2,9 @@ def packageName = "fulcrum-io"
 version = project(":").version
 
 dependencies {
-  compile project(":fulcrum-func")
-  
-  testCompile project(":fulcrum-assert")
+  api project(":fulcrum-func")
+
+  testImplementation project(":fulcrum-assert")
 }
 
 jar {

diff --git a/jgroups/build.gradle b/jgroups/build.gradle
@@ -2,16 +2,16 @@ def packageName = "fulcrum-jgroups"
 version = project(":").version
 
 dependencies {
-  compile project(":fulcrum-func")
+  api project(":fulcrum-func")
   compileOnly "org.jgroups:jgroups:${jgroupsVersion}"
-  
-  testCompile project(":fulcrum-assert")
-  testCompile project(":fulcrum-await")
-  testCompile project(":fulcrum-junit")
-  testCompile project(":fulcrum-select")
-  testCompile "org.jgroups:jgroups:${jgroupsVersion}"
-  testRuntime "org.slf4j:slf4j-log4j12:${slf4jVersion}"
-  testRuntime "log4j:log4j:${log4jVersion}"
+
+  testImplementation project(":fulcrum-assert")
+  testImplementation project(":fulcrum-await")
+  testImplementation project(":fulcrum-junit")
+  testImplementation project(":fulcrum-select")
+  testImplementation "org.jgroups:jgroups:${jgroupsVersion}"
+  testImplementation "org.slf4j:slf4j-log4j12:${slf4jVersion}"
+  testImplementation "log4j:log4j:${log4jVersion}"
 }
 
 jar {

diff --git a/json/build.gradle b/json/build.gradle
@@ -2,11 +2,11 @@ def packageName = "fulcrum-json"
 version = project(":").version
 
 dependencies {
-  compile project (":fulcrum-format")
+  api project (":fulcrum-format")
   compileOnly "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
-  
-  testCompile project (":fulcrum-assert")
-  testCompile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
+
+  testImplementation project (":fulcrum-assert")
+  testImplementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
 }
 
 jar {