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 2015/05/27 23:33:08 UTC
svn commit: r1682123 - in /webservices/axiom/trunk: ./ buildutils/
buildutils/jar-resource-bundle/ buildutils/jar-resource-bundle/src/
buildutils/jar-resource-bundle/src/main/
buildutils/jar-resource-bundle/src/main/resources/
buildutils/jar-resource-b...
Author: veithen
Date: Wed May 27 21:33:07 2015
New Revision: 1682123
URL: http://svn.apache.org/r1682123
Log:
Use a custom resource bundle to include the right NOTICE file into our JARs.
Added:
webservices/axiom/trunk/buildutils/jar-resource-bundle/ (with props)
webservices/axiom/trunk/buildutils/jar-resource-bundle/pom.xml (with props)
webservices/axiom/trunk/buildutils/jar-resource-bundle/src/
webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/
webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/
webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/
webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/LICENSE.vm
- copied, changed from r1682119, maven/resources/tags/apache-jar-resource-bundle-1.4/src/main/resources/META-INF/LICENSE.vm
webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
- copied, changed from r1682119, maven/resources/tags/apache-jar-resource-bundle-1.4/src/main/resources/META-INF/NOTICE.vm
Modified:
webservices/axiom/trunk/buildutils/pom.xml
webservices/axiom/trunk/pom.xml
Propchange: webservices/axiom/trunk/buildutils/jar-resource-bundle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 27 21:33:07 2015
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: webservices/axiom/trunk/buildutils/jar-resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/jar-resource-bundle/pom.xml?rev=1682123&view=auto
==============================================================================
--- webservices/axiom/trunk/buildutils/jar-resource-bundle/pom.xml (added)
+++ webservices/axiom/trunk/buildutils/jar-resource-bundle/pom.xml Wed May 27 21:33:07 2015
@@ -0,0 +1,58 @@
+<?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 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>buildutils</artifactId>
+ <version>1.2.15-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jar-resource-bundle</artifactId>
+ <packaging>jar</packaging>
+
+ <name>JAR Resource Bundle</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Skip process to avoid chicken and egg problem -->
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bundle</id>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: webservices/axiom/trunk/buildutils/jar-resource-bundle/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/LICENSE.vm (from r1682119, maven/resources/tags/apache-jar-resource-bundle-1.4/src/main/resources/META-INF/LICENSE.vm)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/LICENSE.vm?p2=webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/LICENSE.vm&p1=maven/resources/tags/apache-jar-resource-bundle-1.4/src/main/resources/META-INF/LICENSE.vm&r1=1682119&r2=1682123&rev=1682123&view=diff
==============================================================================
--- maven/resources/tags/apache-jar-resource-bundle-1.4/src/main/resources/META-INF/LICENSE.vm (original)
+++ webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/LICENSE.vm Wed May 27 21:33:07 2015
@@ -16,9 +16,6 @@
## specific language governing permissions and limitations
## under the License.
##
-## $Date: 2007-12-11 14:18:43 -0800 (Tue, 11 Dec 2007) $ $Rev: 603385 $
-##
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Copied: webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm (from r1682119, maven/resources/tags/apache-jar-resource-bundle-1.4/src/main/resources/META-INF/NOTICE.vm)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm?p2=webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm&p1=maven/resources/tags/apache-jar-resource-bundle-1.4/src/main/resources/META-INF/NOTICE.vm&r1=1682119&r2=1682123&rev=1682123&view=diff
==============================================================================
--- maven/resources/tags/apache-jar-resource-bundle-1.4/src/main/resources/META-INF/NOTICE.vm (original)
+++ webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm Wed May 27 21:33:07 2015
@@ -16,15 +16,11 @@
## specific language governing permissions and limitations
## under the License.
##
-## $Date: 2008-03-10 23:12:56 -0700 (Mon, 10 Mar 2008) $ $Rev: 635811 $
-##
-
-#if ($projectName)$projectName#else${project.name}#end
-
-Copyright ${projectTimespan}#if($project.organization.name) $project.organization.name#else The Apache Software Foundation#end
-
+ Apache Axiom
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+ Copyright ${projectTimespan} The Apache Software Foundation
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+ Portions Copyright 2006 International Business Machines Corp.
Modified: webservices/axiom/trunk/buildutils/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/pom.xml?rev=1682123&r1=1682122&r2=1682123&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/pom.xml (original)
+++ webservices/axiom/trunk/buildutils/pom.xml Wed May 27 21:33:07 2015
@@ -32,6 +32,7 @@
<name>Build utilities</name>
<modules>
+ <module>jar-resource-bundle</module>
<module>paxexam-maven-plugin</module>
<module>shade-axiom-xml</module>
<module>shade-osgi</module>
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1682123&r1=1682122&r2=1682123&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Wed May 27 21:33:07 2015
@@ -756,6 +756,21 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache.ws.commons.axiom:jar-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>