From f30eb5f334f017742991b390bfe8b41e16ec04c2 Mon Sep 17 00:00:00 2001
From: Paul Campbell <paul.campbell@cloudsoft.io>
Date: Thu, 30 Aug 2018 22:26:22 +0100
Subject: [PATCH 1/2] Use non-SNAPSHOT versions of mon and conditional

---
 pom.xml                                                  | 4 ++--
 src/main/java/net/kemitix/gitdb/impl/GitDBRepo.java      | 2 +-
 src/main/java/net/kemitix/gitdb/impl/LocalGitDBImpl.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e470c3..8733b95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,10 @@
         <jgit.version>5.0.2.201807311906-r</jgit.version>
         <junit.version>5.2.0</junit.version>
         <assertj.version>3.11.1</assertj.version>
-        <mon.version>DEV-SNAPSHOT</mon.version>
+        <mon.version>0.11.0</mon.version>
         <mockito.version>2.21.0</mockito.version>
         <java-semver.version>0.9.0</java-semver.version>
-        <conditional.version>DEV-SNAPSHOT</conditional.version>
+        <conditional.version>0.7.0</conditional.version>
         <digraph-dependency.basePackage>net.kemitix.gitdb</digraph-dependency.basePackage>
     </properties>
 
diff --git a/src/main/java/net/kemitix/gitdb/impl/GitDBRepo.java b/src/main/java/net/kemitix/gitdb/impl/GitDBRepo.java
index 36841d3..20e759e 100644
--- a/src/main/java/net/kemitix/gitdb/impl/GitDBRepo.java
+++ b/src/main/java/net/kemitix/gitdb/impl/GitDBRepo.java
@@ -85,7 +85,7 @@ class GitDBRepo {
     ) {
         final GitTreeReader treeFilter = new GitTreeReader(repository).treeFilter(key);
         return streamTree(branchRef, treeFilter).flatMap(s ->
-                Result.swap(s.findFirst()
+                Result.invert(s.findFirst()
                         .map(NamedRevBlob::blobAsString)
                         .map(Maybe::just)
                         .orElseGet(Maybe::nothing)));
diff --git a/src/main/java/net/kemitix/gitdb/impl/LocalGitDBImpl.java b/src/main/java/net/kemitix/gitdb/impl/LocalGitDBImpl.java
index fac9502..6ac5c17 100644
--- a/src/main/java/net/kemitix/gitdb/impl/LocalGitDBImpl.java
+++ b/src/main/java/net/kemitix/gitdb/impl/LocalGitDBImpl.java
@@ -114,7 +114,7 @@ final class LocalGitDBImpl implements GitDB, LocalGitDB {
     public Result<Maybe<GitDBBranch>> branch(final String name) {
         return Result.flatMapMaybe(
                 Result.of(() -> Maybe.maybe(repository.findRef(name))),
-                refMaybe -> Result.swap(refMaybe.map(branchInit)));
+                refMaybe -> Result.invert(refMaybe.map(branchInit)));
     }
 
 }

From 7d8a907803734fcf6ab5637d0efa7cad5baa2fee Mon Sep 17 00:00:00 2001
From: Paul Campbell <paul.campbell@cloudsoft.io>
Date: Thu, 30 Aug 2018 22:32:11 +0100
Subject: [PATCH 2/2] Update Jenkinsfile

---
 Jenkinsfile.groovy | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index bf12370..f9bfea5 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -1,6 +1,6 @@
 final String publicRepo = 'https://github.com/kemitix/'
 final String mvn = "mvn --batch-mode --update-snapshots --errors"
-final dependenciesSupportJDK = 9
+final dependenciesSupportJDK = 10
 
 pipeline {
     agent any
@@ -9,21 +9,27 @@ pipeline {
             steps {
                 withMaven(maven: 'maven', jdk: 'JDK 1.8') {
                     sh "${mvn} clean compile checkstyle:checkstyle pmd:pmd test"
-                    // Code Coverage to Codacy
-                    sh "${mvn} jacoco:report com.gavinmogan:codacy-maven-plugin:coverage " +
-                            "-DcoverageReportFile=target/site/jacoco/jacoco.xml " +
-                            "-DprojectToken=`$JENKINS_HOME/codacy/token` " +
-                            "-DapiToken=`$JENKINS_HOME/codacy/apitoken` " +
-                            "-Dcommit=`git rev-parse HEAD`"
-                    // Code Coverage to Jenkins
-                    jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class'
                     // PMD to Jenkins
                     pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: ''
+                }
+            }
+        }
+        stage('Report Coverage') {
+            steps {
+                withMaven(maven: 'maven', jdk: 'JDK 1.8') {
+                    // Code Coverage to Jenkins
+                    jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class'
+                }
+            }
+        }
+        stage('Report Checkstyle') {
+            steps {
+                withMaven(maven: 'maven', jdk: 'JDK 1.8') {
                     // Checkstyle to Jenkins
-                    step([$class   : 'hudson.plugins.checkstyle.CheckStylePublisher',
-                          pattern  : '**/target/checkstyle-result.xml',
-                          healthy  : '20',
-                          unHealthy: '100'])
+                    step([$class: 'hudson.plugins.checkstyle.CheckStylePublisher',
+                          pattern: '**/target/checkstyle-result.xml',
+                          healthy:'20',
+                          unHealthy:'100'])
                 }
             }
         }