Skip to content

Commit d2bf8dc

Browse files
mihxilmihxil
committed
Updating depedencies.
1 parent 37b1d59 commit d2bf8dc

File tree

5 files changed

+74
-60
lines changed

5 files changed

+74
-60
lines changed

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
env:
14-
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
14+
MAVEN_ARGS: '--no-transfer-progress'
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717
- name: Set up JDK 17
18-
uses: actions/setup-java@v4
18+
uses: actions/setup-java@v5
1919
with:
2020
distribution: 'temurin'
2121
java-version: 17
22-
server-id: vpro-ossrh
23-
server-username: SONATYPE_USERNAME
24-
server-password: SONATYPE_PASSWORD
22+
server-id: central
23+
server-username: CENTRAL_USERNAME
24+
server-password: CENTRAL_PASSWORD
2525
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
26-
gpg-passphrase: GPG_SECRET_KEY_PASSPHRASE
2726
cache: maven
2827
- name: Build with Maven
2928
run: mvn -B -fn
@@ -37,7 +36,7 @@ jobs:
3736
run: mvn -B -Pdeploy -DskipTests=true deploy
3837
if: ${{ github.event_name == 'push' }}
3938
env:
40-
SONATYPE_USERNAME: vpro
41-
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
42-
GPG_SECRET_KEY_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
39+
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
40+
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
41+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASSPHRASE }}
4342

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,21 @@ jobs:
77
build:
88
runs-on: ubuntu-latest
99
env:
10-
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
10+
MAVEN_ARGS: '--no-transfer-progress'
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- name: Set up JDK 17
14-
uses: actions/setup-java@v4
14+
uses: actions/setup-java@v5
1515
with:
1616
distribution: 'temurin'
1717
java-version: 17
18-
server-id: vpro-ossrh
19-
server-username: SONATYPE_USERNAME
20-
server-password: SONATYPE_PASSWORD
21-
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
22-
gpg-passphrase: GPG_SECRET_KEY_PASSPHRASE
2318
cache: maven
24-
- uses: oleksiyrudenko/gha-git-credentials@v2.1.1
19+
server-id: central
20+
server-username: CENTRAL_USERNAME
21+
server-password: CENTRAL_PASSWORD
22+
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
23+
- uses: oleksiyrudenko/gha-git-credentials@v2
2524
with:
26-
global: true
2725
name: 'github'
2826
email: 'digitaal-techniek@vpro.nl'
2927
token: '${{ secrets.GITHUB_TOKEN }}'

‎VPRO‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎pom.xml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,17 @@
3434

3535

3636
<scm>
37-
<connection>scm:git:git://git@github.com/vpro/esper-events.git</connection>
38-
<developerConnection>scm:git:git@github.com:vpro/esper-events.git</developerConnection>
39-
<url>https://github.com/vpro/esper-events</url>
40-
<tag>REL-3.0</tag>
37+
<connection>scm:git:git://git@github.com/npo-poms/esper-events.git</connection>
38+
<developerConnection>scm:git:git@github.com:npo-poms/esper-events.git</developerConnection>
39+
<url>https://github.com/npo-poms/esper-events</url>
4140
</scm>
4241

4342
<properties>
44-
<slf4j.version>2.0.11</slf4j.version>
43+
<slf4j.version>2.0.17</slf4j.version>
4544
<esper.version>9.0.0</esper.version>
4645

47-
<junit.version>5.10.1</junit.version>
48-
<log4j2.version>2.23.1</log4j2.version>
46+
<junit.version>5.13.4</junit.version>
47+
<log4j2.version>2.25.2</log4j2.version>
4948
</properties>
5049

