Merge pull request #3 from hauner/extract

Extracted reusable core, removed spring code

Author: hauner

openapi-processor-core/build.gradle

@@ -4,8 +4,8 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'com.jfrog.bintray' version '1.8.5'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
     id 'org.jetbrains.dokka' version '0.10.1'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
     id 'org.unbroken-dome.test-sets' version '3.0.1'
     id "com.github.ben-manes.versions" version "0.28.0"
 }
@@ -20,7 +20,8 @@ java {
 
 
 ext {
-    processorApiVersion = '1.0.0.M4'
+    processorApiVersion = '1.0.0'
+    jacksonVersion = '2.11.0'
 
     bintrayUser = project.hasProperty ('BINTRAY_USER') ? BINTRAY_USER : 'n/a'
     bintrayKey =  project.hasProperty ('BINTRAY_KEY')  ? BINTRAY_KEY  : 'n/a'
@@ -34,7 +35,7 @@ repositories {
         url "https://oss.sonatype.org/content/repositories/snapshots"
     }
     maven {
-        url  "https://dl.bintray.com/hauner/openapi-processor"
+        url "https://dl.bintray.com/hauner/openapi-processor"
     }
 }
 
@@ -64,33 +65,59 @@ compileKotlin {
 }
 
 dependencies {
-    implementation 'org.codehaus.groovy:groovy:2.5.10'
-    implementation 'org.codehaus.groovy:groovy-nio:2.5.10'
+    components.all(JacksonPlatformRule)
+    components.all(KotlinPlatformRule)
+
+    implementation 'org.codehaus.groovy:groovy:2.5.12'
+    implementation 'org.codehaus.groovy:groovy-nio:2.5.12'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.10.2'
+    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion"
+
+    compileOnly "com.github.hauner.openapi:openapi-processor-api:$processorApiVersion"
 
-    implementation ('io.swagger.parser.v3:swagger-parser:2.0.19') {
+    implementation 'org.openapi4j:openapi-parser:0.9'
+    implementation ('io.swagger.parser.v3:swagger-parser:2.0.20') {
         exclude group: 'io.swagger.parser.v3', module: 'swagger-parser-v2-converter'
         exclude group: 'io.swagger.core.v3', module: 'swagger-annotations'
     }
-    implementation 'org.openapi4j:openapi-parser:0.9'
-    implementation 'com.google.googlejavaformat:google-java-format:1.7'
-    compileOnly "com.github.hauner.openapi:openapi-processor-api:$processorApiVersion"
 
-    testImplementation 'com.google.jimfs:jimfs:1.1'
+     implementation ('com.google.googlejavaformat:google-java-format:1.8') {
+        exclude group: 'com.google.guava'
+    }
+
+    implementation ('com.google.guava:guava:28.1-jre') {
+        exclude group: 'com.google.guava'
+        exclude group: 'com.google.j2objc'
+        exclude group: 'com.google.code.findbugs'
+        exclude group: 'com.google.errorprone'
+        exclude group: 'org.checkerframework'
+        exclude group: 'org.codehaus.mojo'
+    }
+
+    testImplementation "com.github.hauner.openapi:openapi-processor-api:$processorApiVersion"
+    testImplementation ('com.github.hauner.openapi:openapi-processor-test:1.0.0.M1') {
+        exclude group: 'com.google.guava'
+    }
+
+    testImplementation("com.google.jimfs:jimfs:1.1") {
+         exclude group: 'com.google.guava'
+     }
+
+    testImplementation ("org.junit.jupiter:junit-jupiter-api:5.6.2")
+    testCompileOnly  ("junit:junit:4.13")
+    testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.6.2")
+    testRuntimeOnly ("org.junit.vintage:junit-vintage-engine:5.6.2")
+
     testImplementation ('org.spockframework:spock-core:2.0-M2-groovy-2.5') {
         exclude group: 'org.codehaus.groovy'
+        exclude group: 'junit'
     }
     testImplementation ('org.spockframework:spock-junit4:2.0-M2-groovy-2.5') {
         exclude group: 'org.codehaus.groovy'
+        exclude group: 'junit'
     }
-    testImplementation 'net.bytebuddy:byte-buddy:1.10.9'
+    testImplementation 'net.bytebuddy:byte-buddy:1.10.11'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
-
-    testIntImplementation "com.github.hauner.openapi:openapi-processor-api:$processorApiVersion"
-    testIntImplementation 'io.github.java-diff-utils:java-diff-utils:4.5'
-//    testIntRuntimeOnly 'org.slf4j:slf4j-simple:1.7.30'
-//    testIntRuntimeOnly 'org.slf4j:slf4j-nop:1.6.1'
 }
 
 tasks.withType(Test) {
@@ -140,7 +167,7 @@ bintray {
     pkg {
         repo = 'openapi-processor'
         name = 'openapi-processor-core'
-        //userOrg = 'openapi-generatr'
+        //userOrg = 'openapi-processor'
         licenses = ['Apache-2.0']
         vcsUrl = 'https://github.com/hauner/openapi-processor-core'
 

openapi-processor-core/buildSrc/src/main/groovy/JacksonPlatformRule.groovy

@@ -0,0 +1,12 @@
+import org.gradle.api.artifacts.ComponentMetadataRule
+import org.gradle.api.artifacts.ComponentMetadataContext
+
+class JacksonPlatformRule implements ComponentMetadataRule {
+    void execute (ComponentMetadataContext ctx) {
+        ctx.details.with {
+            if (id.group.startsWith ("com.fasterxml.jackson")) {
+                belongsTo ("com.fasterxml.jackson:jackson-bom:${id.version}", false)
+            }
+        }
+    }
+}

openapi-processor-core/buildSrc/src/main/groovy/KotlinPlatformRule.groovy

@@ -0,0 +1,12 @@
+import org.gradle.api.artifacts.ComponentMetadataContext
+import org.gradle.api.artifacts.ComponentMetadataRule
+
+class KotlinPlatformRule implements ComponentMetadataRule {
+    void execute (ComponentMetadataContext ctx) {
+        ctx.details.with {
+            if (id.group.startsWith ("org.jetbrains.kotlin")) {
+                belongsTo ("org.jetbrains.kotlin:kotlin-platform:${id.version}")
+            }
+        }
+    }
+}