Author: veithen
Date: Mon Apr 23 09:51:58 2012
New Revision: 1329147
URL: http://svn.apache.org/viewvc?rev=1329147&view=rev
Log:
Merged r1329145 and r1329146 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/rampart/trunk:r1329145-1329146
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml?rev=1329147&r1=1329146&r2=1329147&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml Mon
Apr 23 09:51:58 2012
@@ -34,54 +34,55 @@
<packaging>jar</packaging>
<name>Rampart - Samples</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>basic/sample01/src</source>
-
<source>basic/sample02/src</source>
-
<source>basic/sample03/src</source>
-
<source>basic/sample04/src</source>
-
<source>basic/sample05/src</source>
-
<source>basic/sample06/src</source>
-
<source>basic/sample07/src</source>
-
<source>basic/sample08/src</source>
-
<source>basic/sample09/src</source>
-
<source>basic/sample10/src</source>
-
<source>basic/sample11/src</source>
-
<source>policy/sample01/src</source>
-
<source>policy/sample02/src</source>
-
<source>policy/sample03/src</source>
-
<source>policy/sample04/src</source>
-
<source>policy/sample05/src</source>
-
<source>policy/sample06/src</source>
-
<source>policy/sample07/src</source>
-
<source>policy/sample08/src</source>
-
<source>policy/sample-tomcat/src</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>basic/sample01/src</source>
+ <source>basic/sample02/src</source>
+ <source>basic/sample03/src</source>
+ <source>basic/sample04/src</source>
+ <source>basic/sample05/src</source>
+ <source>basic/sample06/src</source>
+ <source>basic/sample07/src</source>
+ <source>basic/sample08/src</source>
+ <source>basic/sample09/src</source>
+ <source>basic/sample10/src</source>
+ <source>basic/sample11/src</source>
+ <source>policy/sample01/src</source>
+ <source>policy/sample02/src</source>
+ <source>policy/sample03/src</source>
+ <source>policy/sample04/src</source>
+ <source>policy/sample05/src</source>
+ <source>policy/sample06/src</source>
+ <source>policy/sample07/src</source>
+ <source>policy/sample08/src</source>
+ <source>policy/sample-tomcat/src</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
