Merge branch 'master' into replacedDeprecatedAPIuSage

baloise · Jun 17, 2021 · 9b03659 · 9b03659
2 parents 1032277 + 0f2ce3b
commit 9b03659
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,20 @@
+name: CI
+
+on:
+  push:
+    branches: [ master, release ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Java
+      uses: actions/setup-java@v1
+      with:
+        java-version: '11'
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -13,3 +13,4 @@ Install via [marketplace.atlassian.com](https://marketplace.atlassian.com/plugin
 1. When using Eclipse generate project setup e.g. via `mvn org.apache.maven.plugins:maven-eclipse-plugin:2.8:eclipse -DdownloadSources=true`
 1. Check local compilability via `mvn clean verify`
 1. Launch IDE and start coding
+1. For IDE testing and runtime installation make sure to also install the [Atlassian SDK](https://developer.atlassian.com/server/framework/atlassian-sdk/set-up-the-atlassian-plugin-sdk-and-build-a-project/)
diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
@@ -0,0 +1,2 @@
+# see: https://help.github.com/articles/about-codeowners/
+* @greg-junkietech
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.baloise.confluence</groupId>
 	<artifactId>dashboard-plus</artifactId>
-	<version>1.2.16</version>
+	<version>1.2.18</version>
 
 	<organization>
 		<name>Basler Versicherungen</name>
@@ -18,18 +18,23 @@
 	<packaging>atlassian-plugin</packaging>
 
 	<properties>
-		<confluence.version>6.2.3</confluence.version>
-		<confluence.data.version>6.2.3</confluence.data.version>
-		<amps.version>6.2.8</amps.version>
+        <confluence.version>6.13.0</confluence.version>
+        <confluence.data.version>6.13.0</confluence.data.version>
+        <amps.version>6.3.21</amps.version>
 		<plugin.testrunner.version>2.0.0</plugin.testrunner.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+
+		<junit.jupiter.version>5.1.0</junit.jupiter.version>
+		<junit.platform.version>1.1.0</junit.platform.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.10</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>${junit.jupiter.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -41,7 +46,7 @@
 		<dependency>
 			<groupId>org.codehaus.sonar</groupId>
 			<artifactId>sonar-ws-client</artifactId>
-			<version>2.11</version>
+			<version>5.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -59,9 +64,6 @@
 		<dependency>
 			<groupId>com.offbytwo.jenkins</groupId>
 			<artifactId>jenkins-client</artifactId>
-			<!-- 
-			<version>0.3.7</version>
-			 -->
 			<version>0.3.0</version>
 			<scope>compile</scope>
 			<exclusions>
@@ -91,6 +93,15 @@
 			<version>2.2.2-atlassian-1</version>
 		</dependency>
 	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+		       <groupId>org.apache.httpcomponents</groupId>
+		       <artifactId>httpclient</artifactId>
+		       <version>4.5.5</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
 	<build>
 		<plugins>
@@ -102,18 +113,50 @@
 				<configuration>
 					<productVersion>${confluence.version}</productVersion>
 					<productDataVersion>${confluence.data.version}</productDataVersion>
-					<!-- <instructions> <Import-Package> org.sonar.wsclient.*;version="2.11" 
-						</Import-Package> </instructions> -->
 				</configuration>
 			</plugin>
 			<plugin>
         		<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.7.0</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<useIncrementalCompilation>false</useIncrementalCompilation>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.19.1</version>
+				<configuration>
+					<includes>
+						<include>**/Test*.java</include>
+						<include>**/*Test.java</include>
+						<include>**/*Tests.java</include>
+						<include>**/*TestCase.java</include>
+					</includes>
 				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.junit.platform</groupId>
+						<artifactId>junit-platform-surefire-provider</artifactId>
+						<version>${junit.platform.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<groupId>com.atlassian.maven.plugins</groupId>
+				<artifactId>maven-confluence-plugin</artifactId>
+				<version>6.2.8</version>
+				<executions>
+					<execution>
+						<phase>copy-bundled-dependencies</phase>
+						<goals>
+							<goal>copy-bundled-dependencies</goal>
+						</goals>
+						<configuration>
+							<extractDependencies>false</extractDependencies>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 		<!-- <pluginManagement>

diff --git a/src/test/java/com/baloise/confluence/dashboardplus/DefaultTest.java b/src/test/java/com/baloise/confluence/dashboardplus/DefaultTest.java
@@ -0,0 +1,20 @@
+package com.baloise.confluence.dashboardplus;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.Test;
+
+public class DefaultTest {
+
+	@Test
+	public void testGetStringWithExistingKey() {
+		String key = "StaticStatusLightMacro.label";
+		assertTrue(!Default.getString(key).contains(key));
+	}
+
+	@Test
+	public void testGetStringWithMissingKey() {
+		String key = "MissingKey";
+		assertTrue(Default.getString(key).contains(key));
+	}
+}