Skip to content

Commit 0461d0a

Browse files
MonsieurBonMonsieurBon
authored
Merge pull request #35 from swisspost/develop
Release PR
2 parents c20cf52 + 0d58e32 commit 0461d0a

File tree

7 files changed

+34
-48
lines changed

7 files changed

+34
-48
lines changed

‎.github/workflows/build.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414

15-
- name: Set up JDK 1.8
16-
uses: joschi/setup-jdk@v2
15+
- name: Set up JDK 21
16+
uses: actions/setup-java@v4
1717
with:
18-
java-version: '8'
18+
java-version: '21'
19+
distribution: 'temurin'
20+
architecture: 'x64'
1921

2022
- name: Build with Maven
2123
run: mvn -B package --file pom.xml

‎.github/workflows/publish.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
- master
66

77
env:
8-
RELEASE_VERSION: "0.4.24"
9-
DEVELOP_VERSION: "0.4.25-SNAPSHOT"
8+
RELEASE_VERSION: "0.5.0"
9+
DEVELOP_VERSION: "0.5.1-SNAPSHOT"
1010
GIT_AUTHOR_NAME: "@swisspost-devs"
1111
GIT_AUTHOR_EMAIL: "[email protected]"
1212
GIT_COMMITTER_NAME: "swisspost-devs"
@@ -17,12 +17,14 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
2121

22-
- name: Set up JDK 1.8
23-
uses: joschi/setup-jdk@v2
22+
- name: Set up JDK 21
23+
uses: actions/setup-java@v4
2424
with:
25-
java-version: '8'
25+
java-version: '21'
26+
distribution: 'temurin'
27+
architecture: 'x64'
2628
server-id: sonatype-nexus-staging # Value of the distributionManagement/repository/id field of the pom.xml
2729
server-username: CI_DEPLOY_USERNAME # env variable for username in deploy
2830
server-password: CI_DEPLOY_PASSWORD # env variable for token in deploy
@@ -42,8 +44,8 @@ jobs:
4244

4345
- name: Merge back to develop
4446
run: |
45-
git fetch --depth 1 origin develop
47+
git fetch --depth 2 origin develop
4648
git checkout develop
47-
git fetch --shallow-since="$(git show -s --format=%ci develop)" origin master develop
49+
git fetch --shallow-since="$(git show -s --format=%ci develop~1)" origin master develop
4850
git merge master --no-edit
4951
git push origin develop

‎apikana-maven-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.swisspush.apikana</groupId>
77
<artifactId>apikana</artifactId>
8-
<version>0.4.25-SNAPSHOT</version>
8+
<version>0.5.0-SNAPSHOT</version>
99
</parent>
1010

1111
<groupId>org.swisspush.maven.plugins</groupId>

‎apikana-maven-plugin/src/main/java/org/swisspush/apikana/ApiServer.java

-8
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,9 @@
66
import org.eclipse.jetty.util.UrlEncoded;
77
import org.eclipse.jetty.util.resource.Resource;
88

9-
import javax.servlet.ServletException;
10-
import javax.servlet.http.HttpServletRequest;
11-
import javax.servlet.http.HttpServletResponse;
129
import java.awt.*;
1310
import java.io.*;
1411
import java.net.URI;
15-
import java.net.URL;
16-
import java.util.*;
17-
import java.util.List;
18-
import java.util.jar.JarEntry;
19-
import java.util.jar.JarFile;
2012

