diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml index df09ebe..fac14a9 100644 --- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml +++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml @@ -57,7 +57,7 @@ body: label: Version description: What version of our software are you running? options: - - 2.1.1 (Default) + - 2.2.0 (Default) - 1.3.5 - older (<1.3.5) validations: diff --git a/.github/workflows/github-build-release.yml b/.github/workflows/github-build-release.yml index b4a6da1..d428be1 100644 --- a/.github/workflows/github-build-release.yml +++ b/.github/workflows/github-build-release.yml @@ -44,6 +44,16 @@ jobs: asset_path: ./target/kafka-connect-mq-source-${{env.VERSION}}-jar-with-dependencies.jar asset_name: kafka-connect-mq-source-${{env.VERSION}}-jar-with-dependencies.jar asset_content_type: application/java-archive + - name: Upload Release Asset With non-MQ Dependencies + id: upload-release-asset-with-dependencies-exc-mq + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./target/kafka-connect-mq-source-${{env.VERSION}}-dependencies-exc-mq.jar + asset_name: kafka-connect-mq-source-${{env.VERSION}}-dependencies-exc-mq.jar + asset_content_type: application/java-archive - name: Upload Release Asset id: upload-release-asset uses: actions/upload-release-asset@v1 diff --git a/pom.xml b/pom.xml index 33f97ed..402a1ce 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ com.ibm.eventstreams.connect kafka-connect-mq-source jar - 2.1.1 + 2.2.0 kafka-connect-mq-source IBM Corporation @@ -45,13 +45,13 @@ org.apache.kafka connect-api - 3.6.2 + 3.7.1 provided org.apache.kafka connect-json - 3.6.2 + 3.7.1 provided @@ -63,7 +63,7 @@ com.ibm.mq com.ibm.mq.allclient - 9.3.3.1 + 9.4.0.5 @@ -81,12 +81,12 @@ org.slf4j slf4j-api - 2.0.7 + 2.0.16 org.slf4j slf4j-simple - 2.0.7 + 2.0.16 test @@ -94,14 +94,14 @@ org.testcontainers testcontainers - 1.17.6 + 1.20.1 test org.assertj assertj-core - 3.24.2 + 3.26.3 test @@ -127,7 +127,7 @@ maven-compiler-plugin - 3.1 + 3.13.0 1.8 1.8 @@ -138,7 +138,7 @@ maven-surefire-plugin - 3.0.0-M7 + 3.4.0 ${surefire.jacoco.args} @@ -153,7 +153,7 @@ maven-failsafe-plugin - 3.0.0-M7 + 3.5.0 ${failsafe.jacoco.args} @@ -174,23 +174,38 @@ - + maven-assembly-plugin - 3.4.1 + 3.7.1 + + dependencies-all package single + + + src/assembly/package.xml + + + + + + dependencies-exc-mq + package + + single + + + + src/assembly/package-excludemq.xml + + - - - src/assembly/package.xml - - @@ -199,7 +214,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.6.0 add-test-source @@ -220,7 +235,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.12 before-unit-test-execution @@ -304,7 +319,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.0 + 3.5.0 true true diff --git a/src/assembly/package-excludemq.xml b/src/assembly/package-excludemq.xml new file mode 100644 index 0000000..f395787 --- /dev/null +++ b/src/assembly/package-excludemq.xml @@ -0,0 +1,50 @@ + + + + dependencies-exc-mq + + jar + + false + + + LICENSE + + + + + + + true + + + **/copyright-exclude + META-INF/maven/** + META-INF/LICENSE* + + + + com.ibm.mq:com.ibm.mq.allclient + + true + runtime + + + \ No newline at end of file diff --git a/src/main/java/com/ibm/eventstreams/connect/mqsource/MQSourceConnector.java b/src/main/java/com/ibm/eventstreams/connect/mqsource/MQSourceConnector.java index 453056f..1621055 100644 --- a/src/main/java/com/ibm/eventstreams/connect/mqsource/MQSourceConnector.java +++ b/src/main/java/com/ibm/eventstreams/connect/mqsource/MQSourceConnector.java @@ -175,7 +175,7 @@ public class MQSourceConnector extends SourceConnector { CONFIG_VALUE_MQ_CLIENT_RECONNECT_OPTION_DISABLED.toLowerCase(Locale.ENGLISH) }; - public static String version = "2.1.1"; + public static String version = "2.2.0"; private Map configProps;