Skip to content

Use SN bom #1606

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

Merged
Technoboy- merged 2 commits into from
Jan 14, 2025
Merged

Use SN bom #1606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e8d55f
Use sn bom
yaalsn Jan 13, 2025
ee592de
Add other jars
yaalsn Jan 13, 2025
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
5 changes: 5 additions & 0 deletions .github/workflows/pr_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ jobs:
distribution: 'temurin'
java-version: 17

- name: Configure Maven Settings
uses: s4u/[email protected]
with:
servers: '[{"id": "github", "username": "streamnativebot", "password": "${{ secrets.SNBOT_GITHUB_TOKEN }}"}]'

- name: License check
run: mvn license:check

Expand Down
77 changes: 18 additions & 59 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@
<mockito.version>2.22.0</mockito.version>
<testng.version>6.14.3</testng.version>
<awaitility.version>4.0.2</awaitility.version>
<pulsar.version>4.0.0-ursa-5-SNAPSHOT</pulsar.version>
<mqtt.codec.version>4.1.94.Final</mqtt.codec.version>
<pulsar.version>4.1.0-SNAPSHOT</pulsar.version>
<sn.bom.version>4.1.0-SNAPSHOT</sn.bom.version>
<mqtt.codec.version>4.1.115.Final</mqtt.codec.version>
<log4j2.version>2.18.0</log4j2.version>
<fusesource.client.version>1.16</fusesource.client.version>
<hivemq.mqtt.client.version>1.2.2</hivemq.mqtt.client.version>
Expand All @@ -76,58 +77,20 @@
<dependency>
<groupId>io.streamnative</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${pulsar.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
</exclusion>
</exclusions>
</dependency>


<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-mqtt</artifactId>
<version>${mqtt.codec.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${apache.commons.bean-utils.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Expand All @@ -150,24 +113,21 @@
<dependency>
<groupId>dev.cel</groupId>
<artifactId>cel</artifactId>
<version>0.5.2</version>
<!-- It included in snoidc-broker-common -->
<scope>provided</scope>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>io.streamnative</groupId>
<artifactId>streamnative-bom</artifactId>
<version>${sn.bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>


<build>
<pluginManagement>
Expand Down Expand Up @@ -390,16 +350,15 @@
<url>https://repo1.maven.org/maven2</url>
</repository>
<repository>
<id>snapshot</id>
<id>nexus-snapshot</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>
<id>github</id>
<url>https://maven.pkg.github.com/streamnative/streamnative-bom</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<distributionManagement>
Expand Down
4 changes: 3 additions & 1 deletion scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,7 @@ ASSETS_DIR=release
mkdir $ASSETS_DIR

mvn clean install -DskipTests -Dmaven.wagon.http.retryHandler.count=3
mv mqtt-broker/target/pulsar-protocol-handler-mqtt-*.nar ./$ASSETS_DIR
mv mqtt-broker/target/pulsar-protocol-handler-mqtt-*.jar ./$ASSETS_DIR/pulsar-protocol-handle
mv mqtt-common/target/pulsar-protocol-handler-mqtt-common-*.jar ./$ASSETS_DIR/
mv mqtt-proxy/target/pulsar-protocol-handler-mqtt-proxy-*.jar ./$ASSETS_DIR/
cp README.md ./$ASSETS_DIR/pulsar-protocol-handler-mqtt-readme.md
Loading