You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/10/15 20:02:20 UTC
svn commit: r1843945 - in /webservices/axiom/trunk:
buildutils/jar-resource-bundle/ buildutils/pom.xml distribution/pom.xml
pom.xml
Author: veithen
Date: Mon Oct 15 20:02:20 2018
New Revision: 1843945
URL: http://svn.apache.org/viewvc?rev=1843945&view=rev
Log:
Use the standard Apache resourceBundles to produce LICENSE and NOTICE files.
Removed:
webservices/axiom/trunk/buildutils/jar-resource-bundle/
Modified:
webservices/axiom/trunk/buildutils/pom.xml
webservices/axiom/trunk/distribution/pom.xml
webservices/axiom/trunk/pom.xml
Modified: webservices/axiom/trunk/buildutils/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/pom.xml?rev=1843945&r1=1843944&r2=1843945&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/pom.xml (original)
+++ webservices/axiom/trunk/buildutils/pom.xml Mon Oct 15 20:02:20 2018
@@ -34,7 +34,6 @@
<modules>
<module>buildutils-maven-plugin</module>
- <module>jar-resource-bundle</module>
<module>shade-axiom-xml</module>
</modules>
Modified: webservices/axiom/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/distribution/pom.xml?rev=1843945&r1=1843944&r2=1843945&view=diff
==============================================================================
--- webservices/axiom/trunk/distribution/pom.xml (original)
+++ webservices/axiom/trunk/distribution/pom.xml Mon Oct 15 20:02:20 2018
@@ -144,21 +144,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <!-- The root POM skips the execution if the packaging is "pom", but we need the files
- for inclusion into the distributions. -->
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1843945&r1=1843944&r2=1843945&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Mon Oct 15 20:02:20 2018
@@ -925,11 +925,6 @@
<script><![CDATA[
import java.io.File
- // Avoid chicken and egg problem with jar-resource-bundle
- if (project.packaging == 'pom') {
- project.properties['skipRemoteResources'] = 'true'
- }
-
// Since we don't generate Maven sites for submodules the project URLs computed by Maven
// (parent project URL + artifact ID) are wrong. Make sure that the URL is explicitly set
// to the right location, at least for modules that deploy artifacts.
@@ -1052,19 +1047,11 @@
</plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <skip>${skipRemoteResources}</skip>
- <resourceBundles>
- <resourceBundle>org.apache.ws.commons.axiom:jar-resource-bundle:${project.version}</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <properties>
+ <projectName>Apache Axiom</projectName>
+ </properties>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>