Author: dkulp
Date: Fri Mar 21 09:44:53 2008
New Revision: 639710
URL: http://svn.apache.org/viewvc?rev=639710&view=rev
Log:
Merged revisions 639651 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r639651 | dkulp | 2008-03-21 10:08:41 -0400 (Fri, 21 Mar 2008) | 2 lines
Updates for latest legal requirements
........
Added:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/appended-resources/META-INF/LICENSE.vm
- copied unchanged from r639651,
incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/LICENSE.vm
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/distribution/ (props changed)
incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml
incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
incubator/cxf/branches/2.0.x-fixes/pom.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange: incubator/cxf/branches/2.0.x-fixes/distribution/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 21 09:44:53 2008
@@ -7,3 +7,4 @@
.project
.wtpmodules
maven-build.xml
+velocity.log
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml?rev=639710&r1=639709&r2=639710&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml Fri Mar 21
09:44:53 2008
@@ -37,7 +37,6 @@
<maven.test.skip>true</maven.test.skip>
<cxf.version>${pom.version}</cxf.version>
<createSourcesJar>false</createSourcesJar>
- <shade.version>1.0</shade.version>
</properties>
<dependencies>
@@ -261,7 +260,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>${shade.version}</version>
+ <version>1.0.1</version>
<executions>
<execution>
<phase>package</phase>
Modified:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml?rev=639710&r1=639709&r2=639710&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml
(original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml
Fri Mar 21 09:44:53 2008
@@ -69,6 +69,7 @@
<exclude>**/.wtpmodules</exclude>
<exclude>**/surefire*</exclude>
<exclude>**/cobertura.ser</exclude>
+ <exclude>**/velocity.log</exclude>
<exclude>bin</exclude>
<exclude>bin/*</exclude>
<exclude>**/var/journal</exclude>
Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=639710&r1=639709&r2=639710&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Fri Mar 21 09:44:53 2008
@@ -252,7 +252,7 @@
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -268,14 +268,12 @@
<configuration>
<resourceBundles>
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
<supplementalModels>
<supplementalModel>notice-supplements.xml</supplementalModel>
</supplementalModels>
<properties>
- <addLicense>true</addLicense>
- <addArtifact>true</addArtifact>
<projectName>Apache CXF</projectName>
</properties>
</configuration>
Modified: incubator/cxf/branches/2.0.x-fixes/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/pom.xml?rev=639710&r1=639709&r2=639710&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/pom.xml Fri Mar 21 09:44:53 2008
@@ -365,7 +365,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
<configuration>
<attach>true</attach>
<quiet>true</quiet>
