Skip to content

Commit f6afe14

Browse files
author
Michiel Meeuwissen
committed
Upping versions.
1 parent 574dea2 commit f6afe14

4 files changed

Lines changed: 34 additions & 50 deletions

File tree

‎.github/workflows/maven.yml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,30 @@ jobs:
1010

1111
runs-on: ubuntu-latest
1212
env:
13-
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
13+
MAVEN_ARGS: '--no-transfer-progress'
1414
steps:
1515
- uses: actions/checkout@v3
16-
- uses: actions/setup-java@v3
16+
- uses: actions/setup-java@v4
1717
with:
1818
distribution: 'temurin'
1919
java-version: 11
20-
server-id: vpro-ossrh
21-
server-username: SONATYPE_USERNAME
22-
server-password: SONATYPE_PASSWORD
20+
server-id: central
21+
server-username: CENTRAL_USERNAME
22+
server-password: CENTRAL_PASSWORD
2323
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
24-
gpg-passphrase: GPG_SECRET_KEY_PASSPHRASE
2524
cache: maven
2625
- name: Build with Maven
2726
run: mvn -B -Pdeploy,ossrh -U deploy
2827
env:
29-
SONATYPE_USERNAME: vpro
30-
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
31-
GPG_SECRET_KEY_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
28+
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
29+
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
30+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
3231
#continue-on-error: true
3332
- name: Publish to codecov
34-
uses: codecov/codecov-action@v3
33+
uses: codecov/codecov-action@v4
3534
continue-on-error: true
3635
if: github.ref == 'refs/heads/main'
3736
- name: Publish Unit Test Results
38-
uses: EnricoMi/publish-unit-test-result-action@v2.3.0
37+
uses: EnricoMi/publish-unit-test-result-action@v2
3938
if: ${{ success() || failure()}}
4039

‎pom.xml‎

Lines changed: 24 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<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">
1+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
22
<modelVersion>4.0.0</modelVersion>
33

44
<groupId>nl.vpro.amara</groupId>
@@ -53,14 +53,14 @@
5353

