Upgrading to 2.1.0

- Docker Configuration completed
- Adding maven wrapper
- Spring Boot 2.0.5.RELEASE
- UI enhancements and fixes

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,110 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL =
+            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: : " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip

Dockerfile

@@ -0,0 +1,29 @@
+# Start with a base image containing Java runtime
+FROM openjdk:8-jdk-alpine
+
+# Add bash to minimal alpine image
+RUN apk add --no-cache bash
+
+# Add Maintainer Info
+LABEL maintainer="[email protected]"
+
+# The application's jar file
+ARG JAR_FILE=target/enterprise-validator*.jar
+
+# Add a volume pointing to /tmp
+VOLUME /packages
+
+# Set Working Directory
+WORKDIR /packages
+
+# Run any commands like folder creations
+RUN mkdir config config/enterprise-validator apps apps/enterprise-validator
+
+# Add the application's jar to the container
+ADD ${JAR_FILE} apps/enterprise-validator/enterprise-validator.jar
+
+# Make port 8090 available to the world outside this container
+EXPOSE 8090
+
+# Run the jar file
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","apps/enterprise-validator/enterprise-validator.jar"]

Jenkinsfile

@@ -30,7 +30,7 @@ node {
     stage('Deploy'){
         def pom = readMavenPom file: "pom.xml"
         def buildType,artifactId=pom.artifactId,groupIdFormatted=(pom.groupId).replace(".", "/"), artifactVersion=pom.version
-        if(pom.version.contains(".RELEASE")){
+        if(!pom.version.contains("SNAPSHOT")){
             buildType = "libs-release"
         }else{
             buildType = "libs-snapshot"

README.md

@@ -18,7 +18,7 @@ This app also supports Decode from and to Base64 format.
 Here's the working version of the Application hosted in Microsoft Azure Cloud:<br />
 **http://varkeys-rhel-jenkins.westus.cloudapp.azure.com/enterprise-validator/editor**
 
-![Alt text](enterprise-validator-image.PNG?raw=true "Enterprise Validator Suite")
+![Alt text](README-images/enterprise-validator-image.PNG?raw=true "Enterprise Validator Suite")
 
 ### Recipe Ingredients
  * spring-boot-starter-web, spring-boot-starter-freemarker, spring-boot-starter-actuator
@@ -45,6 +45,17 @@ Please contact: [Anand Varkey Philips] ([email protected]) (Anand Var
 
 ### Change Log
 [comment]: # (REPLACE ME: Add the changelog in below format)
+
+ * Version 2.1.0
+
+> Released *[26/11/2018]* : 2.1.0
+>
+> Changes includes the following:
+>
+> 1. Docker Configuration completed 
+> 2. Adding maven wrapper
+> 3. Spring Boot 2.0.5.RELEASE
+> 4. UI enhancements and fixes
 
 * Version 2.0.6-RELEASE
 

shell-scripts/start-yaml-validator.sh → assembly/scripts/start-yaml-validator.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #Active Profile(YAML)
 ACTIVE_PROFILE="preprod"
 # JVM Parameters and Spring boot initialization parameters

shell-scripts/stop-yaml-validator.sh → assembly/scripts/stop-yaml-validator.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #Active Profile(YAML)
 ACTIVE_PROFILE="preprod"
 #Base Folder Path like "/folder/packages"