From 8a6f2a723a7b41149309e2e1f306386ff35374cc Mon Sep 17 00:00:00 2001
From: Patrik Dufresne <info@patrikdufresne.com>
Date: Thu, 24 Jan 2019 08:02:36 -0500
Subject: [PATCH] Fix gitlab CICD

---
 .gitlab-ci.yml             | 32 +++++++++++++++++++++
 Jenkinsfile                | 58 --------------------------------------
 cbc4j-linux-x86_64/pom.xml |  2 +-
 cbc4j-win-i686/pom.xml     |  2 +-
 cbc4j-win-x86_64/pom.xml   |  2 +-
 pom.xml                    |  6 ++--
 settings.xml               | 10 +++++++
 7 files changed, 48 insertions(+), 64 deletions(-)
 create mode 100644 .gitlab-ci.yml
 delete mode 100644 Jenkinsfile
 create mode 100644 settings.xml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..2d62cd3
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,32 @@
+image: maven:3-jdk-8
+
+variables:
+  MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN
+               -Dorg.slf4j.simpleLogger.showDateTime=true
+               -Djava.awt.headless=true
+               -Dmaven.repo.local=.m2/repository"
+
+# Cache downloaded dependencies and plugins between builds.
+cache:
+  paths:
+    - .m2/repository
+
+stages:
+  - build
+
+before_script:
+- export REVISION="$(curl http://git.patrikdufresne.com/pdsl/maven-scm-version/raw/master/version.sh | bash -)"
+- echo "REVISION=$REVISION"
+
+test_deploy:
+  stage: build
+  script:
+  - apt-get update && apt-get install -y default-jdk swig build-essential gcc-mingw-w64 mingw-w64 g++-multilib
+  - mvn -B -s ./settings.xml -Drevision=${REVISION} clean install deploy
+
+sonar:
+  stage: build
+  allow_failure: true
+  script:
+  - apt-get update && apt-get install -y default-jdk swig build-essential gcc-mingw-w64 mingw-w64 g++-multilib
+  - mvn -B -Drevision=${REVISION} -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_TOKEN clean verify sonar:sonar
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 020cd8b..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,58 +0,0 @@
-pipeline {
-    environment {
-        NEXUS = credentials("local-nexus")
-        GITLAB = credentials("gitlab-jenkins")
-        GITHUB = credentials("github")
-    }
-    parameters {
-        booleanParam(defaultValue: false, description: 'Generate a release build with a tagged version.', name: 'Release')
-    }
-    agent {
-        docker {
-            image 'jamesdbloom/docker-java7-maven'
-            args '-v $HOME/.m2:/root/.m2'
-        }
-    }
-    stages {
-        stage ('Setup') {
-            steps {
-                sh 'apt-get update && apt-get -qq install maven swig build-essential gcc-mingw-w64 mingw-w64 g++-multilib'
-            }
-        }
-        stage ('Build') {
-            steps {
-                writeFile file: "settings.xml", text: "<settings><servers><server><id>patrikdufresne</id><username>${NEXUS_USR}</username><password>${NEXUS_PSW}</password></server></servers></settings>"
-                sh 'mvn --settings settings.xml -U -Dmaven.test.failure.ignore=true clean deploy'
-            }
-        }
-        stage ('Release') {
-            when {
-                environment name: 'Release', value: 'true'
-            }
-            steps {
-                script {
-                    // We want to pick up the version from the pom
-                    pom = readMavenPom file: 'pom.xml'
-                    version = pom.version.replace("-SNAPSHOT", "-${BUILD_NUMBER}")
-                }
-                sh 'git checkout .'
-                sh "mvn versions:set -DnewVersion=${version}"
-                sh "mvn --settings settings.xml -U -Dmaven.test.skip=true deploy"
-                sh """
-                	git config --local user.email "jenkins@patrikdufresne.com"
-                	git config --local user.name "Jenkins"
-                	git tag 'v${version}'
-					export REPO=`git config remote.origin.url`
-                    git push http://${GITLAB}@\044{REPO#*//} --tags
-                """
-                addInfoBadge "v${version}"
-            }
-        }
-        stage('GitHubPush') {
-            steps { 
-                sh "git push --force https://${GITHUB}@github.com/ikus060/cbc4j.git refs/remotes/origin/${BRANCH_NAME}:refs/heads/${BRANCH_NAME}"
-                sh "git push https://${GITHUB}@github.com/ikus060/cbc4j.git --tags"
-            }
-        }
-    }
-}
diff --git a/cbc4j-linux-x86_64/pom.xml b/cbc4j-linux-x86_64/pom.xml
index 67def6a..6645a24 100644
--- a/cbc4j-linux-x86_64/pom.xml
+++ b/cbc4j-linux-x86_64/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.patrikdufresne.cbc4j</groupId>
 		<artifactId>cbc4j-root</artifactId>
-		<version>1.2-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 	<artifactId>cbc4j-linux-x86_64</artifactId>
 	<properties>
diff --git a/cbc4j-win-i686/pom.xml b/cbc4j-win-i686/pom.xml
index 6ddb262..530600e 100644
--- a/cbc4j-win-i686/pom.xml
+++ b/cbc4j-win-i686/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.patrikdufresne.cbc4j</groupId>
 		<artifactId>cbc4j-root</artifactId>
-		<version>1.2-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 	<artifactId>cbc4j-win-i686</artifactId>
 	<properties>
diff --git a/cbc4j-win-x86_64/pom.xml b/cbc4j-win-x86_64/pom.xml
index b12b218..45a1e42 100644
--- a/cbc4j-win-x86_64/pom.xml
+++ b/cbc4j-win-x86_64/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.patrikdufresne.cbc4j</groupId>
 		<artifactId>cbc4j-root</artifactId>
-		<version>1.2-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 	<artifactId>cbc4j-win-x86_64</artifactId>
 	<properties>
diff --git a/pom.xml b/pom.xml
index 22efeab..406d550 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.patrikdufresne.cbc4j</groupId>
     <artifactId>cbc4j-root</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
     <name>cbc4j-root</name>
     <!-- Define the SCM used for developpement. This information is used by 
@@ -48,8 +48,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <!-- generate source package for all sub-project -->
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 0000000..bc1da11
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,10 @@
+<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
+    xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <servers>
+    <server>
+      <id>patrikdufresne</id>
+      <username>${env.NEXUS_USR}</username>
+      <password>${env.NEXUS_PWD}</password>
+    </server>
+  </servers>
+</settings>
\ No newline at end of file
-- 
GitLab