Skip to content

Commit 29439aa

Browse files
neeraj-laadGitHub Enterprise
authored andcommitted
fix: Include appropriate license in packaging (#46)
* fix:L Include appropriate license in packaging Include appropriate license in packaging Contributes to: event-integration/eventstreams-planning#11171 Signed-off-by: neeraj-laad<neeraj.laad@uk.ibm.com> Signed-off-by: neeraj-laad <neeraj.laad@uk.ibm.com> * fix: Move Licenses folder under META-INF Move Licenses folder under META-INF Contributes to: event-integration/eventstreams-planning#11171 Signed-off-by: neeraj-laad <neeraj.laad@uk.ibm.com> * fix: update license in README update license in README Contributes to: event-integration/eventstreams-planning#11171 Signed-off-by: neeraj-laad <neeraj.laad@uk.ibm.com>
1 parent cd7f112 commit 29439aa

File tree

4 files changed

+23
-210
lines changed

4 files changed

+23
-210
lines changed

LICENSE

Lines changed: 0 additions & 190 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -407,14 +407,4 @@ For issues relating specifically to this connector, please use the [GitHub issue
407407

408408
Copyright 2017, 2020 IBM Corporation
409409

410-
Licensed under the Apache License, Version 2.0 (the "License");
411-
you may not use this file except in compliance with the License.
412-
You may obtain a copy of the License at
413-
414-
<http://www.apache.org/licenses/LICENSE-2.0>
415-
416-
Unless required by applicable law or agreed to in writing, software
417-
distributed under the License is distributed on an "AS IS" BASIS,
418-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
419-
See the License for the specific language governing permissions and
420-
limitations under the License.The project is licensed under the Apache 2 license.
410+
The IBM MQ source connector v2 is available under the IBM Event Automation license and IBM Cloud Pak for Integration license. Please see https://ibm.github.io/event-automation/support/licensing/ for further information.

pom.xml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@
3232
</description>
3333
<licenses>
3434
<license>
35-
<name>Apache License 2.0</name>
36-
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
37-
<distribution>repo</distribution>
35+
<name>IBM International Program License Agreement - IBM Event Automation 1.0.0.0</name>
36+
<url>https%3A%2F%2Fwww14.software.ibm.com%2Fcgi-bin%2Fweblap%2Flap.pl%3Fpopup%3DY%26li_formnum%3DL-HRZF-DWHH7A</url>
37+
<distribution>manual</distribution>
38+
</license>
39+
<license>
40+
<name>IBM International Program License Agreement - IBM Cloud Pak for Integration 2023.2.1 Standard</name>
41+
<url>https%3A%2F%2Fwww14.software.ibm.com%2Fcgi-bin%2Fweblap%2Flap.pl%3Fpopup%3DY%26li_formnum%3DL-YBXJ-ADJNSM</url>
42+
<distribution>manual</distribution>
3843
</license>
3944
</licenses>
4045
<properties>
@@ -109,6 +114,19 @@
109114

110115
<build>
111116
<plugins>
117+
<plugin>
118+
<artifactId>maven-resources-plugin</artifactId>
119+
<version>3.3.1</version>
120+
<configuration>
121+
<resources>
122+
<resource>
123+
<directory>LICENSES</directory>
124+
</resource>
125+
</resources>
126+
<outputDirectory>${project.build.outputDirectory}/META-INF/LICENSES</outputDirectory>
127+
</configuration>
128+
</plugin>
129+
112130
<plugin>
113131
<artifactId>maven-compiler-plugin</artifactId>
114132
<version>3.1</version>

src/assembly/package.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
<format>jar</format>
2424
</formats>
2525
<includeBaseDirectory>false</includeBaseDirectory>
26-
<files>
27-
<file>
28-
<source>LICENSE</source>
29-
<outputDirectory></outputDirectory>
30-
</file>
31-
</files>
3226
<dependencySets>
3327
<dependencySet>
3428
<outputDirectory></outputDirectory>
@@ -37,6 +31,7 @@
3731
<excludes>
3832
<exclude>**/copyright-exclude</exclude>
3933
<exclude>META-INF/maven/**</exclude>
34+
<exclude>META-INF/LICENSE*</exclude>
4035
</excludes>
4136
</unpackOptions>
4237
<useTransitiveFiltering>true</useTransitiveFiltering>

0 commit comments

Comments
 (0)