From 107dabe9e7207568671abcdfa711756b1bb0bca9 Mon Sep 17 00:00:00 2001
From: gserrano <gserrano@nearsoft.com>
Date: Thu, 15 Oct 2020 17:02:42 -0500
Subject: [PATCH] [component-kotlin] fixing & tweaking small things

---
 component-kotlin/pom.xml                      | 196 +-----------------
 .../META-INF/maven/archetype-metadata.xml     |   6 +
 .../resources/archetype-resources/.gitignore  |  19 ++
 .../kotlin/ComponentKotlinConfiguration.kt    |   2 +-
 4 files changed, 36 insertions(+), 187 deletions(-)
 create mode 100644 component-kotlin/src/main/resources/archetype-resources/.gitignore

diff --git a/component-kotlin/pom.xml b/component-kotlin/pom.xml
index e9a0d33..63b54c4 100644
--- a/component-kotlin/pom.xml
+++ b/component-kotlin/pom.xml
@@ -25,213 +25,37 @@
   <packaging>maven-archetype</packaging>
   <description>OpenTable Spring Component archetype for Kotlin</description>
 
-
-  <properties>
-    <project.build.targetJdk>11</project.build.targetJdk>
-    <dep.kotlin.version>1.4.10</dep.kotlin.version>
-    <kotlin.code.style>official</kotlin.code.style>
-    <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
-    <dep.junit-platform.version>1.6.2</dep.junit-platform.version>
-  </properties>
-
   <dependencies>
-    <!-- logging -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-
-    <!-- spring -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-    </dependency>
-
-    <!-- kotlin -->
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- junit 5 -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-stdlib-jdk8</artifactId>
-        <version>${dep.kotlin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-stdlib</artifactId>
-        <version>${dep.kotlin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-stdlib-common</artifactId>
-        <version>${dep.kotlin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains</groupId>
-        <artifactId>annotations</artifactId>
-        <version>13.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-test</artifactId>
-        <version>${dep.kotlin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-test-common</artifactId>
-        <version>${dep.kotlin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-test-annotations-common</artifactId>
-        <version>${dep.kotlin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-test-junit</artifactId>
-        <version>${dep.kotlin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-test-junit5</artifactId>
-        <version>${dep.kotlin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.platform</groupId>
-        <artifactId>junit-platform-engine</artifactId>
-        <version>${dep.junit-platform.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.platform</groupId>
-        <artifactId>junit-platform-commons</artifactId>
-        <version>${dep.junit-platform.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <build>
     <plugins>
       <plugin>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-maven-plugin</artifactId>
-        <version>${dep.kotlin.version}</version>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
         <configuration>
-          <compilerPlugins>
-            <plugin>spring</plugin>
-          </compilerPlugins>
+          <addDefaultExcludes>false</addDefaultExcludes>
         </configuration>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <sourceDirs>
-                <source>src/main/java</source>
-                <source>src/main/kotlin</source>
-              </sourceDirs>
-            </configuration>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-            <configuration>
-              <sourceDirs>
-                <source>src/test/java</source>
-                <source>src/test/kotlin</source>
-              </sourceDirs>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-maven-allopen</artifactId>
-            <version>${dep.kotlin.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${dep.plugin.compiler.version}</version>
-        <executions>
-          <execution>
-            <id>default-compile</id>
-            <phase>none</phase>
-          </execution>
-          <execution>
-            <id>default-testCompile</id>
-            <phase>none</phase>
-          </execution>
-          <execution>
-            <id>java-compile</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>java-testCompile</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/component-kotlin/src/main/resources/META-INF/maven/archetype-metadata.xml b/component-kotlin/src/main/resources/META-INF/maven/archetype-metadata.xml
index 6085a34..a915389 100644
--- a/component-kotlin/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/component-kotlin/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -49,5 +49,11 @@
         <include>**/*.kt</include>
       </includes>
     </fileSet>
+    <fileSet encoding="UTF-8">
+      <directory/>
+      <includes>
+        <include>.gitignore</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </archetype-descriptor>
diff --git a/component-kotlin/src/main/resources/archetype-resources/.gitignore b/component-kotlin/src/main/resources/archetype-resources/.gitignore
new file mode 100644
index 0000000..0da5ef8
--- /dev/null
+++ b/component-kotlin/src/main/resources/archetype-resources/.gitignore
@@ -0,0 +1,19 @@
+pkg/
+*.o
+*.lo
+*.pc
+*.log
+*.status
+.deps/
+*.iml
+*.ipr
+*.iws
+coverage/
+target/
+.rakeTasks
+.rvmrc
+.idea
+.classpath
+.project
+.settings
+/.checkstyle
diff --git a/component-kotlin/src/main/resources/archetype-resources/src/main/kotlin/ComponentKotlinConfiguration.kt b/component-kotlin/src/main/resources/archetype-resources/src/main/kotlin/ComponentKotlinConfiguration.kt
index 32d5650..a512040 100644
--- a/component-kotlin/src/main/resources/archetype-resources/src/main/kotlin/ComponentKotlinConfiguration.kt
+++ b/component-kotlin/src/main/resources/archetype-resources/src/main/kotlin/ComponentKotlinConfiguration.kt
@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
- * A Spring Configuration class for our ComponentJava.
+ * A Spring Configuration class for our ComponentKotlin.
  * Inject configuration values, set up your beans, etc.
  */
 @Configuration