Update references

rwanderc · rwanderc · commit df6294e2c23d · 2024-10-23T08:58:50.000+02:00
(cherry picked from commit dbec2b4)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -54,22 +54,21 @@ jobs:
         uses: qcastel/github-actions-maven-release@v1.12.25
         with:
           release-branch-name: ${{ env.BRANCH_NAME }}
+          maven-args: "-DskipTests -DskipITs"
 
           gpg-enabled: true
-          gpg-key-id: ${{ secrets.FREE_NOW_GPG_KEY_ID }}
-          gpg-key: ${{ secrets.FREE_NOW_GPG_KEY }}
-          gpg-passphrase: ${{ secrets.FREE_NOW_GPG_PASSPHRASE }}
+          gpg-key-id: ${{ secrets.GPG_KEY_ID }}
+          gpg-key: ${{ secrets.GPG_KEY }}
+          gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
-          ssh-private-key: ${{ secrets.FREE_NOW_GITHUB_PRIVATE_KEY }}
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
 
-          git-release-bot-name: "free-now-github"
-          git-release-bot-email: "70742378+free-now-github@users.noreply.github.com"
+          git-release-bot-name: "bot-idhub"
+          git-release-bot-email: "bot@idhub.io"
           git-skip-sanity-check: true
 
           maven-repo-server-id: ossrh
-          maven-repo-server-username: ${{ secrets.FREE_NOW_GITHUB_USER }}
-          maven-repo-server-password: ${{ secrets.FREE_NOW_MAVEN_ACCESS_TOKEN }}
-          maven-args: "-DskipTests -DskipITs"
-
+          maven-repo-server-username: ${{ secrets.GITHUB_USER }}
+          maven-repo-server-password: ${{ secrets.MAVEN_ACCESS_TOKEN }}
         env:
           JAVA_HOME: /usr/lib/jvm/java-1.8-openjdk/
diff --git a/MAINTAINERS b/MAINTAINERS
diff --git a/README.md b/README.md
@@ -1,16 +1,12 @@
 # Spring MultiRabbit
