You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/11/08 18:58:55 UTC
[maven] 05/05: [MNG-7324] remove now unused JAXB dependencies
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7129_Modello
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 71596914c26fa7d16d72688e3ef510785fdaf7e2
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Nov 6 18:39:53 2021 +0100
[MNG-7324] remove now unused JAXB dependencies
---
.../main/appended-resources/META-INF/LICENSE.vm | 2 --
.../main/appended-resources/licenses/EDL-1.0.txt | 23 ---------------
maven-core/pom.xml | 33 ----------------------
pom.xml | 1 -
4 files changed, 59 deletions(-)
diff --git a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
index 6ac9f31..d5cba21 100644
--- a/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
@@ -42,8 +42,6 @@ subject to the terms and conditions of the following licenses:
#* *##set ( $spdx = 'EPL-1.0' )
#* *##elseif ( $license.url.contains( "www.apache.org/licenses/LICENSE-2.0" ) )
#* *##set ( $spdx = 'ASL-2.0' )
-#* *##elseif ( $license.url.contains( "www.eclipse.org/org/documents/edl-v10.php" ) )
-#* *##set ( $spdx = 'EDL-1.0' )
#* *##elseif ( $license.url.contains( "www.mozilla.org/en-US/MPL/1.1" ) )
#* *##set ( $spdx = 'MPL-1.1' )
#* *##elseif ( $license.url.contains( "www.gnu.org/licenses/gpl" ) )
diff --git a/apache-maven/src/main/appended-resources/licenses/EDL-1.0.txt b/apache-maven/src/main/appended-resources/licenses/EDL-1.0.txt
deleted file mode 100644
index 259e037..0000000
--- a/apache-maven/src/main/appended-resources/licenses/EDL-1.0.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Eclipse Distribution License - v 1.0
-Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
-
-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/maven-core/pom.xml b/maven-core/pom.xml
index 5ff2215..c3c3c7c 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -157,17 +157,6 @@ under the License.
<version>0.9</version>
</dependency>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.3</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.3.3</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>com.github.albfernandez</groupId>
<artifactId>juniversalchardet</artifactId>
<version>2.4.0</version>
@@ -281,28 +270,6 @@ under the License.
</execution>
</executions>
</plugin>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.5.0</version>
- <executions>
- <execution>
- <id>xjc</id>
- <goals>
- <goal>xjc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <packageName>org.apache.maven.caching.jaxb</packageName>
- <sources>
- <source>src/main/resources/cache-config.xsd</source>
- <source>src/main/resources/cache-domain.xsd</source>
- </sources>
- </configuration>
- </plugin>
- -->
</plugins>
</build>
</project>
diff --git a/pom.xml b/pom.xml
index f76757b..bfadcb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -555,7 +555,6 @@ under the License.
-->
<exclude>src/main/appended-resources/licenses/CDDL-1.0.txt</exclude>
<exclude>src/main/appended-resources/licenses/EPL-1.0.txt</exclude>
- <exclude>src/main/appended-resources/licenses/EDL-1.0.txt</exclude>
<exclude>src/main/appended-resources/licenses/MPL-1.1.txt</exclude>
<exclude>src/main/appended-resources/licenses/LGPL-3.0.txt</exclude>
<exclude>.editorconfig</exclude>