From 3ca9661833aaf08398375858e5767ba6254b5dc0 Mon Sep 17 00:00:00 2001
From: Frode Carlsen <frode.carlsen@soprasteria.com>
Date: Thu, 5 Nov 2020 07:09:32 +0100
Subject: [PATCH] feat: set up sonarcloud (#10)

* chore: set up sonarcloud
* chore: copied tests for issue #7 to jodatime version
* chore: moved to maven ci-friendly versions
---
 .github/workflows/maven.yml | 28 ++++++++++++++++++++--------
 java8/pom.xml               |  2 +-
 jodatime/pom.xml            |  2 +-
 pom.xml                     | 14 +++++++++-----
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 40dff28..2677a3b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,6 +1,11 @@
 name: Java CI
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened]
 
 jobs:
   build:
@@ -8,10 +13,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@master
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        version: 11
-    - name: Build with Maven
-      run: mvn package --file pom.xml
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+  
+      - name: Build with Maven
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: mvn verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar --file pom.xml -DtrimStackTrace=false -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=fco -Dsonar.projectKey=frode-carlsen_cron
+        
diff --git a/java8/pom.xml b/java8/pom.xml
index c92eaf8..2714b5f 100644
--- a/java8/pom.xml
+++ b/java8/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>fc.cron</groupId>
     <artifactId>cron</artifactId>
-    <version>1.5</version>
+    <version>${revision}${sha1}${changelist}</version>
   </parent>
   <artifactId>cron-java8</artifactId>
   <packaging>jar</packaging>
diff --git a/jodatime/pom.xml b/jodatime/pom.xml
index 2756654..cc2da03 100644
--- a/jodatime/pom.xml
+++ b/jodatime/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>fc.cron</groupId>
     <artifactId>cron</artifactId>
-    <version>1.5</version>
+    <version>${revision}${sha1}${changelist}</version>
   </parent>
 
   <artifactId>cron-jodatime</artifactId>
diff --git a/pom.xml b/pom.xml
index 5d18120..81784fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,10 +5,18 @@
 	<groupId>fc.cron</groupId>
 	<artifactId>cron</artifactId>
 	<packaging>pom</packaging>
-	<version>1.6-SNAPSHOT</version>
+	<version>${revision}${sha1}${changelist}</version>
 	<name>cron</name>
 	<url>https://github.com/frode-carlsen/cron</url>
 	
+	<properties>
+		<revision>1.6</revision>
+		<sha1 />
+		<changelist>-SNAPSHOT</changelist>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+	</properties>
+	
 	<licenses>
 		<license>
 			<name>Apache License Version 2.0</name>
@@ -78,8 +86,4 @@
 		</profile>
 	</profiles>
 	
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-	</properties>
 </project>