From c60c3d853277cb4c73a9303a7f56eb8d78124803 Mon Sep 17 00:00:00 2001 From: Lukas Jungmann Date: Thu, 30 Sep 2021 22:06:41 +0200 Subject: [PATCH] use resources the maven way (3.8.2) ...to avoid depending on maven internals Signed-off-by: Lukas Jungmann --- jaxb-ri/LICENSE.md | 28 --------- jaxb-ri/License.html | 56 ----------------- jaxb-ri/codemodel/pom.xml | 61 ++++++++++++++++--- .../codemodel/src/main/assembly/resources.xml | 39 ++++++++++++ jaxb-ri/external/pom.xml | 61 ++++++++++++++++--- .../external/src/main/assembly/resources.xml | 39 ++++++++++++ jaxb-ri/pom.xml | 57 ++++++++++++++--- jaxb-ri/src/main/assembly/resources.xml | 39 ++++++++++++ 8 files changed, 274 insertions(+), 106 deletions(-) delete mode 100644 jaxb-ri/LICENSE.md delete mode 100644 jaxb-ri/License.html create mode 100644 jaxb-ri/codemodel/src/main/assembly/resources.xml create mode 100644 jaxb-ri/external/src/main/assembly/resources.xml create mode 100644 jaxb-ri/src/main/assembly/resources.xml diff --git a/jaxb-ri/LICENSE.md b/jaxb-ri/LICENSE.md deleted file mode 100644 index da1c1cea7..000000000 --- a/jaxb-ri/LICENSE.md +++ /dev/null @@ -1,28 +0,0 @@ -Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - - Neither the name of the Eclipse Foundation, Inc. nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/jaxb-ri/License.html b/jaxb-ri/License.html deleted file mode 100644 index f6990409c..000000000 --- a/jaxb-ri/License.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - Eclipse Distribution License v. 1.0 - - - - - - - -

Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions - are met:

- -
- Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer.
- -
- Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution.
- -
- Neither the name of the Eclipse Foundation, Inc. nor the names of its -contributors may be used to endorse or promote products derived - from this software without specific prior written permission.
- -

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

p - - - diff --git a/jaxb-ri/codemodel/pom.xml b/jaxb-ri/codemodel/pom.xml index f5037c360..5127185c8 100644 --- a/jaxb-ri/codemodel/pom.xml +++ b/jaxb-ri/codemodel/pom.xml @@ -52,10 +52,12 @@ - tools/config/copyright-exclude + ${project.build.directory}/common-resources + ${project.build.commonResourcesDirectory}/legal + ${project.build.commonResourcesDirectory}/config/copyright-exclude false true - tools/config/copyright.txt + ${project.build.commonResourcesDirectory}/config/copyright.txt false false @@ -130,6 +132,11 @@ maven-compiler-plugin 3.8.1 + + org.apache.maven.plugins + maven-assembly-plugin + 3.3.0 + org.apache.maven.plugins maven-deploy-plugin @@ -191,6 +198,50 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + common-resources + generate-resources + + single + + false + + + src/main/assembly/resources.xml + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-resource + generate-resources + + unpack + + + + + com.sun.xml.bind.mvn + jaxb-codemodel-parent + ${project.version} + resources + zip + ${project.build.commonResourcesDirectory} + + + + + + org.codehaus.mojo buildnumber-maven-plugin @@ -222,12 +273,8 @@ - ${basedir}/../../../ + ${legal.doc.source} META-INF - - LICENSE.md - NOTICE.md - diff --git a/jaxb-ri/codemodel/src/main/assembly/resources.xml b/jaxb-ri/codemodel/src/main/assembly/resources.xml new file mode 100644 index 000000000..f89b851c3 --- /dev/null +++ b/jaxb-ri/codemodel/src/main/assembly/resources.xml @@ -0,0 +1,39 @@ + + + + + resources + + zip + + false + + + ${project.basedir}/../.. + legal + + LICENSE.md + NOTICE.md + + + + ${project.basedir}/../tools/config + config + + * + + + + \ No newline at end of file diff --git a/jaxb-ri/external/pom.xml b/jaxb-ri/external/pom.xml index a05d66a85..2aea32211 100644 --- a/jaxb-ri/external/pom.xml +++ b/jaxb-ri/external/pom.xml @@ -54,10 +54,12 @@ - tools/config/copyright-exclude + ${project.build.directory}/common-resources + ${project.build.commonResourcesDirectory}/legal + ${project.build.commonResourcesDirectory}/config/copyright-exclude false true - tools/config/copyright.txt + ${project.build.commonResourcesDirectory}/config/copyright.txt false false @@ -154,6 +156,11 @@ maven-compiler-plugin 3.8.1 + + org.apache.maven.plugins + maven-assembly-plugin + 3.3.0 + org.apache.maven.plugins maven-deploy-plugin @@ -215,6 +222,50 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + common-resources + generate-resources + + single + + false + + + src/main/assembly/resources.xml + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-resource + generate-resources + + unpack + + + + + com.sun.xml.bind.mvn + jaxb-external-parent + ${project.version} + resources + zip + ${project.build.commonResourcesDirectory} + + + + + + org.codehaus.mojo buildnumber-maven-plugin @@ -246,12 +297,8 @@ - ${basedir}/../../../ + ${legal.doc.source} META-INF - - LICENSE.md - NOTICE.md - diff --git a/jaxb-ri/external/src/main/assembly/resources.xml b/jaxb-ri/external/src/main/assembly/resources.xml new file mode 100644 index 000000000..f89b851c3 --- /dev/null +++ b/jaxb-ri/external/src/main/assembly/resources.xml @@ -0,0 +1,39 @@ + + + + + resources + + zip + + false + + + ${project.basedir}/../.. + legal + + LICENSE.md + NOTICE.md + + + + ${project.basedir}/../tools/config + config + + * + + + + \ No newline at end of file diff --git a/jaxb-ri/pom.xml b/jaxb-ri/pom.xml index 3aa799dc3..e699e421b 100644 --- a/jaxb-ri/pom.xml +++ b/jaxb-ri/pom.xml @@ -71,10 +71,12 @@ - tools/config/copyright-exclude + ${project.build.directory}/common-resources + ${project.build.commonResourcesDirectory}/legal + ${project.build.commonResourcesDirectory}/config/copyright-exclude false true - tools/config/copyright.txt + ${project.build.commonResourcesDirectory}/config/copyright.txt false false @@ -94,7 +96,6 @@ ${project.basedir}/src/main/java-mr 8 9 - ${session.executionRootDirectory}/.. true Eclipse Foundation org.eclipse @@ -367,12 +368,8 @@ - ${root.dir} + ${legal.doc.source} META-INF - - LICENSE.md - NOTICE.md - @@ -419,6 +416,50 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + common-resources + generate-resources + + single + + false + + + src/main/assembly/resources.xml + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-resource + generate-resources + + unpack + + + + + com.sun.xml.bind.mvn + jaxb-parent + ${project.version} + resources + zip + ${project.build.commonResourcesDirectory} + + + + + + org.apache.maven.plugins maven-compiler-plugin diff --git a/jaxb-ri/src/main/assembly/resources.xml b/jaxb-ri/src/main/assembly/resources.xml new file mode 100644 index 000000000..c9263fef4 --- /dev/null +++ b/jaxb-ri/src/main/assembly/resources.xml @@ -0,0 +1,39 @@ + + + + + resources + + zip + + false + + + ${project.basedir}/.. + legal + + LICENSE.md + NOTICE.md + + + + ${project.basedir}/tools/config + config + + * + + + + \ No newline at end of file