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/28 00:59:54 UTC
svn commit: r1682134 - in /webservices/axiom/trunk: NOTICE axiom-all/pom.xml
buildutils/jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
implementations/pom.xml
Author: veithen
Date: Wed May 27 22:59:53 2015
New Revision: 1682134
URL: http://svn.apache.org/r1682134
Log:
Add an entry to the relevant NOTICE files indicating that Axiom contains code from AspectJ.
Modified:
webservices/axiom/trunk/NOTICE
webservices/axiom/trunk/axiom-all/pom.xml
webservices/axiom/trunk/buildutils/jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
webservices/axiom/trunk/implementations/pom.xml
Modified: webservices/axiom/trunk/NOTICE
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/NOTICE?rev=1682134&r1=1682133&r2=1682134&view=diff
==============================================================================
--- webservices/axiom/trunk/NOTICE (original)
+++ webservices/axiom/trunk/NOTICE Wed May 27 22:59:53 2015
@@ -10,3 +10,9 @@
Please read the different LICENSE files present in the licenses directory of
this distribution.
+
+ This product includes unmodified, binary redistributions of software (AspectJ)
+ developed for the Eclipse Foundation (http://www.eclipse.org/aspectj), which
+ is licensed under the Eclipse Public License 1.0. Source code for this project
+ can be found at http://git.eclipse.org/c/aspectj/org.aspectj.git. An original
+ copy of the license can be found at http://eclipse.org/legal/epl-v10.html.
Modified: webservices/axiom/trunk/axiom-all/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-all/pom.xml?rev=1682134&r1=1682133&r2=1682134&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-all/pom.xml (original)
+++ webservices/axiom/trunk/axiom-all/pom.xml Wed May 27 22:59:53 2015
@@ -70,6 +70,14 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <properties>
+ <containsAspectJ>true</containsAspectJ>
+ </properties>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
Modified: webservices/axiom/trunk/buildutils/jar-resource-bundle/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?rev=1682134&r1=1682133&r2=1682134&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/jar-resource-bundle/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 22:59:53 2015
@@ -16,11 +16,19 @@
## specific language governing permissions and limitations
## under the License.
##
- Apache Axiom
+ Apache Axiom
- Copyright ${projectTimespan} The Apache Software Foundation
+ Copyright ${projectTimespan} The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
- Portions Copyright 2006 International Business Machines Corp.
+ Portions Copyright 2006 International Business Machines Corp.
+#if ($containsAspectJ)
+
+ This product includes unmodified, binary redistributions of software (AspectJ)
+ developed for the Eclipse Foundation (http://www.eclipse.org/aspectj), which
+ is licensed under the Eclipse Public License 1.0. Source code for this project
+ can be found at http://git.eclipse.org/c/aspectj/org.aspectj.git. An original
+ copy of the license can be found at http://eclipse.org/legal/epl-v10.html.
+#end
\ No newline at end of file
Modified: webservices/axiom/trunk/implementations/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/pom.xml?rev=1682134&r1=1682133&r2=1682134&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/pom.xml (original)
+++ webservices/axiom/trunk/implementations/pom.xml Wed May 27 22:59:53 2015
@@ -39,6 +39,14 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <properties>
+ <containsAspectJ>true</containsAspectJ>
+ </properties>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>