Merge pull request #2 from cognitree/distribution

Upgrade version to 2.2.4. Remove shell handler as it will be part of main Kronos repo.
cognitree · Jun 13, 2019 · 237c2ca · 237c2ca
2 parents 084e371 + ca3f955
commit 237c2ca
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 165 deletions.
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.cognitree.kronos.extensions</groupId>
+        <artifactId>kronos-extensions</artifactId>
+        <version>2.2.4</version>
+    </parent>
+
+    <artifactId>distribution</artifactId>
+
+    <packaging>pom</packaging>
+
+    <!-- NOTE: These dependency declarations are only required to sort this project to the
+         end of the line in the multimodule build.
+
+         Since we only include the child1 module in our assembly, we only need to ensure this
+         distribution project builds AFTER that one...
+    -->
+    <dependencies>
+        <dependency>
+            <groupId>com.cognitree.kronos.extensions</groupId>
+            <artifactId>embedded-hsql-store</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.cognitree.kronos.extensions</groupId>
+            <artifactId>helm-handler</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.cognitree.kronos.extensions</groupId>
+            <artifactId>jdbc-store</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.cognitree.kronos.extensions</groupId>
+            <artifactId>kafka-message-handler</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.cognitree.kronos.extensions</groupId>
+            <artifactId>kafka-queue</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.cognitree.kronos.extensions</groupId>
+            <artifactId>mongo-store</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.cognitree.kronos.extensions</groupId>
+            <artifactId>spark-handler</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>distro-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assembly/bin.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/shell-handler/pom.xml → distribution/src/assembly/bin.xml b/shell-handler/pom.xml → distribution/src/assembly/bin.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one or more
   ~ contributor license agreements. See the NOTICE file distributed with
@@ -16,17 +15,20 @@
   ~ limitations under the License.
   -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>kronos-extensions</artifactId>
-        <groupId>com.cognitree.kronos.extensions</groupId>
-        <version>2.0.1</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>shell-handler</artifactId>
-
-</project>
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>dist</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <scope>runtime</scope>
+            <useTransitiveDependencies>true</useTransitiveDependencies>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+        </dependencySet>
+    </dependencySets>
+</assembly>
diff --git a/embedded-hsql-store/pom.xml b/embedded-hsql-store/pom.xml
@@ -22,12 +22,11 @@
     <parent>
         <artifactId>kronos-extensions</artifactId>
         <groupId>com.cognitree.kronos.extensions</groupId>
-        <version>2.0.1</version>
+        <version>2.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>embedded-hsql-store</artifactId>
-    <version>2.2.4-RC2</version>
 
     <properties>
         <hsqldb.version>2.4.1</hsqldb.version>

diff --git a/helm-handler/pom.xml b/helm-handler/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>kronos-extensions</artifactId>
         <groupId>com.cognitree.kronos.extensions</groupId>
-        <version>2.0.1</version>
+        <version>2.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/jdbc-store/pom.xml b/jdbc-store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>kronos-extensions</artifactId>
         <groupId>com.cognitree.kronos.extensions</groupId>
-        <version>2.0.1</version>
+        <version>2.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kafka-message-handler/pom.xml b/kafka-message-handler/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kronos-extensions</artifactId>
         <groupId>com.cognitree.kronos.extensions</groupId>
-        <version>2.0.1</version>
+        <version>2.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kafka-queue/pom.xml b/kafka-queue/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>kronos-extensions</artifactId>
         <groupId>com.cognitree.kronos.extensions</groupId>
-        <version>2.0.1</version>
+        <version>2.2.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/mongo-store/pom.xml b/mongo-store/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>kronos-extensions</artifactId>
         <groupId>com.cognitree.kronos.extensions</groupId>
-        <version>2.0.1</version>
+        <version>2.2.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
     <name>kronos-extensions</name>
     <artifactId>kronos-extensions</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.1</version>
+    <version>2.2.4</version>
 
     <properties>
         <kronos.version>2.2.4-RC2</kronos.version>
@@ -41,13 +41,13 @@
 
     <modules>
         <module>kafka-queue</module>
-        <module>shell-handler</module>
         <module>jdbc-store</module>
         <module>spark-handler</module>
         <module>embedded-hsql-store</module>
         <module>mongo-store</module>
         <module>helm-handler</module>
         <module>kafka-message-handler</module>
+        <module>distribution</module>
     </modules>
 
     <dependencies>

diff --git a/shell-handler/README.md b/shell-handler/README.md
diff --git a/shell-handler/src/main/java/com/cognitree/kronos/executor/handlers/ShellCommandHandler.java b/shell-handler/src/main/java/com/cognitree/kronos/executor/handlers/ShellCommandHandler.java
diff --git a/spark-handler/pom.xml b/spark-handler/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>kronos-extensions</artifactId>
         <groupId>com.cognitree.kronos.extensions</groupId>
-        <version>2.0.1</version>
+        <version>2.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>