update to OpenJDK 21, Gradle 8.4

gradle-plugin-asciidoctor/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-asciidoctor
-version = 3.0.0
+version = 3.0.1

gradle-plugin-docker/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-docker
-version = 3.0.0
+version = 3.0.1

gradle-plugin-git/build.gradle

@@ -13,7 +13,7 @@ dependencies {
     api libs.groovy.git
     testImplementation gradleTestKit()
     testImplementation  libs.spock.core
-    testImplementation libs.junit4
+    testImplementation testLibs.junit4
 }
 
 if (project.hasProperty('gradle.publish.key')) {

gradle-plugin-git/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-docker
-version = 3.0.0
+version = 3.0.1

gradle-plugin-jacc/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-jacc
-version = 3.0.0
+version = 3.0.1

gradle-plugin-jacc/src/main/groovy/org/xbib/gradle/plugin/jacc/JaccTask.groovy

@@ -26,8 +26,12 @@ class JaccTask extends DefaultTask {
 
     static String getPackageName(File file) {
         String string = file.readLines().find { line ->
-            line.startsWith('package')
+            line.startsWith('package ') || line.startsWith('%package ')
         }
-        return string == null ? '' : string.substring(8, string.length() - 1)
+        if (string == null) {
+            return ''
+        }
+        int pos = string.indexOf(' ')
+        string = string.substring(pos + 1).replace(';', '')
     }
 }

gradle-plugin-jacc/src/test/groovy/org/xbib/gradle/plugin/jacc/JaccPluginTest.groovy

@@ -56,10 +56,12 @@ sourceSets {
                 .build()
         assertEquals(TaskOutcome.SUCCESS, result.task(":build").getOutcome())
 
-        File file = new File("${System.getProperty('user.dir')}/build/my-generated-sources/jacc")
+        File file = new File("${System.getProperty('user.dir')}/build/my-generated-sources/jacc/org/xbib/gradle/plugin/jacc/calc")
         if (file.exists()) {
             List<File> list = Arrays.asList(file.listFiles())
             assertEquals(2, list.size())
+        } else {
+            fail()
         }
     }
 }

gradle-plugin-jacc/src/test/jacc/simpleCalc.jacc

@@ -6,6 +6,7 @@
 //     ... enter arithmetic expressions ... hit EOF to terminate
 //
 
+%package org.xbib.gradle.plugin.jacc.calc
 %class     Calc
 %interface CalcTokens
 %semantic  int : yylval

gradle-plugin-jflex/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-jflex
-version = 3.0.0
+version = 3.0.1

gradle-plugin-rpm/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-rpm
-version = 3.0.1
+version = 3.0.2

gradle-plugin-shadow/gradle.properties

@@ -1,2 +1,2 @@
 name = gradle-plugin-shadow
-version = 3.0.0
+version = 3.0.1

gradle-plugin-shadow/src/main/groovy/org/xbib/gradle/plugin/shadow/internal/Clazzpath.groovy

@@ -1,5 +1,6 @@
 package org.xbib.gradle.plugin.shadow.internal
 
+import groovy.io.FileType
 import org.objectweb.asm.ClassReader
 
 import java.util.jar.JarEntry
