Skip to content
This repository was archived by the owner on Feb 21, 2024. It is now read-only.

Commit 4db025e

Browse files
ocristianocristian
committed
[release] - patch to fix the missing beans on MultiRabbitAnnotationPostProcessor. (#65) and Github Actions to build, release and publishing artifacts to maven central. Requires changing the group id to: com.free-now.multirabbit
1 parent d197a21 commit 4db025e

File tree

11 files changed

+204
-76
lines changed

11 files changed

+204
-76
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 58 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Java CI with Maven
1+
name: CI
22

33
on:
44
push:
@@ -13,19 +13,71 @@ on:
1313
- develop/**
1414

1515
jobs:
16-
java:
16+
build:
17+
if: ${{ !startsWith(github.event.head_commit.message, '[maven-release-plugin] prepare') }}
1718
runs-on: ubuntu-latest
1819
strategy:
1920
matrix:
20-
java: [ 11, 14 ]
21-
name: Java ${{ matrix.java }}
21+
java: [ 8 ]
22+
name: Build on Java ${{ matrix.java }}
2223
steps:
23-
- uses: actions/checkout@v2
24+
- name: Checkout source code
25+
uses: actions/checkout@v2
26+
2427
- name: Setup java
2528
uses: joschi/setup-jdk@v2
2629
with:
2730
java-version: ${{ matrix.java }}
2831
architecture: x64
32+
2933
- run: java -version
3034
- run: mvn -v
31-
- run: mvn -B verify
35+
- run: mvn -B verify -Dgpg.skip=true
36+
37+
release:
38+
if: contains(github.ref, 'release') && startsWith(github.event.head_commit.message, '[release]')
39+
runs-on: ubuntu-latest
40+
needs: [build]
41+
name: Release
42+
steps:
43+
- name: Checkout source code
44+
uses: actions/checkout@v2
45+
46+
- name: Setup Java 1.8
47+
uses: actions/setup-java@v1
48+
with:
49+
java-version: 1.8
50+
51+
- name: Cache Maven packages
52+
uses: actions/cache@v2
53+
with:
54+
path: ~/.m2
55+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
56+
restore-keys: ${{ runner.os }}-m2
57+
58+
- name: Set env.BRANCH_NAME
59+
run: echo "BRANCH_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
60+
61+
- name: Release and Publish
62+
uses: qcastel/[email protected]
63+
with:
64+
release-branch-name: ${{ env.BRANCH_NAME }}
65+
66+
gpg-enabled: true
67+
gpg-key-id: ${{ secrets.FREE_NOW_GPG_KEY_ID }}
68+
gpg-key: ${{ secrets.FREE_NOW_GPG_KEY }}
69+
gpg-passphrase: ${{ secrets.FREE_NOW_GPG_PASSPHRASE }}
70+
71+
ssh-private-key: ${{ secrets.FREE_NOW_GITHUB_PRIVATE_KEY }}
72+
73+
git-release-bot-name: "free-now-github"
74+
git-release-bot-email: "[email protected]"
75+
git-skip-sanity-check: true
76+
77+
maven-repo-server-id: ossrh
78+
maven-repo-server-username: ${{ secrets.FREE_NOW_GITHUB_USER }}
79+
maven-repo-server-password: ${{ secrets.FREE_NOW_MAVEN_ACCESS_TOKEN }}
80+
maven-args: "-DskipTests -DskipITs"
81+
82+
env:
83+
JAVA_HOME: /usr/lib/jvm/java-1.8-openjdk/

‎README.md‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,15 @@ public class Application {
3232
```
3333

3434
##### 2. pom.xml
35-
Add the reference to the repository, and the necessary libs:
35+
Add the reference to the necessary libs:
3636
```xml
37-
<repositories>
38-
<repository>
39-
<id>bintray-mytaxi-oss</id>
40-
<name>bintray</name>
41-
<url>https://dl.bintray.com/mytaxi/oss</url>
42-
</repository>
43-
</repositories>
44-
4537
<dependencies>
4638
<dependency>
4739
<groupId>org.springframework.boot</groupId>
4840
<artifactId>spring-boot-starter-amqp</artifactId>
4941
</dependency>
5042
<dependency>
51-
<groupId>com.mytaxi.spring.multirabbit</groupId>
43+
<groupId>com.free-now.multirabbit</groupId>
5244
<artifactId>spring-multirabbit-lib</artifactId>
5345
<version>${multirabbit.version}</version>
5446
</dependency>
@@ -203,7 +195,7 @@ spring:
203195
```
204196
205197
## Compatibility of versions
206-
For the table of compatibility, please visit the [Wiki](https://github.com/mytaxi/spring-multirabbit/wiki) page.
198+
For the table of compatibility, please visit the [Wiki](https://github.com/freenowtech/spring-multirabbit/wiki) page.
207199
208200
## More Examples
209201
More examples can be found at the modules **spring-multirabbit-example-java** and **spring-multirabbit-example-kotlin**.

‎pom.xml‎

Lines changed: 85 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,27 @@
33

44
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>com.mytaxi.spring.multirabbit</groupId>
6+
<groupId>com.free-now.multirabbit</groupId>
77
<artifactId>spring-multirabbit-parent</artifactId>
88
<version>2.2.4-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

11-
<name>Spring Multirabbit</name>
11+
<name>Spring MultiRabbit</name>
1212
<description>Library to extend Spring to provide connection to multiple RabbitMQ servers</description>
13+
<url>https://github.com/freenowtech/spring-multirabbit</url>
14+
15+
<modules>
16+
<module>spring-multirabbit-lib</module>
17+
<module>spring-multirabbit-lib-integration</module>
18+
<module>spring-multirabbit-examples/spring-multirabbit-example-java</module>
19+
<module>spring-multirabbit-examples/spring-multirabbit-example-kotlin</module>
20+
<module>spring-multirabbit-examples/spring-multirabbit-extension-example</module>
21+
</modules>
1322

14-
<url>http://www.mytaxi.com</url>
1523
<licenses>
1624
<license>
1725
<name>Apache License Version 2.0</name>
18-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
26+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
1927
</license>
2028
</licenses>
2129

@@ -26,35 +34,42 @@
2634
</developer>
2735
</developers>
2836

29-
<modules>
30-
<module>spring-multirabbit-lib</module>
31-
<module>spring-multirabbit-lib-integration</module>
32-
<module>spring-multirabbit-examples/spring-multirabbit-example-java</module>
33-
<module>spring-multirabbit-examples/spring-multirabbit-example-kotlin</module>
34-
<module>spring-multirabbit-examples/spring-multirabbit-extension-example</module>
35-
</modules>
36-
37-
<properties>
38-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
39-
<maven.compiler.source>1.8</maven.compiler.source>
40-
<maven.compiler.target>1.8</maven.compiler.target>
41-
<springboot.version>2.2.13.RELEASE</springboot.version>
42-
</properties>
43-
4437
<scm>
38+
<connection>scm:git:[email protected]:freenowtech/spring-multirabbit.git</connection>
39+
<developerConnection>scm:git:[email protected]:freenowtech/spring-multirabbit.git</developerConnection>
4540
<tag>HEAD</tag>
46-
<url>scm:git:https://github.com/mytaxi/spring-multirabbit.git</url>
47-
<connection>scm:git:https://github.com/mytaxi/spring-multirabbit.git</connection>
48-
<developerConnection>scm:git:https://github.com/mytaxi/spring-multirabbit.git</developerConnection>
41+
<url>scm:git:[email protected]:freenowtech/spring-multirabbit.git</url>
4942
</scm>
43+
5044
<distributionManagement>
45+
<snapshotRepository>
46+
<id>ossrh</id>
47+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
48+
</snapshotRepository>
5149
<repository>
52-
<id>bintray-mytaxi-oss</id>
53-
<name>mytaxi-oss</name>
54-
<url>https://api.bintray.com/maven/mytaxi/oss/spring-multirabbit/;publish=1</url>
50+
<id>ossrh</id>
51+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
5552
</repository>
5653
</distributionManagement>
5754

55+
<properties>
56+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
57+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
58+
<java.version>1.8</java.version>
59+
60+
<springboot.version>2.2.13.RELEASE</springboot.version>
61+
<testcontainers-rabbitmq.version>1.15.2</testcontainers-rabbitmq.version>
62+
63+
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
64+
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
65+
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
66+
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
67+
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
68+
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
69+
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
70+
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
71+
</properties>
72+
5873
<dependencyManagement>
5974
<dependencies>
6075
<dependency>
@@ -70,24 +85,38 @@
7085
<build>
7186
<plugins>
7287
<plugin>
73-
<groupId>org.apache.maven.plugins</groupId>
74-
<artifactId>maven-surefire-plugin</artifactId>
75-
<version>2.22.2</version>
88+
<artifactId>maven-release-plugin</artifactId>
89+
<version>${maven-release-plugin.version}</version>
7690
</plugin>
7791
<plugin>
7892
<groupId>org.apache.maven.plugins</groupId>
79-
<artifactId>maven-compiler-plugin</artifactId>
80-
<version>3.8.1</version>
93+
<artifactId>maven-surefire-plugin</artifactId>
94+
<version>${maven-surefire-plugin.version}</version>
8195
</plugin>
8296
<plugin>
8397
<groupId>org.apache.maven.plugins</groupId>
84-
<artifactId>maven-release-plugin</artifactId>
85-
<version>2.5.3</version>
98+
<artifactId>maven-gpg-plugin</artifactId>
99+
<version>${maven-gpg-plugin.version}</version>
100+
<configuration>
101+
<gpgArguments>
102+
<arg>--pinentry-mode</arg>
103+
<arg>loopback</arg>
104+
</gpgArguments>
105+
</configuration>
106+
<executions>
107+
<execution>
108+
<id>sign-artifacts</id>
109+
<phase>verify</phase>
110+
<goals>
111+
<goal>sign</goal>
112+
</goals>
113+
</execution>
114+
</executions>
86115
</plugin>
87116
<plugin>
88117
<groupId>org.apache.maven.plugins</groupId>
89118
<artifactId>maven-source-plugin</artifactId>
90-
<version>3.0.1</version>
119+
<version>${maven-source-plugin.version}</version>
91120
<executions>
92121
<execution>
93122
<id>attach-sources</id>
@@ -100,7 +129,7 @@
100129
<plugin>
101130
<groupId>org.apache.maven.plugins</groupId>
102131
<artifactId>maven-javadoc-plugin</artifactId>
103-
<version>3.0.1</version>
132+
<version>${maven-javadoc-plugin.version}</version>
104133
<executions>
105134
<execution>
106135
<id>attach-javadocs</id>
@@ -110,10 +139,30 @@
110139
</execution>
111140
</executions>
112141
</plugin>
142+
<plugin>
143+
<groupId>org.sonatype.plugins</groupId>
144+
<artifactId>nexus-staging-maven-plugin</artifactId>
145+
<version>${nexus-staging-maven-plugin.version}</version>
146+
<extensions>true</extensions>
147+
<configuration>
148+
<serverId>ossrh</serverId>
149+
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
150+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
151+
</configuration>
152+
</plugin>
153+
<plugin>
154+
<groupId>org.apache.maven.plugins</groupId>
155+
<artifactId>maven-compiler-plugin</artifactId>
156+
<version>${maven-compiler-plugin.version}</version>
157+
<configuration>
158+
<source>${java.version}</source>
159+
<target>${java.version}</target>
160+
</configuration>
161+
</plugin>
113162
<plugin>
114163
<groupId>org.apache.maven.plugins</groupId>
115164
<artifactId>maven-checkstyle-plugin</artifactId>
116-
<version>3.1.0</version>
165+
<version>${maven-checkstyle-plugin.version}</version>
117166
<configuration>
118167
<configLocation>oss-checkstyle.xml</configLocation>
119168
<sourceDirectories>${project.basedir}</sourceDirectories>
@@ -132,4 +181,4 @@
132181
</plugin>
133182
</plugins>
134183
</build>
135-
</project>
184+
</project>

‎spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<relativePath />
1111
</parent>
1212

13-
<groupId>com.mytaxi.spring.multirabbit</groupId>
13+
<groupId>com.free-now.multirabbit</groupId>
1414
<artifactId>spring-multirabbit-example-java</artifactId>
1515
<version>2.2.4-SNAPSHOT</version>
1616
<packaging>jar</packaging>
@@ -20,7 +20,7 @@
2020

2121
<dependencies>
2222
<dependency>
23-
<groupId>com.mytaxi.spring.multirabbit</groupId>
23+
<groupId>com.free-now.multirabbit</groupId>
2424
<artifactId>spring-multirabbit-lib</artifactId>
2525
<version>${project.version}</version>
2626
</dependency>

‎spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<relativePath />
1111
</parent>
1212

13-
<groupId>com.mytaxi.spring.multirabbit</groupId>
13+
<groupId>com.free-now.multirabbit</groupId>
1414
<artifactId>spring-multirabbit-example-kotlin</artifactId>
1515
<version>2.2.4-SNAPSHOT</version>
1616
<packaging>jar</packaging>
@@ -20,7 +20,7 @@
2020

2121
<dependencies>
2222
<dependency>
23-
<groupId>com.mytaxi.spring.multirabbit</groupId>
23+
<groupId>com.free-now.multirabbit</groupId>
2424
<artifactId>spring-multirabbit-lib</artifactId>
2525
<version>${project.version}</version>
2626
</dependency>

‎spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<relativePath />
1111
</parent>
1212

13-
<groupId>com.mytaxi.spring.multirabbit</groupId>
13+
<groupId>com.free-now.multirabbit</groupId>
1414
<artifactId>spring-multirabbit-extended-example-java</artifactId>
1515
<version>2.2.4-SNAPSHOT</version>
1616
<packaging>jar</packaging>
@@ -25,7 +25,7 @@
2525

2626
<dependencies>
2727
<dependency>
28-
<groupId>com.mytaxi.spring.multirabbit</groupId>
28+
<groupId>com.free-now.multirabbit</groupId>
2929
<artifactId>spring-multirabbit-lib</artifactId>
3030
<version>${project.version}</version>
3131
</dependency>

‎spring-multirabbit-lib-integration/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<relativePath />
1111
</parent>
1212

13-
<groupId>com.mytaxi.spring.multirabbit</groupId>
13+
<groupId>com.free-now.multirabbit</groupId>
1414
<artifactId>spring-multirabbit-lib-integration</artifactId>
1515
<version>2.2.4-SNAPSHOT</version>
1616
<packaging>pom</packaging>
@@ -25,7 +25,7 @@
2525

2626
<dependencies>
2727
<dependency>
28-
<groupId>com.mytaxi.spring.multirabbit</groupId>
28+
<groupId>com.free-now.multirabbit</groupId>
2929
<artifactId>spring-multirabbit-lib</artifactId>
3030
<version>${project.version}</version>
3131
</dependency>

0 commit comments

Comments
 (0)