This is an automated email from the ASF dual-hosted git repository. veithen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
commit f537858860cd6dc04e99e5a11fb37d4d83e1a826 Author: Andreas Veithen <[email protected]> AuthorDate: Sun Oct 29 16:04:35 2023 +0000 AXIOM-506: Remove the axiom-all module The Uber-JAR doesn't add much value because it is not deployed to Maven (for good reasons), but nowadays everyone should be using Maven repositories to fetch dependencies. On the other hand, the fact that some of our APIs now have two versions (one for javax and one for Jakarta) makes maintaining an Uber-JAR more complicated. --- axiom-all/pom.xml | 106 --------------------------------- distribution/pom.xml | 5 -- distribution/src/main/assembly/bin.xml | 10 ---- pom.xml | 1 - 4 files changed, 122 deletions(-) diff --git a/axiom-all/pom.xml b/axiom-all/pom.xml deleted file mode 100644 index 20de6d6ac..000000000 --- a/axiom-all/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. 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 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. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom</artifactId> - <version>2.0.0-SNAPSHOT</version> - </parent> - - <artifactId>axiom-all</artifactId> - <packaging>jar</packaging> - - <name>Axiom Uber-JAR</name> - <description>Combines all Axiom artifacts into a single one.</description> - - <properties> - <!-- If we deploy the uber-JAR to the Maven repositories, then we will end up with - some projects depending on the uber-JAR while others depend on the - individual artifacts. To avoid a dependency hell, we must not allow this. - All Maven projects should depend on individual artifacts, not the uber-JAR. --> - <skipDeploy>true</skipDeploy> - </properties> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axiom-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axiom-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axiom-dom</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axiom-compat</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axiom-javax-jaxb</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <artifactSet> - <includes> - <include>${project.groupId}:*</include> - </includes> - </artifactSet> - <transformers> - <transformer implementation="org.apache.axiom.buildutils.shade.axiomxml.AxiomXmlResourceTransformer" /> - </transformers> - <!-- Since the artifact is only included in the binary distribution but not - deployed to Maven repositories, we don't need a dependency reduced POM. --> - <createDependencyReducedPom>false</createDependencyReducedPom> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>shade-axiom-xml</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> -</project> diff --git a/distribution/pom.xml b/distribution/pom.xml index b24970b19..f59e83248 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -61,11 +61,6 @@ <artifactId>axiom-javax-jaxb</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>axiom-all</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>devguide</artifactId> diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml index 1af03b9cc..a15a324f4 100644 --- a/distribution/src/main/assembly/bin.xml +++ b/distribution/src/main/assembly/bin.xml @@ -53,19 +53,9 @@ <includes> <include>*:*:jar</include> </includes> - <excludes> - <exclude>*:axiom-all</exclude> - </excludes> <useProjectArtifact>false</useProjectArtifact> <useTransitiveFiltering>true</useTransitiveFiltering> </dependencySet> - <dependencySet> - <includes> - <include>*:axiom-all</include> - </includes> - <useProjectArtifact>false</useProjectArtifact> - <outputFileNameMapping>axiom.jar</outputFileNameMapping> - </dependencySet> <dependencySet> <outputDirectory>apidocs</outputDirectory> <includes> diff --git a/pom.xml b/pom.xml index 1fab6e918..522830f97 100644 --- a/pom.xml +++ b/pom.xml @@ -218,7 +218,6 @@ <module>axiom-compat</module> <module>axiom-jakarta-jaxb</module> <module>axiom-javax-jaxb</module> - <module>axiom-all</module> <module>samples</module> <module>systests</module> <module>devguide</module>
