use resources the maven way (3.8.2)
...to avoid depending on maven internals
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/jaxb-ri/LICENSE.md b/jaxb-ri/LICENSE.md
deleted file mode 100644
index da1c1ce..0000000
--- 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 f699040..0000000
--- a/jaxb-ri/License.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en-US">
-<head>
-<!--
-
- Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
-
- SPDX-License-Identifier: BSD-3-Clause
-
--->
-
- <title>Eclipse Distribution License v. 1.0</title>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <style type="text/css">
- li {
- display: block;
- }
- </style>
-</head>
-
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" bgcolor="#ffffff">
-
-
-<p>Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
- are met:</p>
-
-<blockquote>- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.</blockquote>
-
-<blockquote>- 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.</blockquote>
-
-<blockquote>- 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.</blockquote>
-
-<p>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>p
-
-</body>
-</html>
diff --git a/jaxb-ri/codemodel/pom.xml b/jaxb-ri/codemodel/pom.xml
index f5037c3..5127185 100644
--- a/jaxb-ri/codemodel/pom.xml
+++ b/jaxb-ri/codemodel/pom.xml
@@ -52,10 +52,12 @@
</mailingLists>
<properties>
- <copyright.exclude>tools/config/copyright-exclude</copyright.exclude>
+ <project.build.commonResourcesDirectory>${project.build.directory}/common-resources</project.build.commonResourcesDirectory>
+ <legal.doc.source>${project.build.commonResourcesDirectory}/legal</legal.doc.source>
+ <copyright.exclude>${project.build.commonResourcesDirectory}/config/copyright-exclude</copyright.exclude>
<copyright.ignoreyear>false</copyright.ignoreyear>
<copyright.scmonly>true</copyright.scmonly>
- <copyright.template>tools/config/copyright.txt</copyright.template>
+ <copyright.template>${project.build.commonResourcesDirectory}/config/copyright.txt</copyright.template>
<copyright.update>false</copyright.update>
<spotbugs.exclude/>
<spotbugs.skip>false</spotbugs.skip>
@@ -132,6 +134,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
</plugin>
@@ -192,6 +199,50 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>common-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/resources.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-resource</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.sun.xml.bind.mvn</groupId>
+ <artifactId>jaxb-codemodel-parent</artifactId>
+ <version>${project.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.commonResourcesDirectory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
@@ -222,12 +273,8 @@
<configuration>
<resources>
<resource>
- <directory>${basedir}/../../../</directory>
+ <directory>${legal.doc.source}</directory>
<targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.md</include>
- <include>NOTICE.md</include>
- </includes>
</resource>
</resources>
</configuration>
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 0000000..f89b851
--- /dev/null
+++ b/jaxb-ri/codemodel/src/main/assembly/resources.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License v. 1.0, which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: BSD-3-Clause
+
+-->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>resources</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/../..</directory>
+ <outputDirectory>legal</outputDirectory>
+ <includes>
+ <include>LICENSE.md</include>
+ <include>NOTICE.md</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../tools/config</directory>
+ <outputDirectory>config</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/jaxb-ri/external/pom.xml b/jaxb-ri/external/pom.xml
index a05d66a..2aea322 100644
--- a/jaxb-ri/external/pom.xml
+++ b/jaxb-ri/external/pom.xml
@@ -54,10 +54,12 @@
</mailingLists>
<properties>
- <copyright.exclude>tools/config/copyright-exclude</copyright.exclude>
+ <project.build.commonResourcesDirectory>${project.build.directory}/common-resources</project.build.commonResourcesDirectory>
+ <legal.doc.source>${project.build.commonResourcesDirectory}/legal</legal.doc.source>
+ <copyright.exclude>${project.build.commonResourcesDirectory}/config/copyright-exclude</copyright.exclude>
<copyright.ignoreyear>false</copyright.ignoreyear>
<copyright.scmonly>true</copyright.scmonly>
- <copyright.template>tools/config/copyright.txt</copyright.template>
+ <copyright.template>${project.build.commonResourcesDirectory}/config/copyright.txt</copyright.template>
<copyright.update>false</copyright.update>
<spotbugs.exclude/>
<spotbugs.skip>false</spotbugs.skip>
@@ -156,6 +158,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
</plugin>
@@ -216,6 +223,50 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>common-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/resources.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-resource</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.sun.xml.bind.mvn</groupId>
+ <artifactId>jaxb-external-parent</artifactId>
+ <version>${project.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.commonResourcesDirectory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
@@ -246,12 +297,8 @@
<configuration>
<resources>
<resource>
- <directory>${basedir}/../../../</directory>
+ <directory>${legal.doc.source}</directory>
<targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.md</include>
- <include>NOTICE.md</include>
- </includes>
</resource>
</resources>
</configuration>
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 0000000..f89b851
--- /dev/null
+++ b/jaxb-ri/external/src/main/assembly/resources.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License v. 1.0, which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: BSD-3-Clause
+
+-->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>resources</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/../..</directory>
+ <outputDirectory>legal</outputDirectory>
+ <includes>
+ <include>LICENSE.md</include>
+ <include>NOTICE.md</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../tools/config</directory>
+ <outputDirectory>config</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/jaxb-ri/pom.xml b/jaxb-ri/pom.xml
index 3aa799d..e699e42 100644
--- a/jaxb-ri/pom.xml
+++ b/jaxb-ri/pom.xml
@@ -71,10 +71,12 @@
</mailingLists>
<properties>
- <copyright.exclude>tools/config/copyright-exclude</copyright.exclude>
+ <project.build.commonResourcesDirectory>${project.build.directory}/common-resources</project.build.commonResourcesDirectory>
+ <legal.doc.source>${project.build.commonResourcesDirectory}/legal</legal.doc.source>
+ <copyright.exclude>${project.build.commonResourcesDirectory}/config/copyright-exclude</copyright.exclude>
<copyright.ignoreyear>false</copyright.ignoreyear>
<copyright.scmonly>true</copyright.scmonly>
- <copyright.template>tools/config/copyright.txt</copyright.template>
+ <copyright.template>${project.build.commonResourcesDirectory}/config/copyright.txt</copyright.template>
<copyright.update>false</copyright.update>
<spotbugs.exclude/>
<spotbugs.skip>false</spotbugs.skip>
@@ -94,7 +96,6 @@
<mrjar.sourceDirectory>${project.basedir}/src/main/java-mr</mrjar.sourceDirectory>
<base.java.level>8</base.java.level>
<upper.java.level>9</upper.java.level>
- <root.dir>${session.executionRootDirectory}/..</root.dir>
<oss.disallow.snapshots>true</oss.disallow.snapshots>
<vendor.name>Eclipse Foundation</vendor.name>
<vendor.id>org.eclipse</vendor.id>
@@ -367,12 +368,8 @@
<configuration>
<resources>
<resource>
- <directory>${root.dir}</directory>
+ <directory>${legal.doc.source}</directory>
<targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.md</include>
- <include>NOTICE.md</include>
- </includes>
</resource>
</resources>
</configuration>
@@ -421,6 +418,50 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>common-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/resources.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-resource</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.sun.xml.bind.mvn</groupId>
+ <artifactId>jaxb-parent</artifactId>
+ <version>${project.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.commonResourcesDirectory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
diff --git a/jaxb-ri/src/main/assembly/resources.xml b/jaxb-ri/src/main/assembly/resources.xml
new file mode 100644
index 0000000..c9263fe
--- /dev/null
+++ b/jaxb-ri/src/main/assembly/resources.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License v. 1.0, which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: BSD-3-Clause
+
+-->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>resources</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <outputDirectory>legal</outputDirectory>
+ <includes>
+ <include>LICENSE.md</include>
+ <include>NOTICE.md</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/tools/config</directory>
+ <outputDirectory>config</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
