From 9889c7ac3be3680d0e780163e344099115bd459f Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Tue, 3 Sep 2024 16:14:15 -0500 Subject: [PATCH 1/3] Revert "Add NOTICE file and include it and LICENSE in assembled JAR" This reverts commit 7dade910e950fce12199b1a4d22c01ff99b1ffd3. --- pom.xml | 27 -------------- release/distribution/NOTICE | 74 ------------------------------------- 2 files changed, 101 deletions(-) delete mode 100644 release/distribution/NOTICE diff --git a/pom.xml b/pom.xml index 67feab1..e28619b 100644 --- a/pom.xml +++ b/pom.xml @@ -148,35 +148,13 @@ 3.6.0 - - com.gradle:develocity-maven-extension-adapters - - META-INF/MANIFEST.MF - - org.codehaus.groovy:groovy - META-INF/LICENSE - META-INF/MANIFEST.MF - META-INF/NOTICE - - - - org.apache.ivy:ivy - - META-INF/LICENSE META-INF/MANIFEST.MF - META-INF/NOTICE - - - LICENSE - ${project.basedir}/LICENSE - - @@ -188,11 +166,6 @@ - - - ${project.basedir}/release/distribution - - diff --git a/release/distribution/NOTICE b/release/distribution/NOTICE deleted file mode 100644 index b0f3d86..0000000 --- a/release/distribution/NOTICE +++ /dev/null @@ -1,74 +0,0 @@ -The following copyright statements and licenses apply to various third party open -source software packages (or portions thereof) that are distributed with -this content. - -TABLE OF CONTENTS -================= - -The following is a listing of the open source components detailed in this -document. This list is provided for your convenience; please read further if -you wish to review the copyright notice(s) and the full text of the license -associated with each component. - - -**SECTION 1: Apache License, V2.0** - * Develocity Maven Extension Adapters - * com.gradle:develocity-maven-extension-adapters - * Groovy - * org.codehaus.groovy:groovy - * Ivy - * org.apache.ivy:ivy - -SECTION 1: Apache License, V2.0 -================================ - -Develocity Maven Extension Adapters ------------------------------------ - -Copyright 2024 Gradle, Inc. - -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. - -Groovy ------- - -Copyright 2023 The Apache Software Foundation - -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. - -Ivy ---- - -Copyright 2023 The Apache Software Foundation - -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. From 4538056e86d8219010f5f1dd47a277adddd9af3e Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Tue, 3 Sep 2024 16:13:25 -0500 Subject: [PATCH 2/3] Add NOTICE file and include it and LICENSE in all assembled JAR files --- pom.xml | 14 +++++++ release/distribution/NOTICE | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 release/distribution/NOTICE diff --git a/pom.xml b/pom.xml index e28619b..c1ed3bd 100644 --- a/pom.xml +++ b/pom.xml @@ -166,6 +166,20 @@ + + + ${project.basedir}/src/main/resources + + + ${project.basedir}/release/distribution + + + ${project.basedir} + + LICENSE + + + diff --git a/release/distribution/NOTICE b/release/distribution/NOTICE new file mode 100644 index 0000000..b0f3d86 --- /dev/null +++ b/release/distribution/NOTICE @@ -0,0 +1,74 @@ +The following copyright statements and licenses apply to various third party open +source software packages (or portions thereof) that are distributed with +this content. + +TABLE OF CONTENTS +================= + +The following is a listing of the open source components detailed in this +document. This list is provided for your convenience; please read further if +you wish to review the copyright notice(s) and the full text of the license +associated with each component. + + +**SECTION 1: Apache License, V2.0** + * Develocity Maven Extension Adapters + * com.gradle:develocity-maven-extension-adapters + * Groovy + * org.codehaus.groovy:groovy + * Ivy + * org.apache.ivy:ivy + +SECTION 1: Apache License, V2.0 +================================ + +Develocity Maven Extension Adapters +----------------------------------- + +Copyright 2024 Gradle, Inc. + +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. + +Groovy +------ + +Copyright 2023 The Apache Software Foundation + +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. + +Ivy +--- + +Copyright 2023 The Apache Software Foundation + +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. From ba1de901053d40f495dd68d5b5554e1e860894b5 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Tue, 3 Sep 2024 16:17:29 -0500 Subject: [PATCH 3/3] Ensure this project's LICENSE and NOTICE are the only ones included in JARs --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index c1ed3bd..a69ef88 100644 --- a/pom.xml +++ b/pom.xml @@ -148,10 +148,26 @@ 3.6.0 + + com.gradle:develocity-maven-extension-adapters + + META-INF/MANIFEST.MF + + org.codehaus.groovy:groovy + META-INF/LICENSE + META-INF/MANIFEST.MF + META-INF/NOTICE + + + + org.apache.ivy:ivy + + META-INF/LICENSE META-INF/MANIFEST.MF + META-INF/NOTICE