You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/04/19 06:48:42 UTC
svn commit: r649755 - in /servicemix/smx3/branches/servicemix-3.2.2:
build/src/main/resources/notice-supplements.xml distributions/pom.xml
parent/pom.xml
Author: ffang
Date: Fri Apr 18 21:48:38 2008
New Revision: 649755
URL: http://svn.apache.org/viewvc?rev=649755&view=rev
Log:
sync up changes to 3.2.2 release branch
Added:
servicemix/smx3/branches/servicemix-3.2.2/build/src/main/resources/notice-supplements.xml (with props)
Modified:
servicemix/smx3/branches/servicemix-3.2.2/distributions/pom.xml
servicemix/smx3/branches/servicemix-3.2.2/parent/pom.xml
Added: servicemix/smx3/branches/servicemix-3.2.2/build/src/main/resources/notice-supplements.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/build/src/main/resources/notice-supplements.xml?rev=649755&view=auto
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2.2/build/src/main/resources/notice-supplements.xml (added)
+++ servicemix/smx3/branches/servicemix-3.2.2/build/src/main/resources/notice-supplements.xml Fri Apr 18 21:48:38 2008
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<supplementalDataModels>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <name>Sun JAXB Reference Implementation Runtime</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <name>Sun JAXB Reference Implementation Tools</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <name>Sun SAAJ Reference Implementation</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <name>Sun SAAJ API</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <name>Neethi</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <name>Java API for XML-Based Web Services (JAX-WS API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <name>Java Architecture for XML Binding (JAXB API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <name>Apache Xalan-Java</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>net.java.dev.stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ <name>StAX Utilities</name>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
+ <name>Apache WSS4J</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <name>JDOM</name>
+ <organization>
+ <name>jdom.org</name>
+ <url>http://www.jdom.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Modified Apache Software License</name>
+ <url>licenses/jdom.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <name>XML Security</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <name>XML APIs</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ <name>Bouncy Castle Crypto APIs for Java</name>
+ <organization>
+ <name>The Legion of the Bouncy Castle</name>
+ <url>http://www.bouncycastle.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Bouncy Castle License</name>
+ <url>http://www.bouncycastle.org/licence.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <name>Apache Ant</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <name>Apache Ant (nodeps)</name>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <name>Jettison</name>
+ <organization>
+ <name>Envoi Solutions LLC</name>
+ <url>http://www.envoisolutions.com</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://jettison.codehaus.org/License</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+</supplementalDataModels>
Propchange: servicemix/smx3/branches/servicemix-3.2.2/build/src/main/resources/notice-supplements.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: servicemix/smx3/branches/servicemix-3.2.2/build/src/main/resources/notice-supplements.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: servicemix/smx3/branches/servicemix-3.2.2/build/src/main/resources/notice-supplements.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: servicemix/smx3/branches/servicemix-3.2.2/distributions/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/distributions/pom.xml?rev=649755&r1=649754&r2=649755&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2.2/distributions/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2.2/distributions/pom.xml Fri Apr 18 21:48:38 2008
@@ -38,31 +38,60 @@
<module>apache-servicemix-web</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>build</artifactId>
- <version>${servicemix-version}</version>
- <executions>
- <execution>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>build</artifactId>
- <version>3.2.2</version>
- </dependency>
- </dependencies>
- </plugin>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>build</artifactId>
+ <version>${servicemix-version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>build</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>build</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <supplementalModels>
+ <supplementalModel>notice-supplements.xml</supplementalModel>
+ </supplementalModels>
+ <properties>
+ <projectName>Apache ServiceMix</projectName>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: servicemix/smx3/branches/servicemix-3.2.2/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/parent/pom.xml?rev=649755&r1=649754&r2=649755&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2.2/parent/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2.2/parent/pom.xml Fri Apr 18 21:48:38 2008
@@ -170,4 +170,38 @@
</build>
</profile>
</profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>build</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <supplementalModels>
+ <supplementalModel>notice-supplements.xml</supplementalModel>
+ </supplementalModels>
+ <properties>
+ <projectName>Apache ServiceMix</projectName>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>