From 651a285a1460011a54e2c7b9300d2d7a52551e62 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 6 Oct 2017 16:37:36 +0200
Subject: [PATCH] Moving to maven

---
 .gitignore  |  1 +
 Jenkinsfile | 42 +++++++++++------------
 Zutil.iml   | 18 ++++++++--
 pom.xml     | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 131 insertions(+), 25 deletions(-)
 create mode 100755 pom.xml

diff --git a/.gitignore b/.gitignore
index afddf1a..fd621eb 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 Zutil.jar
 /build/
 /bin/
+/target/
diff --git a/Jenkinsfile b/Jenkinsfile
index e3042bd..fa70dd6 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,43 +1,41 @@
+#!groovy​
 // Jenkinsfile (Pipeline Script)
 node {
     // Configure environment
-    env.JAVA_HOME = tool name: 'JDK8'
     env.REPO_URL = "repo.koc.se/zutil-java.git" //scm.getUserRemoteConfigs()[0].getUrl()
     env.BUILD_NAME = "BUILD-" + env.BUILD_ID
 
 
     checkout scm
 
-    stage('Build') {
-        sh 'ant clean'
-        sh 'ant build'
-    }
+    withMaven(JDK: "JDK8") {
 
-    stage('Test') {
-        try {
-            sh 'ant test'
-        } finally {
-            step([$class: 'JUnitResultArchiver', testResults: 'build/reports/*.xml'])
+        stage('Build') {
+            sh 'mvn clean compile'
         }
-    }
 
+        stage('Test') {
+            sh 'mvn surefire:test failsafe:integration-test'
+        }
 
-    stage('Package') {
-        sh 'ant package'
-        archiveArtifacts artifacts: 'build/release/*', fingerprint: true
+        stage('Package') {
+            sh 'mvn -DskipStatic -DskipTests install'
 
-        // Tag artifact
-        withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'f8e5f6c6-4adb-4ab2-bb5d-1c8535dff491',
-                                      usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
-            sh "git tag ${env.BUILD_NAME}"
-            sh "git push 'https://${USERNAME}:${PASSWORD}@${env.REPO_URL}' ${env.BUILD_NAME}"
+            // Tag artifact
+            withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'f8e5f6c6-4adb-4ab2-bb5d-1c8535dff491',
+                                          usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
+                sh "git tag ${env.BUILD_NAME}"
+                sh "git push 'https://${USERNAME}:${PASSWORD}@${env.REPO_URL}' ${env.BUILD_NAME}"
+            }
         }
     }
 }
 
 //stage('Deploy') {
-//    input message: 'Deploy?', submitter: 'ziver'
-//    node {
-//        sh 'ant deploy'
+//    timeout(time: 5, unit: 'HOURS') {
+//        input message: 'Deploy?', submitter: 'ziver'
+//        node {
+//            sh 'mvn deploy'
+//        }
 //    }
 //}
diff --git a/Zutil.iml b/Zutil.iml
index cbd59c3..a2bde11 100755
--- a/Zutil.iml
+++ b/Zutil.iml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -33,5 +35,15 @@
         <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" type="SOURCES" />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.36" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.8.11.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch:junit-benchmarks:0.7.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100755
index 0000000..85a497b
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,95 @@
+<?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/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>koc.se</groupId>
+    <artifactId>zutil</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <name>Zutil</name>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.36</version>
+        </dependency>
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>3.8.11.2</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.carrotsearch</groupId>
+            <artifactId>junit-benchmarks</artifactId>
+            <version>0.7.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>test</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>src</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>