Skip to content

Commit 762a195

Browse files
author
Henrik Adamski
authored
LIBS-713 - Update dependencies (#7)
* LIBS-668 - Update dependencies * Fix build
1 parent d8783da commit 762a195

File tree

6 files changed

+82
-59
lines changed

6 files changed

+82
-59
lines changed

‎.github/workflows/nightly.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: nightly
22

33
on:
44
schedule:
5-
- cron: 0 0 * * *
5+
- cron: 0 0 * * 1
66

77
jobs:
8-
build:
8+
nightly:
99
runs-on: ubuntu-latest
1010

1111
steps:
@@ -14,10 +14,11 @@ jobs:
1414
with:
1515
java-version: 11
1616

17-
- uses: actions/checkout@v1
17+
- name: checkout
18+
uses: actions/checkout@v2
1819

1920
- name: caching
20-
uses: actions/cache@v1
21+
uses: actions/cache@v2
2122
with:
2223
path: ~/.m2/repository
2324
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -34,12 +35,13 @@ jobs:
3435

3536
- name: sonar-analyse
3637
env:
37-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
SONAR_HOST: ${{ secrets.OS_SONAR_HOST_URL }}
39+
SONAR_TOKEN: ${{ secrets.OS_SONAR_TOKEN }}
3840
run: |
3941
export SONAR_ORGANIZATION=$(echo ${GITHUB_REPOSITORY} | cut -d / -f 1)
4042
mvn sonar:sonar \
41-
-Dsonar.host.url=https://sonarcloud.io/ \
42-
-Dsonar.login=${{ secrets.SONAR_TOKEN }} \
43+
-Dsonar.host.url=${SONAR_HOST} \
44+
-Dsonar.login=${SONAR_TOKEN} \
4345
-Dsonar.organization=${SONAR_ORGANIZATION} \
4446
-Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
4547
-Dsonar.java.binaries=./target/classes

‎.github/workflows/release.yml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,53 @@ on:
77

88
jobs:
99
release:
10+
runs-on: ubuntu-latest
1011
env:
11-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
1212
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
13-
runs-on: ubuntu-latest
13+
1414
steps:
1515
- name: setup-java
1616
uses: actions/setup-java@v1
1717
with:
1818
java-version: 11
19+
server-id: ossrh
20+
server-username: OSSRH_USERNAME
21+
server-password: OSSRH_PASSWORD
22+
23+
- name: setup-github-release
24+
run: sed -i -e 's/<\/servers>/<server><id>github<\/id><username>x-access-token<\/username><password>${GITHUB_TOKEN}<\/password><\/server><\/servers>/g' /home/runner/.m2/settings.xml
1925

2026
- name: setup-gpg
2127
env:
22-
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
23-
run: echo ${GPG_PRIVATE_KEY} | base64 --decode | gpg --batch --import
24-
25-
- name: setup-maven-settings
26-
uses: s4u/maven-settings-action@v1
27-
with:
28-
servers: '[{"id": "ossrh", "username": "${OSSRH_USERNAME}", "password": "${OSSRH_PASSWORD}"}, {"id": "github", "username": "x-access-token", "password": "${GITHUB_TOKEN}"}]'
29-
properties: '[{"gpg.executable": "gpg"}, {"gpg.passphrase": "${GPG_PASSPHRASE}"}]'
30-
sonatypeSnapshots: true
28+
GPG_PRIVATE_KEY: ${{ secrets.OS_GPG_PRIVATE_KEY }}
29+
run: cat <(echo -e "${GPG_PRIVATE_KEY}") | gpg --batch --import
3130

3231
- name: checkout
33-
uses: actions/checkout@v1
32+
uses: actions/checkout@v2
3433

3534
- name: caching
36-
uses: actions/cache@v1
35+
uses: actions/cache@v2
3736
with:
3837
path: ~/.m2/repository
3938
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
4039
restore-keys: ${{ runner.os }}-maven-
4140

4241
- name: deploy
4342
env:
44-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
45-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
46-
run: mvn clean verify deploy
43+
OSSRH_USERNAME: ${{ secrets.OS_OSSRH_USERNAME }}
44+
OSSRH_PASSWORD: ${{ secrets.OS_OSSRH_PASSWORD }}
45+
GPG_PASSPHRASE: ${{ secrets.OS_GPG_PASSPHRASE }}
46+
run: mvn deploy -Dmaven.wagon.http.pool=false -Dgpg.executable=gpg -Dgpg.passphrase=${GPG_PASSPHRASE}
4747

4848
- name: sonar-analyse
49+
env:
50+
SONAR_HOST: ${{ secrets.OS_SONAR_HOST_URL }}
51+
SONAR_TOKEN: ${{ secrets.OS_SONAR_TOKEN }}
4952
run: |
5053
export SONAR_ORGANIZATION=$(echo ${GITHUB_REPOSITORY} | cut -d / -f 1)
5154
mvn sonar:sonar \
52-
-Dsonar.host.url=https://sonarcloud.io/ \
53-
-Dsonar.login=${{ secrets.SONAR_TOKEN }} \
55+
-Dsonar.host.url=${SONAR_HOST} \
56+
-Dsonar.login=${SONAR_TOKEN} \
5457
-Dsonar.organization=${SONAR_ORGANIZATION} \
5558
-Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
5659
-Dsonar.java.binaries=./target/classes

‎.github/workflows/review.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [opened, synchronize]
66

77
jobs:
8-
build:
8+
review:
99
runs-on: ubuntu-latest
1010

1111
steps:
@@ -15,10 +15,17 @@ jobs:
1515
java-version: 11
1616

1717
- name: checkout
18-
uses: actions/checkout@v1
18+
uses: actions/checkout@v2
19+
20+
- name: project-version-check
21+
uses: avides/actions-project-version-check@v1
22+
with:
23+
token: ${{ secrets.GITHUB_TOKEN }}
24+
file-to-check: pom.xml
25+
additional-files-to-check: README.md
1926

2027
- name: caching
21-
uses: actions/cache@v1
28+
uses: actions/cache@v2
2229
with:
2330
path: ~/.m2/repository
2431
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -35,17 +42,19 @@ jobs:
3542

3643
- name: sonar-analyse
3744
env:
45+
SONAR_HOST: ${{ secrets.OS_SONAR_HOST_URL }}
46+
SONAR_TOKEN: ${{ secrets.OS_SONAR_TOKEN }}
3847
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3948
run: |
40-
export GITHUB_PULL_REQUEST=$(cut -d / -f 3 <(echo ${GITHUB_REF}))
4149
export SONAR_ORGANIZATION=$(echo ${GITHUB_REPOSITORY} | cut -d / -f 1)
4250
mvn sonar:sonar \
43-
-Dsonar.host.url=https://sonarcloud.io/ \
44-
-Dsonar.login=${{ secrets.SONAR_TOKEN }} \
51+
-Dsonar.host.url=${SONAR_HOST} \
52+
-Dsonar.login=${SONAR_TOKEN} \
4553
-Dsonar.organization=${SONAR_ORGANIZATION} \
4654
-Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
47-
-Dsonar.pullrequest.key=${GITHUB_PULL_REQUEST} \
48-
-Dsonar.pullrequest.branch=${GITHUB_REF} \
55+
-Dsonar.pullrequest.key=${{ github.event.number }} \
56+
-Dsonar.pullrequest.branch=${{ github.event.pull_request.head.ref }} \
57+
-Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} \
4958
-Dsonar.java.binaries=./target/classes
5059
5160
- name: pom-analyse

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Spring-Rabbit
22