2113
public class ApiServer {
2214
private static final int PORT = 8334;

‎apikana-maven-plugin/src/main/java/org/swisspush/apikana/GenerateMojo.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.swisspush.apikana;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
43
import org.apache.maven.plugin.MojoExecutionException;
54
import org.apache.maven.plugins.annotations.*;
65
import org.codehaus.plexus.util.FileUtils;

‎apikana-parent/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.swisspush.apikana</groupId>
77
<artifactId>apikana</artifactId>
8-
<version>0.4.25-SNAPSHOT</version>
8+
<version>0.5.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>apikana-parent</artifactId>
@@ -54,17 +54,13 @@
5454
</build>
5555

5656
<dependencies>
57-
<dependency>
58-
<groupId>commons-lang</groupId>
59-
<artifactId>commons-lang</artifactId>
60-
</dependency>
6157
<dependency>
6258
<groupId>com.fasterxml.jackson.core</groupId>
6359
<artifactId>jackson-databind</artifactId>
6460
</dependency>
6561
<dependency>
66-
<groupId>javax.validation</groupId>
67-
<artifactId>validation-api</artifactId>
62+
<groupId>jakarta.validation</groupId>
63+
<artifactId>jakarta.validation-api</artifactId>
6864
</dependency>
6965
<dependency>
7066
<groupId>joda-time</groupId>

‎pom.xml

+14-19
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.swisspush.apikana</groupId>
66
<artifactId>apikana</artifactId>
7-
<version>0.4.25-SNAPSHOT</version>
7+
<version>0.5.0-SNAPSHOT</version>
88
<packaging>pom</packaging>
99

1010
<name>${project.artifactId}</name>
@@ -49,27 +49,22 @@
4949
<dependency>
5050
<groupId>ch.qos.logback</groupId>
5151
<artifactId>logback-classic</artifactId>
52-
<version>1.4.7</version>
52+
<version>1.5.12</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>com.fasterxml.jackson.core</groupId>
5656
<artifactId>jackson-databind</artifactId>
57-
<version>2.15.0</version>
57+
<version>2.18.2</version>
5858
</dependency>
5959
<dependency>
60-
<groupId>commons-lang</groupId>
61-
<artifactId>commons-lang</artifactId>
62-
<version>2.6</version>
63-
</dependency>
64-
<dependency>
65-
<groupId>javax.validation</groupId>
66-
<artifactId>validation-api</artifactId>
67-
<version>2.0.1.Final</version>
60+
<groupId>jakarta.validation</groupId>
61+
<artifactId>jakarta.validation-api</artifactId>
62+
<version>3.1.0</version>
6863
</dependency>
6964
<dependency>
7065
<groupId>joda-time</groupId>
7166
<artifactId>joda-time</artifactId>
72-
<version>2.12.5</version>
67+
<version>2.13.0</version>
7368
</dependency>
7469
<dependency>
7570
<groupId>junit</groupId>
@@ -79,32 +74,32 @@
7974
<dependency>
8075
<groupId>org.apache.maven</groupId>
8176
<artifactId>maven-artifact</artifactId>
82-
<version>3.3.9</version>
77+
<version>3.9.9</version>
8378
</dependency>
8479
<dependency>
8580
<groupId>org.apache.maven</groupId>
8681
<artifactId>maven-core</artifactId>
87-
<version>3.3.9</version>
82+
<version>3.9.9</version>
8883
</dependency>
8984
<dependency>
9085
<groupId>org.apache.maven</groupId>
9186
<artifactId>maven-model</artifactId>
92-
<version>3.3.9</version>
87+
<version>3.9.9</version>
9388
</dependency>
9489
<dependency>
9590
<groupId>org.apache.maven.plugin-tools</groupId>
9691
<artifactId>maven-plugin-annotations</artifactId>
97-
<version>3.5</version>
92+
<version>3.15.1</version>
9893
</dependency>
9994
<dependency>
10095
<groupId>org.apache.maven</groupId>
10196
<artifactId>maven-plugin-api</artifactId>
102-
<version>3.3.9</version>
97+
<version>3.9.9</version>
10398
</dependency>
10499
<dependency>
105100
<groupId>org.eclipse.jetty</groupId>
106101
<artifactId>jetty-server</artifactId>
107-
<version>9.3.15.v20161220</version>
102+
<version>9.4.53.v20231009</version>
108103
</dependency>
109104
<dependency>
110105
<groupId>org.twdata.maven</groupId>
@@ -114,7 +109,7 @@
114109
<dependency>
115110
<groupId>org.yaml</groupId>
116111
<artifactId>snakeyaml</artifactId>
117-
<version>2.0</version>
112+
<version>2.3</version>
118113
</dependency>
119114
</dependencies>
120115
</dependencyManagement>

0 commit comments

Comments
 (0)