Merge pull request #5 from cognitree/release-3.0.0

Release 3.0.0
cognitree · Nov 19, 2019 · 28861fe · 28861fe
2 parents b8ff29a + 89defc3
commit 28861fe
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 11 deletions.
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.cognitree.kronos.extensions</groupId>
         <artifactId>kronos-extensions</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>distribution</artifactId>

diff --git a/embedded-hsql-store/pom.xml b/embedded-hsql-store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>kronos-extensions</artifactId>
         <groupId>com.cognitree.kronos.extensions</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/helm-handler/src/main/java/com/cognitree/kronos/executor/handlers/HelmTaskHandler.java b/helm-handler/src/main/java/com/cognitree/kronos/executor/handlers/HelmTaskHandler.java
@@ -111,7 +111,12 @@ public TaskResult execute() {
         if (isRetry(task)) {
             releaseName = (String) task.getContext().get(PROP_RELEASE_NAME);
         } else if (taskProperties.containsKey(PROP_RELEASE_NAME)) {
-            releaseName = getProperty(taskProperties, PROP_RELEASE_NAME);
+            if (taskProperties.containsKey(PROP_RELEASE_PREFIX)) {
+                releaseName = getProperty(taskProperties, PROP_RELEASE_PREFIX)
+                        + "-" + getProperty(taskProperties, PROP_RELEASE_NAME);
+            } else {
+                releaseName = getProperty(taskProperties, PROP_RELEASE_NAME);
+            }
         } else {
             releaseName = taskProperties.getOrDefault(PROP_RELEASE_PREFIX, DEFAULT_RELEASE_PREFIX)
                     + "-" + System.currentTimeMillis();

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>3.0.1</version>
+        <version>3.0.2</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>3.0.1</version>
+        <version>3.0.2</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>3.0.1</version>
+        <version>3.0.2</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>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -26,17 +26,18 @@
     <name>kronos-extensions</name>
     <artifactId>kronos-extensions</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
 
     <properties>
-        <kronos.version>3.0.0</kronos.version>
+        <kronos.version>3.0.2</kronos.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <encoding>UTF-8</encoding>
 
         <slf4j.version>1.7.12</slf4j.version>
         <jackson.version>2.9.9</jackson.version>
         <junit.version>4.12</junit.version>
+        <maven-source-plugin>3.2.0</maven-source-plugin>
     </properties>
 
     <modules>
@@ -76,6 +77,19 @@
                     <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${maven-source-plugin}</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

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>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>