Skip to content

Commit 51c5dd6

Browse files
author
root
committed
Merge branch '18-v1-2-18-update-java-libraries' into 'master'
Resolve "v1.2.18 update java libraries" Closes #18 See merge request livingfire__public/kanboard-api-java!20
2 parents a0f0679 + bc0951b commit 51c5dd6

6 files changed

Lines changed: 30 additions & 32 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
11
# CHANGELOG
22

3-
## 1.2.21
4-
* no API source code changes since 1.2.14
5-
* existing API source code runs fine with Dockerhub kanboard/kanboard:v1.2.21
6-
7-
## 1.2.20
8-
* no API source code changes since 1.2.14
9-
* existing API source code runs fine with Dockerhub kanboard/kanboard:v1.2.20
10-
11-
## 1.2.19
12-
* no API source code changes since 1.2.14
13-
* existing API source code runs fine with Dockerhub kanboard/kanboard:v1.2.19
14-
153
## 1.2.18
16-
* no API source code changes since 1.2.14
17-
* existing API source code runs fine with Dockerhub kanboard/kanboard:v1.2.18
4+
* no Java API source code changes since 1.2.14
5+
* existing Java API source code runs fine with Dockerhub kanboard/kanboard:v1.2.18
6+
* cleanup Java API test KanboardServiceSwimlaneIntegrationTest INTEGRATION_TEST_URL
7+
* bump [com.fasterxml.jackson.core/jackson-databind](https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind) version from 2.9.10.8 to 2.16.0
8+
* bump [com.fasterxml.jackson.dataformat/jackson-dataformat-yaml]() version from 2.9.10 to 2.16.0
9+
* bump [junit](https://mvnrepository.com/artifact/junit/junit) version from 4.12 to 4.13.1
1810

1911
## 1.2.15
20-
* no API source code changes since 1.2.14
21-
* existing API source code runs fine with Dockerhub kanboard/kanboard:v1.2.15
12+
* no Java API source code changes since 1.2.14
13+
* existing Java API source code runs fine with Dockerhub kanboard/kanboard:v1.2.15
2214
* bump [com.fasterxml.jackson.core/jackson-databind](https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind) version to 2.9.10.8
2315

2416
## 1.2.14
25-
* no API source code changes since ???
26-
* API runs fine with Dockerhub kanboard/kanboard:v1.2.14
17+
* no Java API source code changes since ???
18+
* Java API runs fine with Dockerhub kanboard/kanboard:v1.2.14
2719
* added colors to Maven console
2820
* bump [com.fasterxml.jackson.core/jackson-databind](https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind) version to 2.9.10.4
2921

3022
## 1.2.7
31-
* API tests run fine with Dockerhub kanboard/kanboard:v1.2.7
23+
* Java API tests run fine with Dockerhub kanboard/kanboard:v1.2.7
3224
* bump [com.fasterxml.jackson.core/jackson-databind](https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind) version to 2.9.7

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3'
33
services:
44

55
kanboard:
6-
image: kanboard/kanboard:v1.2.21
6+
image: kanboard/kanboard:v1.2.18
77
ports:
88
- "$NETWORK_KANBOARD_GATEWAY:$PORT_00080_KANBOARD"
99
volumes:

‎docker/containerBuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
DOCKER_PROJECT="kanboard"
3-
KANBOARD_VERSION="1.2.21"
3+
KANBOARD_VERSION="1.2.18"
44
DOCKER_CONTAINER_KANBOARD="${DOCKER_PROJECT}_test"
55
DOCKER_CONTAINER_MAVEN="${DOCKER_PROJECT}_maven"
66
DOCKER_IMAGE_KANBOARD="$DOCKER_CONTAINER_KANBOARD:$KANBOARD_VERSION"

‎docker/containerStart.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
DOCKER_PROJECT="kanboard"
3-
KANBOARD_VERSION="1.2.21"
3+
KANBOARD_VERSION="1.2.18"
44
DOCKER_CONTAINER_KANBOARD="${DOCKER_PROJECT}_test"
55
DOCKER_IMAGE_KANBOARD="$DOCKER_CONTAINER_KANBOARD:$KANBOARD_VERSION"
66

‎project/pom.xml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<groupId>de.livingfire</groupId>
68
<artifactId>kanboard-api-java</artifactId>
7-
<version>1.2.21</version>
9+
<version>1.2.18</version>
810
<packaging>jar</packaging>
911

1012
<name>kanboard-api-java</name>
@@ -22,14 +24,14 @@
2224
<dependency>
2325
<groupId>com.fasterxml.jackson.core</groupId>
2426
<artifactId>jackson-databind</artifactId>
25-
<version>2.9.10.8</version>
27+
<version>2.16.0</version>
2628
</dependency>
2729

2830
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml -->
2931
<dependency>
3032
<groupId>com.fasterxml.jackson.dataformat</groupId>
3133
<artifactId>jackson-dataformat-yaml</artifactId>
32-
<version>2.9.10</version>
34+
<version>2.16.0</version>
3335
</dependency>
3436

3537
<!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest-all -->
@@ -44,7 +46,7 @@
4446
<dependency>
4547
<groupId>junit</groupId>
4648
<artifactId>junit</artifactId>
47-
<version>4.12</version>
49+
<version>4.13.1</version>
4850
<scope>test</scope>
4951
</dependency>
5052

@@ -84,7 +86,8 @@
8486
<groupId>org.apache.maven.plugins</groupId>
8587
<artifactId>maven-surefire-plugin</artifactId>
8688
<configuration>
87-
<argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
89+
<argLine>
90+
-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
8891
<excludes>
8992
<exclude>**/Kanboard**IntegrationTest.java</exclude>
9093
</excludes>

‎project/src/test/java/de/livingfire/kanboard/service/KanboardServiceSwimlaneIntegrationTest.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@
1717
import org.junit.Test;
1818

1919
import de.livingfire.kanboard.configuration.KanboardApi;
20+
import de.livingfire.kanboard.constants.IntegrationTestConstant;
2021
import de.livingfire.kanboard.constants.KanboardConstant;
2122
import de.livingfire.kanboard.domain.KanboardProject;
2223
import de.livingfire.kanboard.domain.KanboardSwimlane;
2324

24-
public class KanboardServiceSwimlaneIntegrationTest implements KanboardConstant {
25+
public class KanboardServiceSwimlaneIntegrationTest implements KanboardConstant, IntegrationTestConstant {
2526

2627
private KanboardService service;
2728

2829
@Before
2930
public void setUp() throws UnknownHostException {
3031
KanboardApi kanboardApi = mock(KanboardApi.class);
3132
when(kanboardApi.getApiVersion()).thenReturn(REQUEST_JSONRPC_DEFAULT);
32-
when(kanboardApi.getApiUrl()).thenReturn("http://kanboard/jsonrpc.php");
33+
when(kanboardApi.getApiUrl()).thenReturn(INTEGRATION_TEST_URL);
3334
when(kanboardApi.getApiUser()).thenReturn("jsonrpc");
3435
when(kanboardApi.getApiAuthToken()).thenReturn("19ffd9709d03ce50675c3a43d1c49c1ac207f4bc45f06c5b2701fbdf8929");
3536
when(kanboardApi.getApiHeader()).thenReturn("X-API-Auth");
@@ -90,8 +91,10 @@ public void testSwimlaneApi() {
9091

9192
// test getByName fail
9293
KanboardSwimlane swimlaneByNameFail = this.service.swimlane()
93-
.getByName(projectCreated.getId(), UUID.randomUUID()
94-
.toString());
94+
.getByName(
95+
projectCreated.getId(),
96+
UUID.randomUUID()
97+
.toString());
9598

9699
assertThat(swimlaneByNameFail, is(nullValue()));
97100

0 commit comments

Comments
 (0)