@@ -53,14 +54,14 @@ class Clazzpath {
         } else if (Files.isDirectory(path)) {
             String prefix = Utils.separatorsToUnix(Utils.normalize(path.toString() + File.separatorChar))
             List<Resource> list = []
-            path.traverse { p ->
+            path.traverse(type: FileType.FILES, nameFilter: ~/.*\.class$/) { p ->
                 if (Files.isRegularFile(p) && isValidResourceName(p.getFileName().toString())) {
-                    list << new Resource(p.toString().substring(prefix.length())) {
+                    list.add(new Resource(p.toString().substring(prefix.length())) {
                         @Override
                         InputStream getInputStream() throws IOException {
                             Files.newInputStream(p)
                         }
-                    }
+                    })
                 }
             }
             return addClazzpathUnit(list, s, true)

gradle-plugin-shadow/src/main/groovy/org/xbib/gradle/plugin/shadow/internal/ClazzpathUnit.groovy

@@ -8,7 +8,9 @@ class ClazzpathUnit {
 
     private final Map<String, Clazz> dependencies
 
-    ClazzpathUnit(String s, Map<String, Clazz> clazzes, Map<String, Clazz> dependencies) {
+    ClazzpathUnit(String s,
+                  Map<String, Clazz> clazzes,
+                  Map<String, Clazz> dependencies) {
         this.s = s
         this.clazzes = clazzes
         this.dependencies = dependencies

gradle-plugin-shadow/src/main/groovy/org/xbib/gradle/plugin/shadow/tasks/ShadowCopyAction.groovy

@@ -4,6 +4,7 @@ import org.gradle.api.Action
 import org.gradle.api.GradleException
 import org.gradle.api.UncheckedIOException
 import org.gradle.api.file.FileCopyDetails
+import org.gradle.api.file.FilePermissions
 import org.gradle.api.file.FileTreeElement
 import org.gradle.api.file.RelativePath
 import org.gradle.api.internal.DocumentationRegistry
@@ -411,6 +412,7 @@ class ShadowCopyAction implements CopyAction {
     class RelativeArchivePath extends RelativePath {
 
         ZipEntry entry
+
         FileCopyDetails details
 
         RelativeArchivePath(ZipEntry entry, FileCopyDetails fileDetails) {
@@ -472,7 +474,6 @@ class ShadowCopyAction implements CopyAction {
 
         @Override
         void copyTo(OutputStream outputStream) {
-
         }
 
         @Override
@@ -499,5 +500,10 @@ class ShadowCopyAction implements CopyAction {
         int getMode() {
             return archivePath.entry.unixMode
         }
+
+        @Override
+        FilePermissions getPermissions() {
+            return archivePath.details.permissions
+        }
     }
 }

gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/internal/DependencyUtilsTest.groovy

@@ -13,6 +13,7 @@ class DependencyUtilsTest {
     @Test
     void testShouldFindDependenciesOfClassObject() throws Exception {
         Collection<String> dependencies = getDependenciesOfClass(Object).sort()
+        // may vary from JDK to JDK
         Collection<String> expectedDependencies = Arrays.asList(
                 "java.lang.Class",
                 "java.lang.CloneNotSupportedException",
@@ -23,6 +24,7 @@ class DependencyUtilsTest {
                 "java.lang.Object",
                 "java.lang.String",
                 "java.lang.StringBuilder",
+                "java.lang.Thread",
                 "java.lang.Throwable")
                 .sort()
         // we do not care about jdk.internal classes, they vary between JDK versions and even JVMs

gradle-plugin-shadow/src/test/resources/asm-6.0_BETA/META-INF/MANIFEST.MF

@@ -1,17 +1,17 @@
-Manifest-Version: 1.0
+Manifest-Version: 1.0
-Bnd-LastModified: 1500316202010
+Bnd-LastModified: 1500316202010
-Bundle-DocURL: http://asm.objectweb.org
+Bundle-DocURL: http://asm.objectweb.org
-Bundle-ManifestVersion: 2
+Bundle-ManifestVersion: 2
-Bundle-Name: ASM
+Bundle-Name: ASM
-Bundle-RequiredExecutionEnvironment: J2SE-1.3
+Bundle-RequiredExecutionEnvironment: J2SE-1.3
-Bundle-SymbolicName: org.objectweb.asm
+Bundle-SymbolicName: org.objectweb.asm
-Bundle-Vendor: France Telecom R&D
+Bundle-Vendor: France Telecom R&D
-Bundle-Version: 6.0.0.BETA
+Bundle-Version: 6.0.0.BETA
-Created-By: 1.8.0_131 (Oracle Corporation)
+Created-By: 1.8.0_131 (Oracle Corporation)
-Export-Package: org.objectweb.asm;version="6.0.0.BETA",org.objectweb.a
+Export-Package: org.objectweb.asm;version="6.0.0.BETA",org.objectweb.a
- sm.signature;version="6.0.0.BETA"
+ sm.signature;version="6.0.0.BETA"
-Implementation-Title: ASM
+Implementation-Title: ASM
-Implementation-Vendor: France Telecom R&D
+Implementation-Vendor: France Telecom R&D
-Implementation-Version: 6.0_BETA
+Implementation-Version: 6.0_BETA
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.2))"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.2))"
-Tool: Bnd-3.2.0.201605172007
+Tool: Bnd-3.2.0.201605172007

gradle-plugin-shadow/src/test/resources/jar1-missing/META-INF/LICENSE.txt

@@ -1,203 +1,203 @@
-
+
-                                 Apache License
+                                 Apache License
-                           Version 2.0, January 2004
+                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        http://www.apache.org/licenses/
-
+
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
+
-   1. Definitions.
+   1. Definitions.
-
+
-      "License" shall mean the terms and conditions for use, reproduction,
+      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+      and distribution as defined by Sections 1 through 9 of this document.
-
+
-      "Licensor" shall mean the copyright owner or entity authorized by
+      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+      the copyright owner that is granting the License.
-
+
-      "Legal Entity" shall mean the union of the acting entity and all
+      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
+      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
+      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
+      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
+      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+      outstanding shares, or (iii) beneficial ownership of such entity.
-
+
-      "You" (or "Your") shall mean an individual or Legal Entity
+      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+      exercising permissions granted by this License.
-
+
-      "Source" form shall mean the preferred form for making modifications,
+      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
+      including but not limited to software source code, documentation
-      source, and configuration files.
+      source, and configuration files.
-
+
-      "Object" form shall mean any form resulting from mechanical
+      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
+      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
+      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+      and conversions to other media types.
-
+
-      "Work" shall mean the work of authorship, whether in Source or
+      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
+      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
+      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+      (an example is provided in the Appendix below).
-
+
-      "Derivative Works" shall mean any work, whether in Source or Object
+      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
+      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
+      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
+      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
+      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
+      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+      the Work and Derivative Works thereof.
-
+
-      "Contribution" shall mean any work of authorship, including
+      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
+      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
+      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
+      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
+      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
+      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
+      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
+      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
+      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
+      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
+      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
+      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+      designated in writing by the copyright owner as "Not a Contribution."
-
+
-      "Contributor" shall mean Licensor and any individual or Legal Entity
+      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
+      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
+      subsequently incorporated within the Work.
-
+
-   2. Grant of Copyright License. Subject to the terms and conditions of
+   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
+      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
+      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
+      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
+      Work and such Derivative Works in Source or Object form.
-
+
-   3. Grant of Patent License. Subject to the terms and conditions of
+   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
+      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
+      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
+      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
+      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
+      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
+      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
+      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
+      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
+      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
+      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
+      as of the date such litigation is filed.
-
+
-   4. Redistribution. You may reproduce and distribute copies of the
+   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
+      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
+      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
+      meet the following conditions:
-
+
-      (a) You must give any other recipients of the Work or
+      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
+          Derivative Works a copy of this License; and
-
+
-      (b) You must cause any modified files to carry prominent notices
+      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
+          stating that You changed the files; and
-
+
-      (c) You must retain, in the Source form of any Derivative Works
+      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
+          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
+          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
+          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
+          the Derivative Works; and
-
+
-      (d) If the Work includes a "NOTICE" text file as part of its
+      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
+          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
+          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
+          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
+          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
+          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
+          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
+          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
+          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
+          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
+          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
+          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
+          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
+          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
+          that such additional attribution notices cannot be construed
-          as modifying the License.
+          as modifying the License.
-
+
-      You may add Your own copyright statement to Your modifications and
+      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
+      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
+      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
+      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
+      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
+      the conditions stated in this License.
-
+
-   5. Submission of Contributions. Unless You explicitly state otherwise,
+   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
+      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
+      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
+      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
+      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
+      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
+      with Licensor regarding such Contributions.
-
+
-   6. Trademarks. This License does not grant permission to use the trade
+   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
+      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
+      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
+      origin of the Work and reproducing the content of the NOTICE file.
-
+
-   7. Disclaimer of Warranty. Unless required by applicable law or
+   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
+      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
+      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
+      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
+      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
+      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
+      risks associated with Your exercise of permissions under this License.
-
+
-   8. Limitation of Liability. In no event and under no legal theory,
+   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
+      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
+      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
+      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
+      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
+      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
+      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
+      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
+      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
+      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
+      has been advised of the possibility of such damages.
-
+
-   9. Accepting Warranty or Additional Liability. While redistributing
+   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
+      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
+      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
+      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
+      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
+      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
+      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
+      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
+      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
+      of your accepting any such warranty or additional liability.
-
+
-   END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS
-
+
-   APPENDIX: How to apply the Apache License to your work.
+   APPENDIX: How to apply the Apache License to your work.
-
+
-      To apply the Apache License to your work, attach the following
+      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
+      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
+      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
+      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
+      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
+      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
+      identification within third-party archives.
-
+
-   Copyright [yyyy] [name of copyright owner]
+   Copyright [yyyy] [name of copyright owner]
-
+
-   Licensed under the Apache License, Version 2.0 (the "License");
+   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
+   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+   You may obtain a copy of the License at
-
+
-       http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
-
+
-   Unless required by applicable law or agreed to in writing, software
+   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
+   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
+   See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.
-
+

gradle-plugin-shadow/src/test/resources/jar1-missing/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
+Manifest-Version: 1.0
-Created-By: 1.6.0_20 (Apple Inc.)
+Created-By: 1.6.0_20 (Apple Inc.)
-
+

gradle-plugin-shadow/src/test/resources/jar1-missing/META-INF/NOTICE.txt

@@ -1,6 +1,6 @@
-Apache Jakarta Commons IO
+Apache Jakarta Commons IO
-Copyright 2001-2007 The Apache Software Foundation
+Copyright 2001-2007 The Apache Software Foundation
-
+
-This product includes software developed by
+This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (http://www.apache.org/).
-
+

gradle-plugin-shadow/src/test/resources/jar1-missing/META-INF/maven/commons-io/commons-io/pom.properties

@@ -1,5 +1,5 @@
-#Generated by Maven
+#Generated by Maven
-#Wed Jun 27 03:51:16 CEST 2007
+#Wed Jun 27 03:51:16 CEST 2007
-version=1.3.2
+version=1.3.2
-groupId=commons-io
+groupId=commons-io
-artifactId=commons-io
+artifactId=commons-io

gradle-plugin-shadow/src/test/resources/jar1-missing/META-INF/maven/commons-io/commons-io/pom.xml

@@ -1,353 +1,353 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
-<!--
+<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
+   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
+   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
+   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
+   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
+   the License.  You may obtain a copy of the License at
-
+
-       http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
-
+
-   Unless required by applicable law or agreed to in writing, software
+   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
+   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
+   See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.
--->
+-->
-<project
+<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
+  <parent>
-    <groupId>org.apache.commons</groupId>
+    <groupId>org.apache.commons</groupId>
-    <artifactId>commons-parent</artifactId>
+    <artifactId>commons-parent</artifactId>
-    <version>3</version>
+    <version>3</version>
-  </parent>
+  </parent>
-  <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-io</groupId>
+  <groupId>commons-io</groupId>
-  <artifactId>commons-io</artifactId>
+  <artifactId>commons-io</artifactId>
-  <version>1.3.2</version>
+  <version>1.3.2</version>
-  <name>Commons IO</name>
+  <name>Commons IO</name>
-
+
-  <inceptionYear>2002</inceptionYear>
+  <inceptionYear>2002</inceptionYear>
-  <description>
+  <description>
-        Commons-IO contains utility classes, stream implementations, file filters, and endian classes.
+        Commons-IO contains utility classes, stream implementations, file filters, and endian classes.
-  </description>
+  </description>
-
+
-  <url>http://jakarta.apache.org/commons/io/</url>
+  <url>http://jakarta.apache.org/commons/io/</url>
-
+
-  <issueManagement>
+  <issueManagement>
-    <system>jira</system>
+    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/IO</url>
+    <url>http://issues.apache.org/jira/browse/IO</url>
-  </issueManagement>
+  </issueManagement>
-
+
-  <scm>
+  <scm>
-    <connection>scm:svn:scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk</connection>
+    <connection>scm:svn:scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk</connection>
-    <developerConnection>scm:svn:scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk</developerConnection>
+    <developerConnection>scm:svn:scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk</url>
+    <url>http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk</url>
-  </scm>
+  </scm>
-
+
-  <developers>
+  <developers>
-    <developer>
+    <developer>
-      <name>Scott Sanders</name>
+      <name>Scott Sanders</name>
-      <id>sanders</id>
+      <id>sanders</id>
-      <email>sanders@apache.org</email>
+      <email>sanders@apache.org</email>
-      <organization></organization>
+      <organization></organization>
-      <roles>
+      <roles>
-        <role>Java Developer</role>
+        <role>Java Developer</role>
-      </roles>
+      </roles>
-    </developer>
+    </developer>
-    <developer>
+    <developer>
-      <name>dIon Gillard</name>
+      <name>dIon Gillard</name>
-      <id>dion</id>
+      <id>dion</id>
-      <email>dion@apache.org</email>
+      <email>dion@apache.org</email>
-      <organization></organization>
+      <organization></organization>
-      <roles>
+      <roles>
-        <role>Java Developer</role>
+        <role>Java Developer</role>
-      </roles>
+      </roles>
-    </developer>
+    </developer>
-    <developer>
+    <developer>
-      <name>Nicola Ken Barozzi</name>
+      <name>Nicola Ken Barozzi</name>
-      <id>nicolaken</id>
+      <id>nicolaken</id>
-      <email>nicolaken@apache.org</email>
+      <email>nicolaken@apache.org</email>
-      <organization></organization>
+      <organization></organization>
-      <roles>
+      <roles>
-        <role>Java Developer</role>
+        <role>Java Developer</role>
-      </roles>
+      </roles>
-    </developer>
+    </developer>
-    <developer>
+    <developer>
-      <name>Henri Yandell</name>
+      <name>Henri Yandell</name>
-      <id>bayard</id>
+      <id>bayard</id>
-      <email>bayard@apache.org</email>
+      <email>bayard@apache.org</email>
-      <organization></organization>
+      <organization></organization>
-      <roles>
+      <roles>
-        <role>Java Developer</role>
+        <role>Java Developer</role>
-      </roles>
+      </roles>
-    </developer>
+    </developer>
-    <developer>
+    <developer>
-      <name>Stephen Colebourne</name>
+      <name>Stephen Colebourne</name>
-      <id>scolebourne</id>
+      <id>scolebourne</id>
-      <organization></organization>
+      <organization></organization>
-      <roles>
+      <roles>
-        <role>Java Developer</role>
+        <role>Java Developer</role>
-      </roles>
+      </roles>
-      <timezone>0</timezone>
+      <timezone>0</timezone>
-    </developer>
+    </developer>
-    <developer>
+    <developer>
-      <name>Jeremias Maerki</name>
+      <name>Jeremias Maerki</name>
-      <id>jeremias</id>
+      <id>jeremias</id>
-      <email>jeremias@apache.org</email>
+      <email>jeremias@apache.org</email>
-      <organization/>
+      <organization/>
-      <roles>
+      <roles>
-        <role>Java Developer</role>
+        <role>Java Developer</role>
-      </roles>
+      </roles>
-      <timezone>+1</timezone>
+      <timezone>+1</timezone>
-    </developer>
+    </developer>
-    <developer>
+    <developer>
-      <name>Matthew Hawthorne</name>
+      <name>Matthew Hawthorne</name>
-      <id>matth</id>
+      <id>matth</id>
-      <email>matth@apache.org</email>
+      <email>matth@apache.org</email>
-      <organization/>
+      <organization/>
-      <roles>
+      <roles>
-        <role>Java Developer</role>
+        <role>Java Developer</role>
-      </roles>
+      </roles>
-    </developer>
+    </developer>
-    <developer>
+    <developer>
-      <name>Martin Cooper</name>
+      <name>Martin Cooper</name>
-      <id>martinc</id>
+      <id>martinc</id>
-      <email>martinc@apache.org</email>
+      <email>martinc@apache.org</email>
-      <organization/>
+      <organization/>
-      <roles>
+      <roles>
-        <role>Java Developer</role>
+        <role>Java Developer</role>
-      </roles>
+      </roles>
-    </developer>
+    </developer>
-    <developer>
+    <developer>
-      <name>Rob Oxspring</name>
+      <name>Rob Oxspring</name>
-      <id>roxspring</id>
+      <id>roxspring</id>
-      <email>roxspring@apache.org</email>
+      <email>roxspring@apache.org</email>
-      <organization/>
+      <organization/>
-      <roles>
+      <roles>
-        <role>Java Developer</role>
+        <role>Java Developer</role>
-      </roles>
+      </roles>
-    </developer>
+    </developer>
-    <developer>
+    <developer>
-      <name>Jochen Wiedmann</name>
+      <name>Jochen Wiedmann</name>
-      <id>jochen</id>
+      <id>jochen</id>
-      <email>jochen.wiedmann@gmail.com</email>
+      <email>jochen.wiedmann@gmail.com</email>
-    </developer>
+    </developer>
-  </developers>
+  </developers>
-
+
-  <contributors>
+  <contributors>
-    <contributor>
+    <contributor>
-      <name>Rahul Akolkar</name>
+      <name>Rahul Akolkar</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Jason Anderson</name>
+      <name>Jason Anderson</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Nathan Beyer</name>
+      <name>Nathan Beyer</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Emmanuel Bourg</name>
+      <name>Emmanuel Bourg</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Chris Eldredge</name>
+      <name>Chris Eldredge</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Magnus Grimsell</name>
+      <name>Magnus Grimsell</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Jim Harrington</name>
+      <name>Jim Harrington</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Thomas Ledoux</name>
+      <name>Thomas Ledoux</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Andy Lehane</name>
+      <name>Andy Lehane</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Marcelo Liberato</name>
+      <name>Marcelo Liberato</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Alban Peignier</name>
+      <name>Alban Peignier</name>
-      <email>alban.peignier at free.fr</email>
+      <email>alban.peignier at free.fr</email>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Niall Pemberton</name>
+      <name>Niall Pemberton</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Ian Springer</name>
+      <name>Ian Springer</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Masato Tezuka</name>
+      <name>Masato Tezuka</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>James Urie</name>
+      <name>James Urie</name>
-    </contributor>
+    </contributor>
-    <contributor>
+    <contributor>
-      <name>Frank W. Zammetti</name>
+      <name>Frank W. Zammetti</name>
-    </contributor>
+    </contributor>
-  </contributors>
+  </contributors>
-
+
-  <dependencies>
+  <dependencies>
-    <dependency>
+    <dependency>
-      <groupId>junit</groupId>
+      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>3.8.1</version>
-      <scope>test</scope>
+      <scope>test</scope>
-    </dependency>
+    </dependency>
-  </dependencies>
+  </dependencies>
-
+
-  <build>
+  <build>
-    <sourceDirectory>src/java</sourceDirectory>
+    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
-    <plugins>
+    <plugins>
-      <plugin>
+      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
+        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
+        <configuration>
-          <includes>
+          <includes>
-            <include>**/*Test*</include>
+            <include>**/*Test*</include>
-          </includes>
+          </includes>
-          <excludes>
+          <excludes>
-            <exclude>**/*AbstractTestCase*</exclude>
+            <exclude>**/*AbstractTestCase*</exclude>
-            <exclude>**/AllIOTestSuite*</exclude>
+            <exclude>**/AllIOTestSuite*</exclude>
-            <exclude>**/PackageTestSuite*</exclude>
+            <exclude>**/PackageTestSuite*</exclude>
-            <exclude>**/testtools/**</exclude>
+            <exclude>**/testtools/**</exclude>
-
+
-            <!-- http://jira.codehaus.org/browse/SUREFIRE-44 -->
+            <!-- http://jira.codehaus.org/browse/SUREFIRE-44 -->
-            <exclude>**/*$*</exclude>
+            <exclude>**/*$*</exclude>
-          </excludes>
+          </excludes>
-        </configuration>
+        </configuration>
-      </plugin>
+      </plugin>
-      <plugin>
+      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
+        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
+        <configuration>
-          <descriptors>
+          <descriptors>
-            <descriptor>src/main/assembly/bin.xml</descriptor>
+            <descriptor>src/main/assembly/bin.xml</descriptor>
-            <descriptor>src/main/assembly/src.xml</descriptor>
+            <descriptor>src/main/assembly/src.xml</descriptor>
-          </descriptors>
+          </descriptors>
-          <tarLongFileMode>gnu</tarLongFileMode>
+          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
+        </configuration>
-      </plugin>
+      </plugin>
-    </plugins>
+    </plugins>
-  </build>
+  </build>
-
+
-  <reporting>
+  <reporting>
-    <plugins>
+    <plugins>
-      <plugin>
+      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changes-plugin</artifactId>
+        <artifactId>maven-changes-plugin</artifactId>
-        <configuration>
+        <configuration>
-          <issueLinkTemplate>%URL%/../%ISSUE%</issueLinkTemplate>
+          <issueLinkTemplate>%URL%/../%ISSUE%</issueLinkTemplate>
-        </configuration>
+        </configuration>
-        <reportSets>
+        <reportSets>
-          <reportSet>
+          <reportSet>
-            <reports>
+            <reports>
-              <report>changes-report</report>
+              <report>changes-report</report>
-              <report>jira-report</report>
+              <report>jira-report</report>
-            </reports>
+            </reports>
-          </reportSet>
+          </reportSet>
-        </reportSets>
+        </reportSets>
-      </plugin>
+      </plugin>
-    </plugins>
+    </plugins>
-  </reporting>
+  </reporting>
-
+
-  <profiles>
+  <profiles>
-    <profile>
+    <profile>
-      <id>release</id>
+      <id>release</id>
-      <build>
+      <build>
-        <plugins>
+        <plugins>
-          <plugin>
+          <plugin>
-            <artifactId>maven-site-plugin</artifactId>
+            <artifactId>maven-site-plugin</artifactId>
-            <executions>
+            <executions>
-              <execution>
+              <execution>
-                <goals>
+                <goals>
-                  <goal>site</goal>
+                  <goal>site</goal>
-                </goals>
+                </goals>
-                <phase>package</phase>
+                <phase>package</phase>
-              </execution>
+              </execution>
-            </executions>
+            </executions>
-          </plugin>
+          </plugin>
-          <plugin>
+          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
+            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
+            <executions>
-              <execution>
+              <execution>
-                <goals>
+                <goals>
-                  <goal>run</goal>
+                  <goal>run</goal>
-                </goals>
+                </goals>
-                <phase>package</phase>
+                <phase>package</phase>
-                <configuration>
+                <configuration>
-                  <tasks>
+                  <tasks>
-                    <copy todir="${project.build.directory}/site/api-release">
+                    <copy todir="${project.build.directory}/site/api-release">
-                      <fileset dir="${project.build.directory}/site/apidocs"/>
+                      <fileset dir="${project.build.directory}/site/apidocs"/>
-                    </copy>
+                    </copy>
-                    <zip destfile="${project.build.directory}/${artifactId}-${version}-javadoc.jar.new">
+                    <zip destfile="${project.build.directory}/${artifactId}-${version}-javadoc.jar.new">
-                      <zipfileset src="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
+                      <zipfileset src="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
-                      <zipfileset dir="." prefix="META-INF">
+                      <zipfileset dir="." prefix="META-INF">
-                        <include name="LICENSE.txt"/>
+                        <include name="LICENSE.txt"/>
-                        <include name="NOTICE.txt"/>
+                        <include name="NOTICE.txt"/>
-                      </zipfileset>
+                      </zipfileset>
-                    </zip>
+                    </zip>
-                    <move file="${project.build.directory}/${artifactId}-${version}-javadoc.jar.new"
+                    <move file="${project.build.directory}/${artifactId}-${version}-javadoc.jar.new"
-                          tofile="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
+                          tofile="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
-                    <zip destfile="${project.build.directory}/${artifactId}-${version}-sources.jar.new">
+                    <zip destfile="${project.build.directory}/${artifactId}-${version}-sources.jar.new">
-                      <zipfileset src="${project.build.directory}/${artifactId}-${version}-sources.jar"/>
+                      <zipfileset src="${project.build.directory}/${artifactId}-${version}-sources.jar"/>
-                      <zipfileset dir="." prefix="META-INF">
+                      <zipfileset dir="." prefix="META-INF">
-                        <include name="LICENSE.txt"/>
+                        <include name="LICENSE.txt"/>
-                        <include name="NOTICE.txt"/>
+                        <include name="NOTICE.txt"/>
-                      </zipfileset>
+                      </zipfileset>
-                    </zip>
+                    </zip>
-                    <move file="${project.build.directory}/${artifactId}-${version}-sources.jar.new"
+                    <move file="${project.build.directory}/${artifactId}-${version}-sources.jar.new"
-                          tofile="${project.build.directory}/${artifactId}-${version}-sources.jar"/>
+                          tofile="${project.build.directory}/${artifactId}-${version}-sources.jar"/>
-                  </tasks>
+                  </tasks>
-                </configuration>
+                </configuration>
-              </execution>
+              </execution>
-            </executions>
+            </executions>
-          </plugin>
+          </plugin>
-          <plugin>
+          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
+            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
+            <executions>
-              <execution>
+              <execution>
-                <goals>
+                <goals>
-                  <goal>attached</goal>
+                  <goal>attached</goal>
-                </goals>
+                </goals>
-                <phase>package</phase>
+                <phase>package</phase>
-              </execution>
+              </execution>
-            </executions>
+            </executions>
-          </plugin>
+          </plugin>
-        </plugins>
+        </plugins>
-      </build>
+      </build>
-    </profile>
+    </profile>
-    <profile>
+    <profile>
-      <id>rc</id>
+      <id>rc</id>
-      <build>
+      <build>
-        <plugins>
+        <plugins>
-          <plugin>
+          <plugin>
-            <artifactId>maven-site-plugin</artifactId>
+            <artifactId>maven-site-plugin</artifactId>
-            <executions>
+            <executions>
-              <execution>
+              <execution>
-                <goals>
+                <goals>
-                  <goal>site</goal>
+                  <goal>site</goal>
-                </goals>
+                </goals>
-                <phase>package</phase>
+                <phase>package</phase>
-              </execution>
+              </execution>
-            </executions>
+            </executions>
-          </plugin>
+          </plugin>
-          <plugin>
+          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
+            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
+            <executions>
-              <execution>
+              <execution>
-                <goals>
+                <goals>
-                  <goal>attached</goal>
+                  <goal>attached</goal>
-                </goals>
+                </goals>
-                <phase>package</phase>
+                <phase>package</phase>
-              </execution>
+              </execution>
-            </executions>
+            </executions>
-          </plugin>
+          </plugin>
-        </plugins>
+        </plugins>
-      </build>
+      </build>
-    </profile>
+    </profile>
-  </profiles>
+  </profiles>
-</project>
+</project>