|
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <!-- |
3 | | - * Copyright 2017, 2020, 2023 IBM Corporation |
| 3 | + * Copyright 2017, 2020, 2023, 2024 IBM Corporation |
4 | 4 | * |
5 | 5 | * Licensed under the Apache License, Version 2.0 (the "License"); |
6 | 6 | * you may not use this file except in compliance with the License. |
|
13 | 13 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
14 | 14 | * See the License for the specific language governing permissions and |
15 | 15 | * limitations under the License. |
16 | | ---> |
17 | | -<project xmlns="http://maven.apache.org/POM/4.0.0" |
18 | | - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
19 | | - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
| 16 | + --> |
| 17 | +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
| 18 | + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
20 | 19 | <modelVersion>4.0.0</modelVersion> |
21 | 20 | <groupId>com.ibm.eventstreams.connect</groupId> |
22 | 21 | <artifactId>kafka-connect-mq-source</artifactId> |
23 | 22 | <packaging>jar</packaging> |
24 | | - <version>1.3.5</version> |
| 23 | + <version>2.1.0</version> |
25 | 24 | <name>kafka-connect-mq-source</name> |
26 | 25 | <organization> |
27 | 26 | <name>IBM Corporation</name> |
|
46 | 45 | <dependency> |
47 | 46 | <groupId>org.apache.kafka</groupId> |
48 | 47 | <artifactId>connect-api</artifactId> |
49 | | - <version>3.4.0</version> |
| 48 | + <version>3.6.2</version> |
50 | 49 | <scope>provided</scope> |
51 | 50 | </dependency> |
52 | 51 | <dependency> |
53 | 52 | <groupId>org.apache.kafka</groupId> |
54 | 53 | <artifactId>connect-json</artifactId> |
55 | | - <version>3.4.0</version> |
| 54 | + <version>3.6.2</version> |
56 | 55 | <scope>provided</scope> |
57 | 56 | </dependency> |
58 | 57 |
|
|
81 | 80 | </dependency> |
82 | 81 | <dependency> |
83 | 82 | <groupId>org.slf4j</groupId> |
84 | | - <artifactId>slf4j-log4j12</artifactId> |
| 83 | + <artifactId>slf4j-api</artifactId> |
85 | 84 | <version>2.0.7</version> |
86 | | - <scope>test</scope> |
87 | 85 | </dependency> |
88 | 86 | <dependency> |
89 | 87 | <groupId>org.slf4j</groupId> |
90 | | - <artifactId>slf4j-api</artifactId> |
| 88 | + <artifactId>slf4j-simple</artifactId> |
91 | 89 | <version>2.0.7</version> |
| 90 | + <scope>test</scope> |
92 | 91 | </dependency> |
93 | 92 | <!-- tests in src/integration depend on a running MQ queue manager --> |
94 | 93 | <!-- in a container, configured using org.testcontainers --> |
|
98 | 97 | <version>1.17.6</version> |
99 | 98 | <scope>test</scope> |
100 | 99 | </dependency> |
| 100 | + |
| 101 | + <dependency> |
| 102 | + <groupId>org.assertj</groupId> |
| 103 | + <artifactId>assertj-core</artifactId> |
| 104 | + <version>3.24.2</version> |
| 105 | + <scope>test</scope> |
| 106 | + </dependency> |
| 107 | + |
101 | 108 | </dependencies> |
102 | 109 |
|
103 | 110 | <build> |
104 | 111 | <plugins> |
| 112 | + <plugin> |
| 113 | + <artifactId>maven-resources-plugin</artifactId> |
| 114 | + <version>3.3.1</version> |
| 115 | + <configuration> |
| 116 | + <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory> |
| 117 | + <resources> |
| 118 | + <resource> |
| 119 | + <directory>${project.basedir}</directory> |
| 120 | + <includes> |
| 121 | + <include>LICENSE</include> |
| 122 | + </includes> |
| 123 | + </resource> |
| 124 | + </resources> |
| 125 | + </configuration> |
| 126 | + </plugin> |
| 127 | + |
105 | 128 | <plugin> |
106 | 129 | <artifactId>maven-compiler-plugin</artifactId> |
107 | 130 | <version>3.1</version> |
|
121 | 144 | <systemPropertyVariables> |
122 | 145 | <connectorVersion>${project.version}</connectorVersion> |
123 | 146 | </systemPropertyVariables> |
| 147 | + <additionalClasspathElements> |
| 148 | + <additionalClasspathElement>src/test/resources</additionalClasspathElement> |
| 149 | + </additionalClasspathElements> |
124 | 150 | </configuration> |
125 | 151 | </plugin> |
126 | 152 |
|
|
133 | 159 | <systemPropertyVariables> |
134 | 160 | <connectorVersion>${project.version}</connectorVersion> |
135 | 161 | </systemPropertyVariables> |
| 162 | + <additionalClasspathElements> |
| 163 | + <additionalClasspathElement>src/test/resources</additionalClasspathElement> |
| 164 | + </additionalClasspathElements> |
136 | 165 | </configuration> |
137 | 166 | <executions> |
138 | 167 | <execution> |
|
187 | 216 | </executions> |
188 | 217 | </plugin> |
189 | 218 |
|
190 | | - |
191 | 219 | <!-- generate test code coverage report --> |
192 | 220 | <plugin> |
193 | 221 | <groupId>org.jacoco</groupId> |
|
200 | 228 | <goal>prepare-agent</goal> |
201 | 229 | </goals> |
202 | 230 | <configuration> |
203 | | - <destFile> |
204 | | - ${project.build.directory}/jacoco-output/jacoco-unit-tests.exec</destFile> |
| 231 | + <destFile>${project.build.directory}/jacoco-output/jacoco-unit-tests.exec</destFile> |
205 | 232 | <propertyName>surefire.jacoco.args</propertyName> |
206 | 233 | </configuration> |
207 | 234 | </execution> |
|
212 | 239 | <goal>report</goal> |
213 | 240 | </goals> |
214 | 241 | <configuration> |
215 | | - <dataFile> |
216 | | - ${project.build.directory}/jacoco-output/jacoco-unit-tests.exec</dataFile> |
217 | | - <outputDirectory> |
218 | | - ${project.reporting.outputDirectory}/jacoco-unit-test-coverage-report</outputDirectory> |
| 242 | + <dataFile>${project.build.directory}/jacoco-output/jacoco-unit-tests.exec</dataFile> |
| 243 | + <outputDirectory>${project.reporting.outputDirectory}/jacoco-unit-test-coverage-report |
| 244 | + </outputDirectory> |
219 | 245 | </configuration> |
220 | 246 | </execution> |
221 | 247 | <execution> |
|
225 | 251 | <goal>prepare-agent</goal> |
226 | 252 | </goals> |
227 | 253 | <configuration> |
228 | | - <destFile> |
229 | | - ${project.build.directory}/jacoco-output/jacoco-integration-tests.exec</destFile> |
| 254 | + <destFile>${project.build.directory}/jacoco-output/jacoco-integration-tests.exec</destFile> |
230 | 255 | <propertyName>failsafe.jacoco.args</propertyName> |
231 | 256 | </configuration> |
232 | 257 | </execution> |
|
237 | 262 | <goal>report</goal> |
238 | 263 | </goals> |
239 | 264 | <configuration> |
240 | | - <dataFile> |
241 | | - ${project.build.directory}/jacoco-output/jacoco-integration-tests.exec</dataFile> |
| 265 | + <dataFile>${project.build.directory}/jacoco-output/jacoco-integration-tests.exec</dataFile> |
242 | 266 | <outputDirectory> |
243 | | - ${project.reporting.outputDirectory}/jacoco-integration-test-coverage-report</outputDirectory> |
| 267 | + ${project.reporting.outputDirectory}/jacoco-integration-test-coverage-report |
| 268 | + </outputDirectory> |
244 | 269 | </configuration> |
245 | 270 | </execution> |
246 | 271 | <execution> |
|
269 | 294 | </goals> |
270 | 295 | <configuration> |
271 | 296 | <dataFile>${project.build.directory}/jacoco-output/merged.exec</dataFile> |
272 | | - <outputDirectory> |
273 | | - ${project.reporting.outputDirectory}/jacoco-merged-test-coverage-report</outputDirectory> |
| 297 | + <outputDirectory>${project.reporting.outputDirectory}/jacoco-merged-test-coverage-report |
| 298 | + </outputDirectory> |
274 | 299 | </configuration> |
275 | 300 | </execution> |
276 | 301 | </executions> |
277 | 302 | </plugin> |
| 303 | + |
278 | 304 | <plugin> |
279 | 305 | <groupId>org.apache.maven.plugins</groupId> |
280 | 306 | <artifactId>maven-checkstyle-plugin</artifactId> |
281 | 307 | <version>3.2.0</version> |
282 | 308 | <configuration> |
283 | | - <encoding>UTF-8</encoding> |
284 | 309 | <consoleOutput>true</consoleOutput> |
285 | 310 | <failsOnError>true</failsOnError> |
286 | 311 | <violationSeverity>warning</violationSeverity> |
|
301 | 326 | </executions> |
302 | 327 | </plugin> |
303 | 328 | </plugins> |
304 | | - |
305 | | - <!-- some integration tests use the custom mqsc file in the resources directory --> |
306 | 329 | <testResources> |
307 | 330 | <testResource> |
308 | 331 | <directory>src/integration/resources</directory> |
|
0 commit comments