Skip to content

Commit fb50376

Browse files
dalelanedalelane
authored
chore: prepare new release (#139)
This commit includes three changes, in preparation for a new release of the connector: - increment version number, representing the new config option for client reconnect options (according to semver) - update dependencies in pom.xml to the latest versions - introduce a new version of the jar that includes all of the dependencies except for the MQ client jar, to allow for deployment using different MQ client jar versions Signed-off-by: Dale Lane <dale.lane@uk.ibm.com>
1 parent 7e9d940 commit fb50376

File tree

5 files changed

+98
-23
lines changed

5 files changed

+98
-23
lines changed

‎.github/ISSUE_TEMPLATE/BUG-REPORT.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ body:
5757
label: Version
5858
description: What version of our software are you running?
5959
options:
60-
- 2.1.1 (Default)
60+
- 2.2.0 (Default)
6161
- 1.3.5
6262
- older (<1.3.5)
6363
validations:

‎.github/workflows/github-build-release.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@ jobs:
4444
asset_path: ./target/kafka-connect-mq-source-${{env.VERSION}}-jar-with-dependencies.jar
4545
asset_name: kafka-connect-mq-source-${{env.VERSION}}-jar-with-dependencies.jar
4646
asset_content_type: application/java-archive
47+
- name: Upload Release Asset With non-MQ Dependencies
48+
id: upload-release-asset-with-dependencies-exc-mq
49+
uses: actions/upload-release-asset@v1
50+
env:
51+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52+
with:
53+
upload_url: ${{ steps.create_release.outputs.upload_url }}
54+
asset_path: ./target/kafka-connect-mq-source-${{env.VERSION}}-dependencies-exc-mq.jar
55+
asset_name: kafka-connect-mq-source-${{env.VERSION}}-dependencies-exc-mq.jar
56+
asset_content_type: application/java-archive
4757
- name: Upload Release Asset
4858
id: upload-release-asset
4959
uses: actions/upload-release-asset@v1

‎pom.xml‎

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<groupId>com.ibm.eventstreams.connect</groupId>
2121
<artifactId>kafka-connect-mq-source</artifactId>
2222
<packaging>jar</packaging>
23-
<version>2.1.1</version>
23+
<version>2.2.0</version>
2424
<name>kafka-connect-mq-source</name>
2525
<organization>
2626
<name>IBM Corporation</name>
@@ -45,13 +45,13 @@
4545
<dependency>
4646
<groupId>org.apache.kafka</groupId>
4747
<artifactId>connect-api</artifactId>
48-
<version>3.6.2</version>
48+
<version>3.7.1</version>
4949
<scope>provided</scope>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.apache.kafka</groupId>
5353
<artifactId>connect-json</artifactId>
54-
<version>3.6.2</version>
54+
<version>3.7.1</version>
5555
<scope>provided</scope>
5656
</dependency>
5757

@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.ibm.mq</groupId>
6565
<artifactId>com.ibm.mq.allclient</artifactId>
66-
<version>9.3.3.1</version>
66+
<version>9.4.0.5</version>
6767
</dependency>
6868

6969
<dependency>
@@ -81,27 +81,27 @@
8181
<dependency>
8282
<groupId>org.slf4j</groupId>
8383
<artifactId>slf4j-api</artifactId>
84-
<version>2.0.7</version>
84+
<version>2.0.16</version>
8585
</dependency>
8686
<dependency>
8787
<groupId>org.slf4j</groupId>
8888
<artifactId>slf4j-simple</artifactId>
89-
<version>2.0.7</version>
89+
<version>2.0.16</version>
9090
<scope>test</scope>
9191
</dependency>
9292
<!-- tests in src/integration depend on a running MQ queue manager -->
9393
<!-- in a container, configured using org.testcontainers -->
9494
<dependency>
9595
<groupId>org.testcontainers</groupId>
9696
<artifactId>testcontainers</artifactId>
97-
<version>1.17.6</version>
97+
<version>1.20.1</version>
9898
<scope>test</scope>
9999
</dependency>
100100

101101
<dependency>
102102
<groupId>org.assertj</groupId>
103103
<artifactId>assertj-core</artifactId>
104-
<version>3.24.2</version>
104+
<version>3.26.3</version>
105105
<scope>test</scope>
106106
</dependency>
107107

@@ -127,7 +127,7 @@
127127

128128
<plugin>
129129
<artifactId>maven-compiler-plugin</artifactId>
130-
<version>3.1</version>
130+
<version>3.13.0</version>
131131
<configuration>
132132
<source>1.8</source>
133133
<target>1.8</target>
@@ -138,7 +138,7 @@
138138
<!-- run unit tests -->
139139
<plugin>
140140
<artifactId>maven-surefire-plugin</artifactId>
141-
<version>3.0.0-M7</version>
141+
<version>3.4.0</version>
142142
<configuration>
143143
<argLine>${surefire.jacoco.args}</argLine>
144144
<systemPropertyVariables>
@@ -153,7 +153,7 @@
153153
<!-- run integration tests -->
154154
<plugin>
155155
<artifactId>maven-failsafe-plugin</artifactId>
156-
<version>3.0.0-M7</version>
156+
<version>3.5.0</version>
157157
<configuration>
158158
<argLine>${failsafe.jacoco.args}</argLine>
159159
<systemPropertyVariables>
@@ -174,23 +174,38 @@
174174
</executions>
175175
</plugin>
176176

177-
<!-- build the release jar -->
177+
<!-- build the release jars -->
178178
<plugin>
179179
<artifactId>maven-assembly-plugin</artifactId>
180-
<version>3.4.1</version>
180+
<version>3.7.1</version>
181181
<executions>
182+
<!-- an uber jar including all runtime dependencies -->
182183
<execution>
184+
<id>dependencies-all</id>
183185
<phase>package</phase>
184186
<goals>
185187
<goal>single</goal>
186188
</goals>
189+
<configuration>
190+
<descriptors>
191+
<descriptor>src/assembly/package.xml</descriptor>
192+
</descriptors>
193+
</configuration>
194+
</execution>
195+
<!-- an uber jar including runtime dependencies other than the MQ client -->
196+
<execution>
197+
<id>dependencies-exc-mq</id>
198+
<phase>package</phase>
199+
<goals>
200+
<goal>single</goal>
201+
</goals>
202+
<configuration>
203+
<descriptors>
204+
<descriptor>src/assembly/package-excludemq.xml</descriptor>
205+
</descriptors>
206+
</configuration>
187207
</execution>
188208
</executions>
189-
<configuration>
190-
<descriptors>
191-
<descriptor>src/assembly/package.xml</descriptor>
192-
</descriptors>
193-
</configuration>
194209
</plugin>
195210

196211
<!-- add the src/integration folder as a test folder, which lets us keep -->
@@ -199,7 +214,7 @@
199214
<plugin>
200215
<groupId>org.codehaus.mojo</groupId>
201216
<artifactId>build-helper-maven-plugin</artifactId>
202-
<version>3.3.0</version>
217+
<version>3.6.0</version>
203218
<executions>
204219
<execution>
205220
<id>add-test-source</id>
@@ -220,7 +235,7 @@
220235
<plugin>
221236
<groupId>org.jacoco</groupId>
222237
<artifactId>jacoco-maven-plugin</artifactId>
223-
<version>0.8.8</version>
238+
<version>0.8.12</version>
224239
<executions>
225240
<execution>
226241
<id>before-unit-test-execution</id>
@@ -304,7 +319,7 @@
304319
<plugin>
305320
<groupId>org.apache.maven.plugins</groupId>
306321
<artifactId>maven-checkstyle-plugin</artifactId>
307-
<version>3.2.0</version>
322+
<version>3.5.0</version>
308323
<configuration>
309324
<consoleOutput>true</consoleOutput>
310325
<failsOnError>true</failsOnError>

‎src/assembly/package-excludemq.xml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
* Copyright 2018, 2024 IBM Corporation
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
-->
17+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
20+
http://maven.apache.org/xsd/assembly-2.0.0.xsd">
21+
<id>dependencies-exc-mq</id>
22+
<formats>
23+
<format>jar</format>
24+
</formats>
25+
<includeBaseDirectory>false</includeBaseDirectory>
26+
<files>
27+
<file>
28+
<source>LICENSE</source>
29+
<outputDirectory></outputDirectory>
30+
</file>
31+
</files>
32+
<dependencySets>
33+
<dependencySet>
34+
<outputDirectory></outputDirectory>
35+
<unpack>true</unpack>
36+
<unpackOptions>
37+
<excludes>
38+
<exclude>**/copyright-exclude</exclude>
39+
<exclude>META-INF/maven/**</exclude>
40+
<exclude>META-INF/LICENSE*</exclude>
41+
</excludes>
42+
</unpackOptions>
43+
<excludes>
44+
<exclude>com.ibm.mq:com.ibm.mq.allclient</exclude>
45+
</excludes>
46+
<useTransitiveFiltering>true</useTransitiveFiltering>
47+
<scope>runtime</scope>
48+
</dependencySet>
49+
</dependencySets>
50+
</assembly>

‎src/main/java/com/ibm/eventstreams/connect/mqsource/MQSourceConnector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public class MQSourceConnector extends SourceConnector {
175175
CONFIG_VALUE_MQ_CLIENT_RECONNECT_OPTION_DISABLED.toLowerCase(Locale.ENGLISH)
176176
};
177177

178-
public static String version = "2.1.1";
178+
public static String version = "2.2.0";
179179

180180
private Map<String, String> configProps;
181181

0 commit comments

Comments
 (0)