5150
<dependencies>
@@ -72,17 +71,17 @@
7271
<dependency>
7372
<groupId>com.google.guava</groupId>
7473
<artifactId>guava</artifactId>
75-
<version>33.2.1-jre</version>
74+
<version>33.5.0-jre</version>
7675
</dependency>
7776
<dependency>
7877
<groupId>org.projectlombok</groupId>
7978
<artifactId>lombok</artifactId>
80-
<version>1.18.32</version>
79+
<version>1.18.42</version>
8180
</dependency>
8281
<dependency>
8382
<groupId>commons-beanutils</groupId>
8483
<artifactId>commons-beanutils</artifactId>
85-
<version>1.9.4</version>
84+
<version>1.11.0</version>
8685
<exclusions>
8786
<!-- as far as I know these dependencies are optional, at least for the one class we use org.apache.commons.beanutils.PropertyUtils -->
8887
<exclusion>
@@ -103,7 +102,13 @@
103102
<dependency>
104103
<groupId>org.assertj</groupId>
105104
<artifactId>assertj-core</artifactId>
106-
<version>3.26.0</version>
105+
<version>3.27.6</version>
106+
</dependency>
107+
<dependency>
108+
<groupId>org.checkerframework</groupId>
109+
<artifactId>checker-qual</artifactId>
110+
<version>3.51.0</version>
111+
<scope>provided</scope>
107112
</dependency>
108113
<dependency>
109114
<groupId>org.junit.jupiter</groupId>
@@ -138,7 +143,7 @@
138143
<plugins>
139144
<plugin>
140145
<artifactId>maven-compiler-plugin</artifactId>
141-
<version>3.13.0</version>
146+
<version>3.14.1</version>
142147
<configuration>
143148
<source>17</source>
144149
<target>17</target>
@@ -148,7 +153,7 @@
148153
<plugin>
149154
<groupId>org.apache.maven.plugins</groupId>
150155
<artifactId>maven-release-plugin</artifactId>
151-
<version>3.0.1</version>
156+
<version>3.1.1</version>
152157
<configuration>
153158
<branchName>REL-${project.version}</branchName>
154159
<tagNameFormat>REL-@{project.version}</tagNameFormat>
@@ -175,7 +180,25 @@
175180
</plugin>
176181
<plugin>
177182
<artifactId>maven-surefire-plugin</artifactId>
178-
<version>3.2.5</version>
183+
<version>3.5.4</version>
184+
</plugin>
185+
<plugin>
186+
<groupId>org.sonatype.central</groupId>
187+
<artifactId>central-publishing-maven-plugin</artifactId>
188+
<version>0.9.0</version>
189+
<extensions>true</extensions>
190+
<configuration>
191+
<publishingServerId>central</publishingServerId>
192+
<autoPublish>true</autoPublish>
193+
</configuration>
194+
</plugin>
195+
<plugin>
196+
<groupId>org.codehaus.mojo</groupId>
197+
<artifactId>versions-maven-plugin</artifactId>
198+
<version>2.19.1</version>
199+
<configuration>
200+
<rulesUri>file:///${maven.multiModuleProjectDirectory}/rules.xml</rulesUri>
201+
</configuration>
179202
</plugin>
180203
</plugins>
181204
</build>
@@ -185,17 +208,6 @@
185208
<id>deploy</id>
186209
<build>
187210
<plugins>
188-
<plugin>
189-
<groupId>org.sonatype.plugins</groupId>
190-
<artifactId>nexus-staging-maven-plugin</artifactId>
191-
<version>1.7.0</version>
192-
<extensions>true</extensions>
193-
<configuration>
194-
<serverId>vpro-ossrh</serverId>
195-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
196-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
197-
</configuration>
198-
</plugin>
199211
<plugin>
200212
<artifactId>maven-source-plugin</artifactId>
201213
<version>3.3.1</version>
@@ -210,7 +222,7 @@
210222
</plugin>
211223
<plugin>
212224
<artifactId>maven-gpg-plugin</artifactId>
213-
<version>3.2.4</version>
225+
<version>3.2.8</version>
214226
<executions>
215227
<execution>
216228
<id>sign-artifacts</id>
@@ -224,7 +236,7 @@
224236

225237
<plugin>
226238
<artifactId>maven-javadoc-plugin</artifactId>
227-
<version>3.6.0</version>
239+
<version>3.12.0</version>
228240
<executions>
229241
<execution>
230242
<id>attach-javadocs</id>
@@ -238,16 +250,4 @@
238250
</build>
239251
</profile>
240252
</profiles>
241-
242-
243-
<distributionManagement>
244-
<snapshotRepository>
245-
<id>vpro-ossrh</id>
246-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
247-
</snapshotRepository>
248-
<repository>
249-
<id>vpro-ossrh-release</id>
250-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
251-
</repository>
252-
</distributionManagement>
253253
</project>

‎rules.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ruleset comparisonMethod="maven"
3+
xmlns="https://www.mojohaus.org/VERSIONS/RULE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://www.mojohaus.org/VERSIONS/RULE/2.1.0 https://www.mojohaus.org/versions/versions-model/xsd/rule-2.1.0.xsd">
5+
<ignoreVersions>
6+
<!-- Ignore Alpha's, Beta's, release candidates and milestones -->
7+
<ignoreVersion type="regex">(?i).*Alpha(?:-?\d+)?</ignoreVersion>
8+
<ignoreVersion type="regex">(?i).*a(?:-?\d+)?</ignoreVersion>
9+
<ignoreVersion type="regex">(?i).*Beta(?:-?\d+)?</ignoreVersion>
10+
<ignoreVersion type="regex">(?i).*-B(?:-?\d+)?</ignoreVersion>
11+
<ignoreVersion type="regex">(?i).*RC(?:-?\d+)?</ignoreVersion>
12+
<ignoreVersion type="regex">(?i).*CR(?:-?\d+)?</ignoreVersion>
13+
<ignoreVersion type="regex">(?i).*M(?:-?\d+)?</ignoreVersion>
14+
</ignoreVersions>
15+
<rules>
16+
17+
</rules>
18+
</ruleset>

0 commit comments

Comments
 (0)