MQ V2 Sink OSS release (#65)

* feat: travis script to login to docker registry (#25) Contributes to: event-integration/qp-planning#10883 Signed-off-by: Joel Hanson <[email protected]> * fix: try running the travis job without docker login (#26) Contributes to: event-integration/qp-planning#10883 Signed-off-by: Joel Hanson <[email protected]> * Exactly-once message delivery semantics support (#9) * fix: Move config to MQSinkConfig from MQSinkConnector Signed-off-by: Joel Hanson <[email protected]> * tests: New tests to check the duplicates Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * - Added assertj - refactored duplicate record test + added another for connect crash. * - Changed AuthIt tests to have specific host ports. - Refactored testcontainer out from DuplicateIT into AbstractJMSContextIT * feat: Make topic name and partition variables Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * Updated logging packages * feat: Intitial change for exactly once semantics Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: handle unprovided sidequeue scenario Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Intitial change for exactly once semantics Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: checkstyle changes Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * fix: Static variables should be in UPPER_CASE Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Latest changes for mq sink connector Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Update config property names and consume messages as TextMessage Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * Removed a error being sent to standard out. * feat: Test update based on feedback Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Rename JMSWriter to JMSWorker Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: map based only once delivery Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: tests for only-once delivery Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: check if the max tasks is 1 and throw an exception if not Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Update changes based on feedback from PR Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Remove max task check from connector code Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: exception testing for only-once Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * fix: Tests to check JMSRuntimeException and jsonException is only thrown Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * fix: failing tests Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * Updated MQ to remove vulnerability * feat: Rename JMSWriter to JMSWorker Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: map based only once delivery Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: tests for only-once delivery Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: check if the max tasks is 1 and throw an exception if not Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Update changes based on feedback from PR Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Remove max task check from connector code Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Check max task if the connector is configured with side queue Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * fix: rename writer to worker Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Update config value names to match MQ_EXACTLY_ONCE_STATE_QUEUE Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Update state queue exception handling Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Changes with the new configSupportsExactlyOnce method Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Update version to 2.0.0 (#14) * feat: Update version to 1.6.0 Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Update version to 2.0.0 Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: New tests for atleast once behaviour with failing conditions. (#18) * feat: New tests for only once to recreate faliure Contributes to: mhub/qp-planning#10748 Signed-off-by: Joel Hanson <[email protected]> * fix: fix licence formatting and new line at the end Contributes to: mhub/qp-planning#10748 Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Add missing Legal disclaimer (#19) * feat: Add missing Legal disclaimer Contributes to: mhub/qp-planning#<issue number> Signed-off-by: Joel Hanson <[email protected]> * feat: Add current year to the legal disclaimer Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * feat: Add LICENSES Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * fix: Updated to latest LICENSES Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * refactor: Move all the common test variables to a single class (#20) Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: Joel Hanson <[email protected]> * fix: Review comment fixes (#21) * fix: rename variable names Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: simplify the jsonprocessingexception failure Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: Rename variable names and create method for readablity Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: Move SinkRecordBuilder to utils folder Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * fix: Add missing final Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * fix: enable exactlyOnce to be true if tasks.max is not provided Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * fix: spelling for commited -> committed Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * fix: early exits are traced Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * fix: Refactor handleException method Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: Update version in BUG_REPORT Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * fix: Rename class SinkRecordBuilder and remove temp variables Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: tidy up in test for clarity Contributes to: event-integration/eventstreams-planning#10774 Signed-off-by: Jonathan Hughes <[email protected]> Co-authored-by: Jonathan Hughes <[email protected]> * feat: Update exception handling similar to source connector (#22) * fix: Update connectionException to JMSWorkerConnectionException Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: Log stack trace instead of printStackTrace Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * refactor: split out large part of jmswoker into a seperate class (#23) * refactor: split out large part of jmswoker into a seperate class Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * refactor: connect code is refactored have common method Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: Move SSLContext related part to seperate class Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * fix: Rename method name to be more meaningful Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: Remove unwanted imports and java docs Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * refactor: Exception handling Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * refactor: simplify the put method Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: handle exception from top and clean up Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: Formatting code, sorting imports, adding new tests for exceptions (#24) Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * Update kafka binary to a working version (#15) * feat: Formatting and updation of readme for exactly once configuration (#27) * feat: Formatting and updation of read for exactly once configuration - .gitignore update to have the mq logs - Formatted the readme file - Added new documenation for the exactly once semantics - New sample file for the exactly-once connector config Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * fix: Update 3.4.0 to 3.4.1 Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * fix: Update README, add license declaration, remove AbstractConfig (#28) * fix: Update README, add license declaration, remove AbstractConfig Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: Change DestinationBuilderIT to MessagePropertyIT Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <[email protected]> * feat: attempt to fix e2es (#29) * feat: attempt to fix e2es Contributes to: event-integration/eventstreams-planning#0 Signed-off-by: Jonathan Hughes <[email protected]> * feat: fixed tests Contributes to: event-integration/eventstreams-planning#0 Signed-off-by: Jonathan Hughes <[email protected]> * feat: revert from arm64 image from tests Contributes to: event-integration/eventstreams-planning#0 Signed-off-by: Jonathan Hughes <[email protected]> * fix: Update required version from 2.6.0 to 0.11.0 (#30) Contributes to: event-integration/qp-planning#0 Signed-off-by: Joel Hanson <[email protected]> * feat: Update test to have meaning full variable names (#31) Contributes to: event-integration/qp-planning#0 Signed-off-by: Joel Hanson <[email protected]> Co-authored-by: Joel Hanson <[email protected]> Co-authored-by: Nick Morgan <[email protected]> Co-authored-by: Jonathan Hughes <[email protected]> * fix: Update packaged licenses (#32) * fix: Update packaged licenses Update packaged licenses Contributes to: event-integration/eventstreams-planning#11171 Signed-off-by: Neeraj Laad <[email protected]> Signed-off-by: neeraj-laad <[email protected]> * fix: Include license in pom.xml Include license in pom.xml Contributes to: event-integration/eventstreams-planning#11171 Signed-off-by: neeraj-laad <[email protected]> * fix: Move license folder under META-INF Move license folder under META-INF Contributes to: event-integration/eventstreams-planning#11171 Signed-off-by: neeraj-laad <[email protected]> * doc: fix license in readme (#33) fix license in readme Contributes to: event-integration/eventstreams-planning#11171 Signed-off-by: neeraj-laad <[email protected]> * Mq sink refactor (#35) * feat: MQ Sink Refactor Contributes to: event-integration/eventstreams-planning#0 Signed-off-by: Priyanka.K.U [email protected] * feat: Test cases fixed Contributes to: event-integration/eventstreams-planning#12532 Signed-off-by: Priyanka.K.U [email protected] * feat: Test cases updated Contributes to: event-integration/eventstreams-planning#12532 Signed-off-by: Priyanka.K.U [email protected] * feat: updated the import Contributes to: event-integration/eventstreams-planning#12532 Signed-off-by: Priyanka.K.U [email protected] * feat: added copyright header Contributes to: event-integration/eventstreams-planning#12532 Signed-off-by: Priyanka.K.U [email protected] * chore: remove commented-out code Signed-off-by: Dale Lane <[email protected]> --------- Signed-off-by: Dale Lane <[email protected]> Co-authored-by: Dale Lane <[email protected]> * feat: support for writing to MQMD (#36) Contributes to: event-integration/eventstreams-planning#12432 Signed-off-by: Joel Hanson <[email protected]> * feat: Update readme with appropriate mqmd info (#37) * feat: Update readme with appropriate mqmd info Contributes to: event-integration/eventstreams-planning#12434 Signed-off-by: Joel Hanson <[email protected]> * Apply suggestions from code review Contributes to: event-integration/eventstreams-planning#12434 Signed-off-by: Joel Hanson <[email protected]> Co-authored-by: Vignesh Kumar Elumalai <[email protected]> * feat: rearrange order of docs in readme Contributes to: event-integration/eventstreams-planning#12434 Signed-off-by: Joel Hanson <[email protected]> * feat: copyright year change and readme case fix Contributes to: event-integration/eventstreams-planning#12434 Signed-off-by: Joel Hanson <[email protected]> * change to note * remove specifically * Apply suggestions from code review --------- Signed-off-by: Joel Hanson <[email protected]> Co-authored-by: Vignesh Kumar Elumalai <[email protected]> * feat: Update release to 2.1.0 (#40) Contributes to: event-integration/eventstreams-planning#12434 Signed-off-by: Joel Hanson <[email protected]> * feat: Automate release using travis (#39) Contributes to: event-integration/eventstreams-planning#12621 Signed-off-by: Joel Hanson <[email protected]> * feat: updated Copyright year Contributes to: event-integration/eventstreams-planning#13003 Signed-off-by: Priyanka.K.U [email protected] feat: updated version in pom xml Contributes to: event-integration/eventstreams-planning#13003 Signed-off-by: Priyanka.K.U [email protected] feat: MQ Sink V2 OSS related changes Contributes to: event-integration/eventstreams-planning#13003 Signed-off-by: Priyanka.K.U [email protected] --------- Signed-off-by: Joel Hanson <[email protected]> Signed-off-by: neeraj-laad <[email protected]> Signed-off-by: Dale Lane <[email protected]> Signed-off-by: Priyanka.K.U [email protected] Co-authored-by: Jonathan Hughes <[email protected]> Co-authored-by: Joel Hanson <[email protected]> Co-authored-by: Joseph Vullo <[email protected]> Co-authored-by: Nick Morgan <[email protected]> Co-authored-by: Neeraj Laad <[email protected]> Co-authored-by: Priyanka K U <[email protected]> Co-authored-by: Dale Lane <[email protected]> Co-authored-by: Vignesh Kumar Elumalai <[email protected]>
ibm-messaging · Aug 7, 2024 · a187590 · a187590
1 parent 3bd3bdb
commit a187590
Show file tree

Hide file tree

Showing 48 changed files with 4,152 additions and 1,322 deletions.
diff --git a/.checkstyle/checkstyle.xml b/.checkstyle/checkstyle.xml
@@ -140,4 +140,8 @@
     <!-- Filter out Checkstyle warnings that have been suppressed with the @SuppressWarnings annotation -->
     <module name="SuppressWarningsFilter"/>
 
+    <!-- new line -->
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
 </module>
diff --git a/.checkstyle/intellij-checkstyle.xml b/.checkstyle/intellij-checkstyle.xml
@@ -136,4 +136,8 @@
     <!-- Filter out Checkstyle warnings that have been suppressed with the @SuppressWarnings annotation -->
     <module name="SuppressWarningsFilter"/>
 
+    <!-- new line -->
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
 </module>
diff --git a/.github/ISSUE_TEMPLATES/BUG_REPORT.yml b/.github/ISSUE_TEMPLATES/BUG_REPORT.yml
@@ -57,9 +57,9 @@ body:
       label: Version
       description: What version of our software are you running?
       options:
-        - 1.5.2 (Default)
-        - 1.5.1
-        - older (<1.5.1)
+        - 2.2.0 (Default)
+        - 1.5.2
+        - older (<1.5.2)
     validations:
       required: true
   - type: textarea

diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,6 @@ target/
 *.iws
 
 # Visual Studio Code
-.vscode/
+.vscode/
+
+mqjms.log.*
diff --git a/LICENSE b/LICENSE
@@ -175,7 +175,7 @@ Apache License
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2017 IBM Corporation
+   Copyright 2017, 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.

diff --git a/README.md b/README.md
diff --git a/config/mq-sink-exactly-once.json b/config/mq-sink-exactly-once.json
@@ -0,0 +1,19 @@
+{
+    "name": "mq-sink-exactly-once",
+    "config":
+    {
+        "connector.class": "com.ibm.eventstreams.connect.mqsink.MQSinkConnector",
+        "tasks.max": "1",
+        "topics": "<TOPIC>",
+
+        "key.converter": "org.apache.kafka.connect.storage.StringConverter",
+        "value.converter": "org.apache.kafka.connect.storage.StringConverter",
+
+        "mq.queue.manager": "<QUEUE_MANAGER>",
+        "mq.connection.name.list": "<CONNECTION_NAME_LIST>",
+        "mq.channel.name": "<CHANNEL_NAME>",
+        "mq.queue": "<QUEUE>",
+        "mq.message.builder": "com.ibm.eventstreams.connect.mqsink.builders.DefaultMessageBuilder",
+        "mq.exactly.once.state.queue": "<EXACTLY_ONCE_STATE_QUEUE>"
+    }
+}
diff --git a/config/mq-sink.properties b/config/mq-sink.properties
@@ -1,4 +1,4 @@
-# Copyright 2017, 2020 IBM Corporation
+# Copyright 2017, 2020, 2023, 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.

diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Copyright 2017, 2020 IBM Corporation
+ * Copyright 2017, 2020, 2023, 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.
@@ -20,7 +20,7 @@
   <groupId>com.ibm.eventstreams.connect</groupId>
   <artifactId>kafka-connect-mq-sink</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.2</version>
+  <version>2.2.0</version>
   <name>kafka-connect-mq-sink</name>
   <organization>
     <name>IBM Corporation</name>
@@ -30,13 +30,13 @@
   <description>
       A Kafka Connect connector for copying data from Apache Kafka into IBM MQ.
   </description>
-  <licenses>
-    <license>
-      <name>Apache License 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+    <licenses>
+        <license>
+            <name>Apache License 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -45,13 +45,13 @@
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>connect-api</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>connect-json</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,12 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-api</artifactId>
+      <version>2.0.7</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
       <version>2.0.7</version>
       <scope>test</scope>
     </dependency>
@@ -84,13 +89,49 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.17.6</version>
+      <version>1.17.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>3.1.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.24.2</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.14.3</version>
+    </dependency>
+
   </dependencies>
 
   <build>
     <plugins>
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.3.1</version>
+          <configuration>
+            <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+            <resources>
+              <resource>
+                <directory>${project.basedir}</directory>
+                <includes>
+                  <include>LICENSE</include>
+                </includes>
+              </resource>
+            </resources>
+          </configuration>
+        </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
@@ -133,7 +174,7 @@
         </executions>
       </plugin>
 
-      <!-- build the release jar -->  
+      <!-- build the release jar -->
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>3.1.1</version>
@@ -280,6 +321,15 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+            <reuseForks>false</reuseForks>
+            <forkCount>1</forkCount>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/src/assembly/package.xml b/src/assembly/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Copyright 2018 IBM Corporation
+ * Copyright 2018, 2023, 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.
@@ -23,12 +23,6 @@
     <format>jar</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
-  <files>
-    <file>
-      <source>LICENSE</source>
-      <outputDirectory></outputDirectory>
-    </file>
-  </files>
   <dependencySets>
     <dependencySet>
       <outputDirectory></outputDirectory>
@@ -37,6 +31,7 @@
         <excludes>
           <exclude>**/copyright-exclude</exclude>
           <exclude>META-INF/maven/**</exclude>
+          <exclude>META-INF/LICENSE*</exclude>
         </excludes>
       </unpackOptions>
       <useTransitiveFiltering>true</useTransitiveFiltering>