Merge pull request #64 from cognitree/release-3.0.0

Release 3.0.1
cognitree · Nov 15, 2019 · 2cabf3d · 2cabf3d
2 parents eec1e60 + 21cad48
commit 2cabf3d
Show file tree

Hide file tree

Showing 15 changed files with 1,670 additions and 59 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8u151-jre-alpine
 
-ENV KRONOS_VERSION 3.0.0
+ENV KRONOS_VERSION 3.0.1
 ENV KRONOS_HOME /home/kronos-${KRONOS_VERSION}
 ENV MODE all
 

diff --git a/api/pom.xml b/api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>kronos</artifactId>
         <groupId>com.cognitree</groupId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/app/pom.xml b/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>kronos</artifactId>
         <groupId>com.cognitree</groupId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,6 +32,7 @@
     <properties>
         <jetty.version>9.4.18.v20190429</jetty.version>
         <commons-cli.version>1.4</commons-cli.version>
+        <maven-source-plugin>3.2.0</maven-source-plugin>
     </properties>
 
     <dependencies>
@@ -117,13 +118,26 @@
                             <goal>wget</goal>
                         </goals>
                         <configuration>
-                            <url>https://github.com/swagger-api/swagger-ui/archive/v2.1.1.tar.gz</url>
+                            <url>https://github.com/swagger-api/swagger-ui/archive/v3.24.2.tar.gz</url>
                             <unpack>true</unpack>
                             <outputDirectory>${project.build.directory}</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
             </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/app/src/main/assembly/assembly.xml b/app/src/main/assembly/assembly.xml
@@ -50,7 +50,7 @@
             <outputDirectory>webapp</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/swagger-ui-2.1.1/dist</directory>
+            <directory>${project.build.directory}/swagger-ui-3.24.2/dist</directory>
             <outputDirectory>webapp</outputDirectory>
             <excludes>
                 <exclude>index.html</exclude>

diff --git a/app/src/main/conf/log4j.properties b/app/src/main/conf/log4j.properties
diff --git a/app/src/main/conf/log4j2.properties b/app/src/main/conf/log4j2.properties
@@ -0,0 +1,16 @@
+name = Log4j2Config
+#The level of internal Log4j events that should be logged to the console
+status = error
+#The minimum amount of time, in seconds, that must elapse before the file configuration is checked for changes.
+#Any changes to the configuration file during runtime will come into effect.
+monitorInterval = 10
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p [%t] (%F:%L) - %m%n
+appender.console.immediateFlush=true
+
+rootLogger.level = INFO
+rootLogger.appenderRefs = stdout
+rootLogger.appenderRef.stdout.ref = STDOUT
diff --git a/app/src/main/webapp/swagger.json b/app/src/main/webapp/swagger.json
diff --git a/common/pom.xml b/common/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>kronos</artifactId>
         <groupId>com.cognitree</groupId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <groupId>com.cognitree.kronos</groupId>

diff --git a/executor/pom.xml b/executor/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>kronos</artifactId>
         <groupId>com.cognitree</groupId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/executor/src/main/java/com/cognitree/kronos/executor/TaskExecutionService.java b/executor/src/main/java/com/cognitree/kronos/executor/TaskExecutionService.java
@@ -184,8 +184,7 @@ private void submit(Task task) {
                     .getConstructor()
                     .newInstance();
             taskHandler.init(task, taskHandlerConfig.getConfig());
-        } catch (InstantiationException | InvocationTargetException | NoSuchMethodException
-                | IllegalAccessException | ClassNotFoundException e) {
+        } catch (Exception e) {
             logger.error("Error initializing handler for task {}", task, e);
             sendTaskStatusUpdate(task, FAILED, MISSING_TASK_HANDLER_MESSAGE);
             return;

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
     <name>kronos</name>
     <artifactId>kronos</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -36,6 +36,7 @@
         <slf4j.version>1.7.12</slf4j.version>
         <jackson.version>2.9.9</jackson.version>
         <junit.version>4.12</junit.version>
+        <log4j2.version>2.11.1</log4j2.version>
     </properties>
 
     <dependencies>
@@ -65,18 +66,18 @@
             <version>${slf4j.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j.version}</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j2.version}</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/scheduler/pom.xml b/scheduler/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>kronos</artifactId>
         <groupId>com.cognitree</groupId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/scheduler/src/test/java/com.cognitree.kronos/TestUtil.java b/scheduler/src/test/java/com.cognitree.kronos/TestUtil.java
@@ -123,7 +123,7 @@ public static WorkflowTrigger scheduleWorkflow(String workflowTemplate, Map<Stri
     }
 
     public static void waitForJobsToTriggerAndComplete(WorkflowTrigger workflowTrigger) throws Exception {
-        int maxCount = 120;
+        int maxCount = 180;
         while (maxCount > 0) {
             final List<Job> jobs = JobService.getService().get(workflowTrigger.getNamespace(), workflowTrigger.getWorkflow(),
                     workflowTrigger.getName(), 0, System.currentTimeMillis());

diff --git a/scheduler/src/test/resources/log4j.properties b/scheduler/src/test/resources/log4j.properties
diff --git a/scheduler/src/test/resources/log4j2.properties b/scheduler/src/test/resources/log4j2.properties
@@ -0,0 +1,13 @@
+name = Log4j2Config
+status = error
+monitorInterval = 10
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %5p [%t] (%F:%L) - %m%n
+appender.console.immediateFlush=true
+
+rootLogger.level = INFO
+rootLogger.appenderRefs = stdout
+rootLogger.appenderRef.stdout.ref = STDOUT