-[![Latest release](https://maven-badges.herokuapp.com/maven-central/com.free-now.multirabbit/spring-multirabbit/badge.svg)](https://mvnrepository.com/artifact/com.free-now.multirabbit/spring-multirabbit)
-![Build Status](https://github.com/freenowtech/spring-multirabbit/actions/workflows/maven.yml/badge.svg)
+![Build Status](https://github.com/rwanderc/spring-multirabbit/actions/workflows/maven.yml/badge.svg)
 
 **Spring MultiRabbit** is a library to enable multiple RabbitMQ brokers in SpringBoot applications. The modules are:
 * **spring-multirabbit** - the main module, that provides the auto-configuration feature;
 * **spring-multirabbit-example-java** - an example project in Java;
 * **spring-multirabbit-example-kotlin** - an example project in Kotlin;
 * **spring-multirabbit-extension-example** - an example project of how to extend spring-multirabbit;
 
-## Status: Repository Archived
-This repository has been archived and is no longer actively maintained.
-
 ## How-to
 To use the library, the project must:
 1. Be a SpringBoot project annotated with **@EnableRabbit**, as usual;
@@ -42,7 +38,7 @@ Add the reference to the repository, and the necessary libs:
         <artifactId>spring-boot-starter-amqp</artifactId>
     </dependency>
     <dependency>
-        <groupId>com.free-now.multirabbit</groupId>
+        <groupId>com.wandercosta.multirabbit</groupId>
         <artifactId>spring-multirabbit</artifactId>
         <version>${multirabbit.version}</version>
     </dependency>
@@ -202,7 +198,7 @@ spring:
 ```
 
 ## Compatibility of versions
-For the table of compatibility, please visit the [Wiki](https://github.com/freenowtech/spring-multirabbit/wiki) page.
+WIP
 
 ## More Examples
 More examples can be found at the modules **spring-multirabbit-example-java** and **spring-multirabbit-example-kotlin**.
diff --git a/pom.xml b/pom.xml
@@ -3,14 +3,14 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.free-now.multirabbit</groupId>
+    <groupId>com.wandercosta.multirabbit</groupId>
     <artifactId>spring-multirabbit-parent</artifactId>
     <version>2.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Spring MultiRabbit</name>
     <description>Library to extend Spring to provide connection to multiple RabbitMQ servers</description>
-    <url>https://github.com/freenowtech/spring-multirabbit</url>
+    <url>https://github.com/rwanderc/spring-multirabbit</url>
 
     <modules>
         <module>spring-multirabbit</module>
@@ -29,28 +29,17 @@
     <developers>
         <developer>
             <name>Wander Costa</name>
-            <email>rwander@gmail.com</email>
+            <email>rwander@wandercosta.com</email>
         </developer>
     </developers>
 
     <scm>
-        <connection>scm:git:git@github.com:freenowtech/spring-multirabbit.git</connection>
-        <developerConnection>scm:git:git@github.com:freenowtech/spring-multirabbit.git</developerConnection>
+        <connection>scm:git:git@github.com:rwanderc/spring-multirabbit.git</connection>
+        <developerConnection>scm:git:git@github.com:rwanderc/spring-multirabbit.git</developerConnection>
         <tag>HEAD</tag>
-        <url>scm:git:git@github.com:freenowtech/spring-multirabbit.git</url>
+        <url>https://github.com/rwanderc/spring-multirabbit</url>
     </scm>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -65,7 +54,6 @@
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
-        <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
     </properties>
@@ -139,21 +127,22 @@
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
+                        <phase>package</phase>
                         <goals>
                             <goal>jar</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>${nexus-staging-maven-plugin.version}</version>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>0.6.0</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                    <publishingServerId>central</publishingServerId>
+                    <autoPublish>true</autoPublish>
+                    <waitUntil>uploaded</waitUntil>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml b/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml
@@ -10,7 +10,7 @@
         <relativePath />
     </parent>
 
-    <groupId>com.free-now.multirabbit</groupId>
+    <groupId>com.wandercosta.multirabbit</groupId>
     <artifactId>spring-multirabbit-example-java</artifactId>
     <version>2.7.1-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -20,7 +20,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.free-now.multirabbit</groupId>
+            <groupId>com.wandercosta.multirabbit</groupId>
             <artifactId>spring-multirabbit</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-java/src/main/java/com/wandercosta/multirabbit/example/java/Application.java b/spring-multirabbit-examples/spring-multirabbit-example-java/src/main/java/com/wandercosta/multirabbit/example/java/Application.java
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.java;
+package com.wandercosta.multirabbit.example.java;
 
 import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 import org.springframework.boot.SpringApplication;
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-java/src/main/java/com/wandercosta/multirabbit/example/java/SomeController.java b/spring-multirabbit-examples/spring-multirabbit-example-java/src/main/java/com/wandercosta/multirabbit/example/java/SomeController.java
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.java;
+package com.wandercosta.multirabbit.example.java;
 
 import org.springframework.amqp.rabbit.connection.SimpleResourceHolder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-java/src/main/java/com/wandercosta/multirabbit/example/java/SomeListeners.java b/spring-multirabbit-examples/spring-multirabbit-example-java/src/main/java/com/wandercosta/multirabbit/example/java/SomeListeners.java
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.java;
+package com.wandercosta.multirabbit.example.java;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-java/src/test/java/com/wandercosta/multirabbit/example/java/ApplicationTest.java b/spring-multirabbit-examples/spring-multirabbit-example-java/src/test/java/com/wandercosta/multirabbit/example/java/ApplicationTest.java
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.java;
+package com.wandercosta.multirabbit.example.java;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.amqp.rabbit.annotation.RabbitListenerAnnotationBeanPostProcessor;
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml b/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml
@@ -10,7 +10,7 @@
         <relativePath />
     </parent>
 
-    <groupId>com.free-now.multirabbit</groupId>
+    <groupId>com.wandercosta.multirabbit</groupId>
     <artifactId>spring-multirabbit-example-kotlin</artifactId>
     <version>2.7.1-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -20,7 +20,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.free-now.multirabbit</groupId>
+            <groupId>com.wandercosta.multirabbit</groupId>
             <artifactId>spring-multirabbit</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-kotlin/src/main/kotlin/com/wandercosta/multirabbit/example/kotlin/Application.kt b/spring-multirabbit-examples/spring-multirabbit-example-kotlin/src/main/kotlin/com/wandercosta/multirabbit/example/kotlin/Application.kt
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.kotlin
+package com.wandercosta.multirabbit.example.kotlin
 
 import org.springframework.amqp.rabbit.annotation.EnableRabbit
 import org.springframework.boot.SpringApplication
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-kotlin/src/main/kotlin/com/wandercosta/multirabbit/example/kotlin/SomeController.kt b/spring-multirabbit-examples/spring-multirabbit-example-kotlin/src/main/kotlin/com/wandercosta/multirabbit/example/kotlin/SomeController.kt
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.kotlin
+package com.wandercosta.multirabbit.example.kotlin
 
 import org.springframework.amqp.rabbit.connection.SimpleResourceHolder
 import org.springframework.amqp.rabbit.core.RabbitTemplate
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-kotlin/src/main/kotlin/com/wandercosta/multirabbit/example/kotlin/SomeListeners.kt b/spring-multirabbit-examples/spring-multirabbit-example-kotlin/src/main/kotlin/com/wandercosta/multirabbit/example/kotlin/SomeListeners.kt
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.kotlin
+package com.wandercosta.multirabbit.example.kotlin
 
 import mu.KLogging
 import org.springframework.amqp.rabbit.annotation.Exchange
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-kotlin/src/test/kotlin/com/wandercosta/multirabbit/example/kotlin/ApplicationTest.kt b/spring-multirabbit-examples/spring-multirabbit-example-kotlin/src/test/kotlin/com/wandercosta/multirabbit/example/kotlin/ApplicationTest.kt
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.kotlin
+package com.wandercosta.multirabbit.example.kotlin
 
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Assertions.assertTrue
diff --git a/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml b/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml
@@ -10,7 +10,7 @@
         <relativePath />
     </parent>
 
-    <groupId>com.free-now.multirabbit</groupId>
+    <groupId>com.wandercosta.multirabbit</groupId>
     <artifactId>spring-multirabbit-extended-example-java</artifactId>
     <version>2.7.1-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -25,7 +25,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.free-now.multirabbit</groupId>
+            <groupId>com.wandercosta.multirabbit</groupId>
             <artifactId>spring-multirabbit</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/spring-multirabbit-examples/spring-multirabbit-extension-example/src/main/java/com/wandercosta/multirabbit/example/extension/Application.java b/spring-multirabbit-examples/spring-multirabbit-extension-example/src/main/java/com/wandercosta/multirabbit/example/extension/Application.java
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.extension;
+package com.wandercosta.multirabbit.example.extension;
 
 import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 import org.springframework.boot.SpringApplication;
diff --git a/spring-multirabbit-examples/spring-multirabbit-extension-example/src/main/java/com/wandercosta/multirabbit/example/extension/ExtendedConfiguration.java b/spring-multirabbit-examples/spring-multirabbit-extension-example/src/main/java/com/wandercosta/multirabbit/example/extension/ExtendedConfiguration.java
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.extension;
+package com.wandercosta.multirabbit.example.extension;
 
 import org.springframework.amqp.rabbit.config.AbstractRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
diff --git a/spring-multirabbit-examples/spring-multirabbit-extension-example/src/main/java/com/wandercosta/multirabbit/example/extension/SomeController.java b/spring-multirabbit-examples/spring-multirabbit-extension-example/src/main/java/com/wandercosta/multirabbit/example/extension/SomeController.java
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.extension;
+package com.wandercosta.multirabbit.example.extension;
 
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.boot.autoconfigure.amqp.ConnectionFactoryContextWrapper;
diff --git a/spring-multirabbit-examples/spring-multirabbit-extension-example/src/main/java/com/wandercosta/multirabbit/example/extension/SomeListeners.java b/spring-multirabbit-examples/spring-multirabbit-extension-example/src/main/java/com/wandercosta/multirabbit/example/extension/SomeListeners.java
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.extension;
+package com.wandercosta.multirabbit.example.extension;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-multirabbit-examples/spring-multirabbit-extension-example/src/test/java/com/wandercosta/multirabbit/example/extension/ApplicationTest.java b/spring-multirabbit-examples/spring-multirabbit-extension-example/src/test/java/com/wandercosta/multirabbit/example/extension/ApplicationTest.java
@@ -1,4 +1,4 @@
-package com.freenow.multirabbit.example.extension;
+package com.wandercosta.multirabbit.example.extension;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -15,9 +15,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static com.freenow.multirabbit.example.extension.ExtendedConfiguration.EXTENDED_CONNECTION_A;
-import static com.freenow.multirabbit.example.extension.ExtendedConfiguration.EXTENDED_CONNECTION_B;
-import static com.freenow.multirabbit.example.extension.ExtendedConfiguration.EXTENDED_CONNECTION_C;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -48,8 +45,9 @@ void shouldLoadRabbitListenerAnnotationBeanPostProcessorBean() {
     void shouldResolveContainerFactoryBeans() {
         List<String> beans = Arrays.asList(applicationContext
                 .getBeanNamesForType(SimpleRabbitListenerContainerFactory.class));
-        assertTrue(beans.containsAll(Arrays.asList("rabbitListenerContainerFactory", EXTENDED_CONNECTION_A,
-                EXTENDED_CONNECTION_B, EXTENDED_CONNECTION_C)));
+        assertTrue(beans.containsAll(Arrays.asList("rabbitListenerContainerFactory",
+                ExtendedConfiguration.EXTENDED_CONNECTION_A,
+                ExtendedConfiguration.EXTENDED_CONNECTION_B, ExtendedConfiguration.EXTENDED_CONNECTION_C)));
         beans.forEach(bean -> assertNotNull(applicationContext
                 .getBean(bean, SimpleRabbitListenerContainerFactory.class)));
     }
@@ -59,9 +57,9 @@ void shouldResolveRabbitAdminBeans() {
         List<String> beans = Arrays.asList(applicationContext.getBeanNamesForType(RabbitAdmin.class));
         Assertions.assertThat(beans).contains(
                 MultiRabbitConstants.DEFAULT_RABBIT_ADMIN_BEAN_NAME,
-                EXTENDED_CONNECTION_A + MultiRabbitConstants.RABBIT_ADMIN_SUFFIX,
-                EXTENDED_CONNECTION_B + MultiRabbitConstants.RABBIT_ADMIN_SUFFIX,
-                EXTENDED_CONNECTION_C + MultiRabbitConstants.RABBIT_ADMIN_SUFFIX);
+                ExtendedConfiguration.EXTENDED_CONNECTION_A + MultiRabbitConstants.RABBIT_ADMIN_SUFFIX,
+                ExtendedConfiguration.EXTENDED_CONNECTION_B + MultiRabbitConstants.RABBIT_ADMIN_SUFFIX,
+                ExtendedConfiguration.EXTENDED_CONNECTION_C + MultiRabbitConstants.RABBIT_ADMIN_SUFFIX);
         beans.forEach(bean -> assertNotNull(applicationContext.getBean(bean, RabbitAdmin.class)));
     }
 }
diff --git a/spring-multirabbit/pom.xml b/spring-multirabbit/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.free-now.multirabbit</groupId>
+        <groupId>com.wandercosta.multirabbit</groupId>
         <artifactId>spring-multirabbit-parent</artifactId>
         <version>2.7.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -13,7 +13,7 @@
 
     <name>Spring MultiRabbit Library</name>
     <description>Library to extend Spring to provide connection to multiple RabbitMQ servers</description>
-    <url>https://github.com/freenowtech/spring-multirabbit</url>
+    <url>https://github.com/rwanderc/spring-multirabbit</url>
 
     <dependencies>
         <dependency>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.freenow.multirabbit.example.java;`
	`1`	`+package com.wandercosta.multirabbit.example.java;`
`2`	`2`
`3`	`3`	`import org.springframework.amqp.rabbit.annotation.EnableRabbit;`
`4`	`4`	`import org.springframework.boot.SpringApplication;`