diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2d62cd3158c9705c97c8d121a10d0eb64da3037c
--- /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 020cd8bba9462102e7386b3accd51a15fc11cebe..0000000000000000000000000000000000000000
--- 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: "patrikdufresne${NEXUS_USR}${NEXUS_PSW}"
- 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 67def6ada48d6d5c16955fdce97cb591a6c56ede..6645a246de26827b884188b50da6147d82cd677d 100644
--- a/cbc4j-linux-x86_64/pom.xml
+++ b/cbc4j-linux-x86_64/pom.xml
@@ -3,7 +3,7 @@
com.patrikdufresne.cbc4j
cbc4j-root
- 1.2-SNAPSHOT
+ ${revision}
cbc4j-linux-x86_64
diff --git a/cbc4j-win-i686/pom.xml b/cbc4j-win-i686/pom.xml
index 6ddb2627d6f30dc9f0881531dceaa19fad7ef9da..530600ea72acaa371ea0c0d425275bace4a1c242 100644
--- a/cbc4j-win-i686/pom.xml
+++ b/cbc4j-win-i686/pom.xml
@@ -3,7 +3,7 @@
com.patrikdufresne.cbc4j
cbc4j-root
- 1.2-SNAPSHOT
+ ${revision}
cbc4j-win-i686
diff --git a/cbc4j-win-x86_64/pom.xml b/cbc4j-win-x86_64/pom.xml
index b12b218f0bbe2682b4f4c534953e963bc074b6fa..45a1e425557c6d037ab73ae2979bad69a40cdcc9 100644
--- a/cbc4j-win-x86_64/pom.xml
+++ b/cbc4j-win-x86_64/pom.xml
@@ -3,7 +3,7 @@
com.patrikdufresne.cbc4j
cbc4j-root
- 1.2-SNAPSHOT
+ ${revision}
cbc4j-win-x86_64
diff --git a/pom.xml b/pom.xml
index 22efeab302406d68276e3fc1a1764f85e9aed03a..406d55088ad0ae40db079668fbf899bd26f1a300 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
com.patrikdufresne.cbc4j
cbc4j-root
- 1.2-SNAPSHOT
+ ${revision}
pom
cbc4j-root
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bc1da1156e9e5678f9459d83361733367d63c25a
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,10 @@
+
+
+
+ patrikdufresne
+ ${env.NEXUS_USR}
+ ${env.NEXUS_PWD}
+
+
+
\ No newline at end of file