5454
<properties>
5555
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
56-
<jackson2.version>2.14.2</jackson2.version>
56+
<jackson2.version>2.19.1</jackson2.version>
5757
<spring.version>6.0.0</spring.version>
5858
<!-- TODO, drop spring dependency, I don't see the point. This is a straight forward rest-client,
5959
why would we tolerate a spring dependency
6060
-->
61-
<vpro.shared.version>3.1.0</vpro.shared.version>
62-
<slf4j.version>1.7.30</slf4j.version>
63-
<lombok.version>1.18.26</lombok.version>
61+
<vpro.shared.version>5.10.0</vpro.shared.version>
62+
<slf4j.version>2.0.17</slf4j.version>
63+
<lombok.version>1.18.38</lombok.version>
6464
<assertj.version>3.24.2</assertj.version>
6565
<junit.version>5.9.2</junit.version>
6666
</properties>
@@ -137,7 +137,7 @@
137137
</dependency>
138138
<dependency>
139139
<groupId>org.slf4j</groupId>
140-
<artifactId>slf4j-log4j12</artifactId>
140+
<artifactId>slf4j-reload4j</artifactId>
141141
<version>${slf4j.version}</version>
142142
<scope>test</scope>
143143
</dependency>
@@ -155,11 +155,11 @@
155155
<plugins>
156156
<plugin>
157157
<artifactId>maven-deploy-plugin</artifactId>
158-
<version>3.0.0</version>
158+
<version>3.1.4</version>
159159
</plugin>
160160
<plugin>
161161
<artifactId>maven-compiler-plugin</artifactId>
162-
<version>3.10.1</version>
162+
<version>3.14.0</version>
163163
<configuration>
164164
<source>11</source>
165165
<target>11</target>
@@ -178,15 +178,15 @@
178178
</plugin>
179179
<plugin>
180180
<artifactId>maven-release-plugin</artifactId>
181-
<version>3.0.0.M7</version>
181+
<version>3.1.1</version>
182182
<configuration>
183183
<branchName>${project.version}</branchName>
184184
<tagNameFormat>@{project.version}</tagNameFormat>
185185
</configuration>
186186
</plugin>
187187
<plugin>
188188
<artifactId>maven-javadoc-plugin</artifactId>
189-
<version>3.4.1</version>
189+
<version>3.11.2</version>
190190
<configuration>
191191
<failOnError>false</failOnError>
192192
<doclint>none</doclint>
@@ -195,7 +195,7 @@
195195
</plugin>
196196
<plugin>
197197
<artifactId>maven-surefire-plugin</artifactId>
198-
<version>3.0.0-M7</version>
198+
<version>3.5.3</version>
199199
<configuration>
200200
<includes>
201201
<include>**/*Test.java</include>
@@ -206,6 +206,15 @@
206206
</excludes>
207207
</configuration>
208208
</plugin>
209+
<plugin>
210+
<groupId>org.sonatype.central</groupId>
211+
<artifactId>central-publishing-maven-plugin</artifactId>
212+
<version>0.8.0</version>
213+
<extensions>true</extensions>
214+
<configuration>
215+
<publishingServerId>central</publishingServerId>
216+
</configuration>
217+
</plugin>
209218
</plugins>
210219
</build>
211220

@@ -215,20 +224,9 @@
215224
<id>deploy</id>
216225
<build>
217226
<plugins>
218-
<plugin>
219-
<groupId>org.sonatype.plugins</groupId>
220-
<artifactId>nexus-staging-maven-plugin</artifactId>
221-
<version>1.6.13</version>
222-
<extensions>true</extensions>
223-
<configuration>
224-
<serverId>ossrh</serverId>
225-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
226-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
227-
</configuration>
228-
</plugin>
229227
<plugin>
230228
<artifactId>maven-gpg-plugin</artifactId>
231-
<version>3.0.1</version>
229+
<version>3.2.8</version>
232230
<executions>
233231
<execution>
234232
<id>sign-artifacts</id>
@@ -241,7 +239,7 @@
241239
</plugin>
242240
<plugin>
243241
<artifactId>maven-source-plugin</artifactId>
244-
<version>3.2.1</version>
242+
<version>3.3.1</version>
245243
<executions>
246244
<execution>
247245
<id>attach-sources</id>
@@ -253,7 +251,7 @@
253251
</plugin>
254252
<plugin>
255253
<artifactId>maven-javadoc-plugin</artifactId>
256-
<version>3.4.1</version>
254+
<version>3.11.2</version>
257255
<executions>
258256
<execution>
259257
<id>attach-javadocs</id>
@@ -268,15 +266,6 @@
268266
</profile>
269267
</profiles>
270268

271-
<distributionManagement>
272-
<snapshotRepository>
273-
<id>vpro-ossrh</id>
274-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
275-
</snapshotRepository>
276-
<repository>
277-
<id>vpro-ossrh-release</id>
278-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
279-
</repository>
280-
</distributionManagement>
269+
281270

282271
</project>

‎src/main/java/nl/vpro/amara/ActivityClient.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.net.URI;
44

5-
import org.springframework.http.HttpStatus;
65
import org.springframework.http.ResponseEntity;
76

87
import nl.vpro.amara.domain.Activity;
@@ -33,7 +32,6 @@ public ActivityCollection list() {
3332
ResponseEntity<ActivityCollection> response = get(uri, ActivityCollection.class);
3433
ActivityCollection amaryActivityCollection = response.getBody();
3534

36-
HttpStatus httpStatus = response.getStatusCode();
3735

3836
//LOG.info(String.valueOf(response));
3937

@@ -50,7 +48,6 @@ public ActivityCollection list(int activityType, long afterTimestampInSeconds) {
5048
ResponseEntity<ActivityCollection> response = get(uri, ActivityCollection.class);
5149
ActivityCollection amaryActivityCollection = response.getBody();
5250

53-
HttpStatus httpStatus = response.getStatusCode();
5451
//LOG.info(String.valueOf(response));
5552

5653
return amaryActivityCollection;

‎src/main/java/nl/vpro/amara/TeamsClient.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public TaskCollection getTasks(TaskType taskType, Instant after, long offset, in
4242
ResponseEntity<TaskCollection> response = get(uri, TaskCollection.class);
4343
TaskCollection tasks = response.getBody();
4444
log.debug("Total size: {}", tasks.getMeta().getTotal_count());
45-
HttpStatus httpStatus = response.getStatusCode();
4645
return tasks;
4746
}
4847

0 commit comments

Comments
 (0)