diff --git a/image/Dockerfile b/image/Dockerfile index 15d82cd5..a23fb2eb 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -18,5 +18,5 @@ # ARG PULSAR_VERSION -FROM streamnative/pulsar-functions-java-runner:${PULSAR_VERSION} +FROM snstage/pulsar-functions-java-runner:${PULSAR_VERSION} COPY ../io-amqp1_0-impl/target/*.nar /pulsar/connectors/ diff --git a/io-amqp1_0-impl/pom.xml b/io-amqp1_0-impl/pom.xml index dcbe757c..43f8b1c7 100644 --- a/io-amqp1_0-impl/pom.xml +++ b/io-amqp1_0-impl/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>pulsar-io-amqp1_0-parent</artifactId> <groupId>org.apache.pulsar.ecosystem</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>4.0.1.1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index cf39e700..fa838efc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version='1.0' encoding='UTF-8'?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -19,24 +19,19 @@ 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> - <groupId>org.apache.pulsar.ecosystem</groupId> <artifactId>pulsar-io-amqp1_0-parent</artifactId> <packaging>pom</packaging> - <version>3.0.0-SNAPSHOT</version> + <version>4.0.1.1</version> <name>Pulsar Ecosystem :: IO Connector :: AMQP1_0</name> <description>This is an Apache Pulsar AMQP1_0 connector</description> - <properties> <maven.compiler.source>17</maven.compiler.source> <maven.compiler.target>17</maven.compiler.target> @@ -46,22 +41,19 @@ <redirectTestOutputToFile>false</redirectTestOutputToFile> <spotbugs-annotations.version>3.1.8</spotbugs-annotations.version> <testRetryCount>2</testRetryCount> - <!-- connector dependencies --> <jackson.version>2.12.6.1</jackson.version> <lombok.version>1.18.22</lombok.version> - <pulsar.version>3.0.1.2</pulsar.version> + <pulsar.version>4.0.1.1</pulsar.version> <qpid.version>1.8.0</qpid.version> <log4j2.version>2.17.1</log4j2.version> <slf4j.version>1.7.25</slf4j.version> - <!-- test dependencies --> <junit.version>4.13.1</junit.version> <mockito.version>2.22.0</mockito.version> <powermock.version>2.0.0-beta.5</powermock.version> <testcontainers.version>1.19.0</testcontainers.version> <awaitility.version>4.2.0</awaitility.version> - <!-- build plugin dependencies --> <license.plugin.version>3.0</license.plugin.version> <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version> @@ -71,7 +63,6 @@ <puppycrawl.checkstyle.version>6.19</puppycrawl.checkstyle.version> <spotbugs-maven-plugin.version>4.2.2</spotbugs-maven-plugin.version> </properties> - <licenses> <license> <name>Apache License, Version 2.0</name> @@ -79,12 +70,10 @@ <distribution>repo</distribution> </license> </licenses> - <modules> <module>io-amqp1_0-impl</module> <module>tests</module> </modules> - <!-- keep all the dependencies used by all modules here --> <dependencyManagement> <dependencies> @@ -146,17 +135,14 @@ </dependency> </dependencies> </dependencyManagement> - <!-- include the dependencies --> <dependencies> - <!-- connector --> <dependency> <groupId>org.apache.qpid</groupId> <artifactId>qpid-jms-client</artifactId> <version>${qpid.version}</version> </dependency> - <!-- log --> <dependency> <groupId>org.slf4j</groupId> @@ -173,7 +159,6 @@ <artifactId>log4j-slf4j-impl</artifactId> <version>${log4j2.version}</version> </dependency> - <!-- provided dependencies (available at compilation and test classpaths and *NOT* packaged) --> <dependency> <groupId>org.projectlombok</groupId> @@ -185,23 +170,19 @@ <artifactId>spotbugs-annotations</artifactId> <scope>provided</scope> </dependency> - <!-- runtime dependencies --> <dependency> <groupId>io.streamnative</groupId> <artifactId>pulsar-io-common</artifactId> </dependency> - <dependency> <groupId>io.streamnative</groupId> <artifactId>pulsar-io-core</artifactId> </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> - <!-- test dependencies --> <dependency> <groupId>junit</groupId> @@ -234,7 +215,6 @@ <scope>test</scope> </dependency> </dependencies> - <build> <pluginManagement> <plugins> @@ -246,12 +226,12 @@ <source>${java.version}</source> <target>${java.version}</target> <compilerArgs> -<!-- <compilerArg>-Werror</compilerArg>--> + <!-- <compilerArg>-Werror</compilerArg>--> <compilerArg>-Xlint:deprecation</compilerArg> <compilerArg>-Xlint:unchecked</compilerArg> <!-- https://issues.apache.org/jira/browse/MCOMPILER-205 --> <compilerArg>-Xpkginfo:always</compilerArg> - </compilerArgs> + </compilerArgs> </configuration> </plugin> <!-- test --> @@ -372,38 +352,32 @@ </plugin> </plugins> </pluginManagement> - <plugins> - <!-- compile --> + <!-- compile --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> </plugin> - <!-- test --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> </plugin> - <!-- package --> <plugin> <groupId>org.apache.nifi</groupId> <artifactId>nifi-nar-maven-plugin</artifactId> </plugin> - <!-- license --> <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> </plugin> - <!-- checkstyle --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> - <!-- spotbugs --> <plugin> <groupId>com.github.spotbugs</groupId> @@ -411,5 +385,24 @@ </plugin> </plugins> </build> - + <repositories> + <repository> + <id>ossrh</id> + <url>https://s01.oss.sonatype.org/service/local/repositories/iostreamnative-3557/content</url> + </repository> + <repository> + <id>nexus-snapshot-ci</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> diff --git a/tests/Dockerfile b/tests/Dockerfile index 7836b185..b08fb70a 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -18,7 +18,7 @@ # ARG PULSAR_IMAGE_TAG -FROM streamnative/pulsar:${PULSAR_IMAGE_TAG} +FROM snstage/pulsar:${PULSAR_IMAGE_TAG} USER root diff --git a/tests/pom.xml b/tests/pom.xml index 023a08e2..a1772036 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>pulsar-io-amqp1_0-parent</artifactId> <groupId>org.apache.pulsar.ecosystem</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>4.0.1.1</version> </parent> <modelVersion>4.0.0</modelVersion>