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

chore: prepare new release #139

Merged
merged 1 commit into from
Sep 27, 2024
Merged

chore: prepare new release #139

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 .github/ISSUE_TEMPLATE/BUG-REPORT.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/github-build-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
57 changes: 36 additions & 21 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<groupId>com.ibm.eventstreams.connect</groupId>
<artifactId>kafka-connect-mq-source</artifactId>
<packaging>jar</packaging>
<version>2.1.1</version>
<version>2.2.0</version>
<name>kafka-connect-mq-source</name>
<organization>
<name>IBM Corporation</name>
Expand All @@ -45,13 +45,13 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-api</artifactId>
<version>3.6.2</version>
<version>3.7.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-json</artifactId>
<version>3.6.2</version>
<version>3.7.1</version>
<scope>provided</scope>
</dependency>

Expand All @@ -63,7 +63,7 @@
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>com.ibm.mq.allclient</artifactId>
<version>9.3.3.1</version>
<version>9.4.0.5</version>
</dependency>

<dependency>
Expand All @@ -81,27 +81,27 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.7</version>
<version>2.0.16</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.7</version>
<version>2.0.16</version>
<scope>test</scope>
</dependency>
<!-- tests in src/integration depend on a running MQ queue manager -->
<!-- in a container, configured using org.testcontainers -->
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.17.6</version>
<version>1.20.1</version>
<scope>test</scope>
</dependency>

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

Expand All @@ -127,7 +127,7 @@

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -138,7 +138,7 @@
<!-- run unit tests -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
<version>3.4.0</version>
<configuration>
<argLine>${surefire.jacoco.args}</argLine>
<systemPropertyVariables>
Expand All @@ -153,7 +153,7 @@
<!-- run integration tests -->
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M7</version>
<version>3.5.0</version>
<configuration>
<argLine>${failsafe.jacoco.args}</argLine>
<systemPropertyVariables>
Expand All @@ -174,23 +174,38 @@
</executions>
</plugin>

<!-- build the release jar -->
<!-- build the release jars -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.1</version>
<version>3.7.1</version>
<executions>
<!-- an uber jar including all runtime dependencies -->
<execution>
<id>dependencies-all</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/assembly/package.xml</descriptor>
</descriptors>
</configuration>
</execution>
<!-- an uber jar including runtime dependencies other than the MQ client -->
<execution>
<id>dependencies-exc-mq</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/assembly/package-excludemq.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
<configuration>
<descriptors>
<descriptor>src/assembly/package.xml</descriptor>
</descriptors>
</configuration>
</plugin>

<!-- add the src/integration folder as a test folder, which lets us keep -->
Expand All @@ -199,7 +214,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>add-test-source</id>
Expand All @@ -220,7 +235,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<version>0.8.12</version>
<executions>
<execution>
<id>before-unit-test-execution</id>
Expand Down Expand Up @@ -304,7 +319,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.0</version>
<version>3.5.0</version>
<configuration>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
Expand Down
50 changes: 50 additions & 0 deletions src/assembly/package-excludemq.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright 2018, 2024 IBM Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>dependencies-exc-mq</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
<source>LICENSE</source>
<outputDirectory></outputDirectory>
</file>
</files>
<dependencySets>
<dependencySet>
<outputDirectory></outputDirectory>
<unpack>true</unpack>
<unpackOptions>
<excludes>
<exclude>**/copyright-exclude</exclude>
<exclude>META-INF/maven/**</exclude>
<exclude>META-INF/LICENSE*</exclude>
</excludes>
</unpackOptions>
<excludes>
<exclude>com.ibm.mq:com.ibm.mq.allclient</exclude>
</excludes>
<useTransitiveFiltering>true</useTransitiveFiltering>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
</assembly>
2 changes: 1 addition & 1 deletion src/main/java/com/ibm/eventstreams/connect/mqsource/MQSourceConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, String> configProps;

Expand Down
Loading