Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump aop version to 4.0.0-ursa-1 #1341

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Bump aop version to 4.0.0-ursa-1 #1341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion amqp-client-auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>pulsar-protocol-handler-amqp-parent</artifactId>
<groupId>io.streamnative.pulsar.handlers</groupId>
<version>3.3.0-SNAPSHOT</version>
<version>4.0.0-ursa-1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion amqp-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.streamnative.pulsar.handlers</groupId>
<artifactId>pulsar-protocol-handler-amqp-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>4.0.0-ursa-1</version>
</parent>

<artifactId>pulsar-protocol-handler-amqp</artifactId>
Expand Down
69 changes: 22 additions & 47 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version='1.0' encoding='UTF-8'?>
<!--

Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -14,44 +14,35 @@
limitations under the License.

-->
<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">

<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">
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>18</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<packaging>pom</packaging>

<groupId>io.streamnative.pulsar.handlers</groupId>
<artifactId>pulsar-protocol-handler-amqp-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>4.0.0-ursa-1</version>
<name>StreamNative :: Pulsar Protocol Handler :: AoP Parent</name>
<description>Parent for AMQP on Pulsar implemented using Pulsar Protocol Handler.</description>

<properties>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.compiler.release>${maven.compiler.target}</project.compiler.release>

<!-- dependencies -->
<pulsar.version>3.4.0-SNAPSHOT</pulsar.version>
<pulsar.version>4.0.0-ursa-1</pulsar.version>
<qpid-protocol-plugin.version>8.0.0</qpid-protocol-plugin.version>
<rabbitmq.version>5.8.0</rabbitmq.version>

<!-- test dependencies -->
<qpid-client-version>6.4.0</qpid-client-version>
<geronimo-jms-version>1.1.1</geronimo-jms-version>
<testcontainers.version>1.12.5</testcontainers.version>
<testng.version>6.14.3</testng.version>
<awaitility.version>4.2.0</awaitility.version>
<assertj.version>3.15.0</assertj.version>

<!-- plugin dependencies -->
<spotbugs-annotations.version>3.1.8</spotbugs-annotations.version>
<dockerfile-maven.version>1.4.9</dockerfile-maven.version>
Expand All @@ -63,86 +54,72 @@
<puppycrawl.checkstyle.version>8.37</puppycrawl.checkstyle.version>
<spotbugs-maven-plugin.version>4.2.2</spotbugs-maven-plugin.version>
</properties>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<modules>
<module>amqp-impl</module>
<module>tests</module>
<module>tests-qpid-jms-client</module>
<module>amqp-client-auth</module>
</modules>

<!-- dependency definitions -->
<dependencyManagement>
<dependencies>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar</artifactId>
<version>${pulsar.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${pulsar.version}</version>
</dependency>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${pulsar.version}</version>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>testmocks</artifactId>
<version>${pulsar.version}</version>
</dependency>

<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>${rabbitmq.version}</version>
</dependency>

<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
<version>${qpid-client-version}</version>
</dependency>

<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${geronimo-jms-version}</version>
</dependency>

<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-test-utils</artifactId>
<version>${qpid-protocol-plugin.version}</version>
</dependency>

<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>${spotbugs-annotations.version}</version>
</dependency>

</dependencies>
</dependencyManagement>

<!-- These dependencies are common to all submodules -->
<dependencies>
<!-- provided dependencies (available at compilation and test classpths and *NOT* packaged) -->
Expand All @@ -151,67 +128,56 @@
<artifactId>pulsar-broker</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<scope>provided</scope>
</dependency>

<!-- dependencies for tests -->
<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.streamnative</groupId>
<artifactId>testmocks</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

<!-- TODO Currently, some tests use junit tool, we can unify the test framework in the future -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<pluginManagement>
<plugins>
Expand Down Expand Up @@ -260,7 +226,6 @@
<excludeFilterFile>resources/findbugsExclude.xml</excludeFilterFile>
</configuration>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
Expand All @@ -277,7 +242,6 @@
</compilerArgs>
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
Expand All @@ -293,14 +257,12 @@
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>

<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>${license-maven-plugin.version}</version>
<configuration>
<header>resources/license.template</header>

<excludes>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
Expand Down Expand Up @@ -330,7 +292,6 @@
</mapping>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>templating-maven-plugin</artifactId>
Expand All @@ -344,7 +305,6 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
Expand All @@ -370,10 +330,8 @@
<commitIdGenerationMode>full</commitIdGenerationMode>
</configuration>
</plugin>

</plugins>
</build>

<repositories>
<repository>
<id>central</id>
Expand All @@ -384,6 +342,23 @@
<id>nexus-snapshot-repo</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<repository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/repositories/0/content</url>
</repository>
<repository>
<id>nexus-snapshot</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>

<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>
</project>
2 changes: 1 addition & 1 deletion tests-qpid-jms-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>io.streamnative.pulsar.handlers</groupId>
<artifactId>pulsar-protocol-handler-amqp-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>4.0.0-ursa-1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.streamnative.pulsar.handlers</groupId>
<artifactId>pulsar-protocol-handler-amqp-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>4.0.0-ursa-1</version>
</parent>

<groupId>io.streamnative.pulsar.handlers</groupId>
Expand Down
Loading