separate DataTypes model

build.gradle

@@ -9,11 +9,12 @@ repositories {
     mavenLocal()
 }
 
+apply from: 'opencadc.gradle'
+
 sourceCompatibility = 11
 
 group = 'org.opencadc'
-
-version = '2.4'
+version = '2.5'
 
 jar {
     enabled = true
@@ -54,5 +55,5 @@ dependencies {
     testImplementation 'junit:junit:4.13' 
 }
 
-apply from: 'opencadc.gradle'
+
 

opencadc.gradle

@@ -1,11 +1,13 @@
 configurations {
     checkstyleDep
-    intTestCompile.extendsFrom testCompile
-    intTestRuntime.extendsFrom testRuntime
+    intTestImplementation.extendsFrom testImplementation
+
+    runtime.exclude module: 'slf4j-reload4j'
+    runtime.exclude module: 'reload4j'
 }
 
 dependencies {
-    testCompile 'com.puppycrawl.tools:checkstyle:8.2'
+    testImplementation 'com.puppycrawl.tools:checkstyle:8.2'
     checkstyleDep 'org.opencadc:cadc-quality:[1.0,)'
 }
 
@@ -17,22 +19,18 @@ checkstyle {
 }
 
 sourceSets {
-    test {
-        resources.srcDirs += 'src/test/resources'
-    }
     intTest {
         java {
             compileClasspath += main.output + test.output
-            runtimeClasspath += main.output + test.output
+            runtimeClasspath += compileClasspath
         }
-        resources.srcDir file('src/intTest/resources')
+        resources.srcDirs += file('src/intTest/resources')
         resources.srcDirs += new File(System.getenv('A') + '/test-certificates/')
     }
 }
 
 // Temporary work around for issue https://github.com/gradle/gradle/issues/881 - 
 // gradle not displaying fail build status when warnings reported -->
-
 tasks.withType(Checkstyle).each { checkstyleTask ->
     checkstyleTask.doLast {
         reports.all { report ->
@@ -76,3 +74,19 @@ intTest {
         // "STARTED",
     }
 }
+
+pluginManager.withPlugin('maven-publish') {
+  // configure maven-publish to support publishToMavenLocal
+    publishing {
+        publications {
+            thisLibrary(MavenPublication) {
+                from components.java
+            }
+        }
+    }
+}
+
+// backwards compat usage
+task install {
+    dependsOn 'publishToMavenLocal'
+}