3-
[![Maven Central](https://img.shields.io/maven-metadata/v/http/central.maven.org/maven2/com/avides/spring/spring-rabbit/maven-metadata.xml.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.avides.spring%22%20AND%20a%3A%22spring-rabbit%22)
3+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.avides.spring/spring-rabbit/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.avides.spring/spring-rabbit)
44
[![Build](https://github.com/avides/spring-rabbit/workflows/release/badge.svg)](https://github.com/avides/spring-rabbit/actions)
55
[![Nightly build](https://github.com/avides/spring-rabbit/workflows/nightly/badge.svg)](https://github.com/avides/spring-rabbit/actions)
66
[![Coverage report](https://sonarcloud.io/api/project_badges/measure?project=avides_spring-rabbit&metric=coverage)](https://sonarcloud.io/dashboard?id=avides_spring-rabbit)
@@ -12,7 +12,7 @@
1212
<dependency>
1313
<groupId>com.avides.spring</groupId>
1414
<artifactId>spring-rabbit</artifactId>
15-
<version>2.0.0</version>
15+
<version>2.1.0</version>
1616
</dependency>
1717
```
1818

@@ -38,8 +38,8 @@
3838
``` ini
3939
docker run \
4040
-d \
41-
--name rabbitmq-3.6.X \
42-
--hostname rabbitmq-3.6.X \
41+
--name rabbitmq \
42+
--hostname rabbitmq \
4343
--restart=always \
4444
--memory=500MB \
4545
-v PATH:/var/lib/rabbitmq \

‎pom.xml

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
<groupId>com.avides.spring</groupId>
55
<artifactId>spring-rabbit</artifactId>
6-
<version>2.0.0</version>
6+
<version>2.1.0</version>
77

88
<name>spring-rabbit</name>
99
<description>Makes configuring RabbitMQ for Spring Boot applications more comfortable</description>
1010
<url>https://github.com/avides/spring-rabbit</url>
1111
<organization>
1212
<name>AVIDES Media AG</name>
13-
<url>http://www.avides.com</url>
13+
<url>https://www.avides.com</url>
1414
</organization>
1515
<licenses>
1616
<license>
@@ -32,6 +32,13 @@
3232
<developerConnection>scm:git:https://github.com/avides/spring-rabbit.git</developerConnection>
3333
</scm>
3434

35+
<distributionManagement>
36+
<repository>
37+
<id>ossrh</id>
38+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
39+
</repository>
40+
</distributionManagement>
41+
3542
<properties>
3643
<!-- System -->
3744
<timestamp>${maven.build.timestamp}</timestamp>
@@ -40,41 +47,41 @@
4047
<java.version>11</java.version>
4148
<!-- Build -->
4249
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
43-
<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
44-
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
50+
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
51+
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
4552
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
46-
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
47-
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
48-
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
49-
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
53+
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
54+
<maven-failsafe-plugin.version>3.0.0-M4</maven-failsafe-plugin.version>
55+
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
56+
<maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version>
5057
<maven-scm-provider-gitexe.version>1.11.2</maven-scm-provider-gitexe.version>
51-
<exists-maven-plugin.version>0.0.6</exists-maven-plugin.version>
58+
<exists-maven-plugin.version>0.3.0</exists-maven-plugin.version>
5259
<github-release-plugin.version>1.4.0</github-release-plugin.version>
5360
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
5461
<!-- Spring -->
55-
<spring.version>5.2.2.RELEASE</spring.version>
56-
<spring-boot.version>2.2.2.RELEASE</spring-boot.version>
57-
<http-client.version>3.5.0.RELEASE</http-client.version>
58-
<httpclient.version>4.5.10</httpclient.version>
59-
<micrometer-core.version>1.3.1</micrometer-core.version>
62+
<spring.version>5.2.6.RELEASE</spring.version>
63+
<spring-boot.version>2.3.0.RELEASE</spring-boot.version>
64+
<http-client.version>3.7.0.RELEASE</http-client.version>
65+
<httpclient.version>4.5.12</httpclient.version>
66+
<micrometer-core.version>1.5.1</micrometer-core.version>
6067
<!-- Validation -->
61-
<hibernate-validator.version>6.0.18.Final</hibernate-validator.version>
68+
<hibernate-validator.version>6.0.20.Final</hibernate-validator.version>
6269
<!-- Other -->
63-
<lombok.version>1.18.10</lombok.version>
70+
<lombok.version>1.18.12</lombok.version>
6471
<!-- Testing -->
6572
<jaxb-api.version>2.3.0</jaxb-api.version>
6673
<jaxb-core.version>2.3.0.1</jaxb-core.version>
6774
<jaxb-impl.version>2.3.0</jaxb-impl.version>
68-
<junit.version>4.12</junit.version>
69-
<assertj-core.version>3.14.0</assertj-core.version>
70-
<jacoco.version>0.8.3</jacoco.version>
71-
<powermock.version>2.0.4</powermock.version>
72-
<easymock.version>4.1</easymock.version>
75+
<junit.version>4.13</junit.version>
76+
<assertj-core.version>3.16.1</assertj-core.version>
77+
<jacoco.version>0.8.5</jacoco.version>
78+
<powermock.version>2.0.7</powermock.version>
79+
<easymock.version>4.2</easymock.version>
7380
<spring-xom-unmarshaller.version>1.3.0</spring-xom-unmarshaller.version>
7481
<javax.el.version>3.0.0</javax.el.version>
7582
<springtainer-rabbitmq.version>1.0.0</springtainer-rabbitmq.version>
7683
<logback-classic.version>1.2.3</logback-classic.version>
77-
<awaitility.version>4.0.1</awaitility.version>
84+
<awaitility.version>4.0.3</awaitility.version>
7885
</properties>
7986

8087
<dependencies>

‎src/test/java/com/avides/spring/rabbit/configuration/domain/QueueMasterLocatorConnectionFactoryTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
import org.junit.Test;
1111
import org.junit.runner.RunWith;
1212
import org.powermock.api.easymock.annotation.MockStrict;
13+
import org.powermock.core.classloader.annotations.PowerMockIgnore;
1314
import org.powermock.modules.junit4.PowerMockRunner;
1415
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
1516

1617
import com.avides.spring.rabbit.utils.DomainTestSupport;
1718

1819
@RunWith(PowerMockRunner.class)
20+
@PowerMockIgnore({ "javax.xml.*", "com.sun.org.apache.xalan.*" })
1921
public class QueueMasterLocatorConnectionFactoryTest implements DomainTestSupport
2022
{
2123
private QueueMasterLocatorConnectionFactory queueMasterLocatorConnectionFactory;

0 commit comments

Comments
 (0)