Author: veithen
Date: Tue Aug 16 19:20:20 2011
New Revision: 1158424

URL: http://svn.apache.org/viewvc?rev=1158424&view=rev
Log:
Reintegrated changes from trunk.

Modified:
    webservices/woden/branches/xmlschema2/   (props changed)
    webservices/woden/branches/xmlschema2/pom.xml
    webservices/woden/branches/xmlschema2/woden-ant/pom.xml
    webservices/woden/branches/xmlschema2/woden-api/pom.xml
    webservices/woden/branches/xmlschema2/woden-commons/pom.xml
    webservices/woden/branches/xmlschema2/woden-converter-maven-plugin/pom.xml
    webservices/woden/branches/xmlschema2/woden-dom/pom.xml
    webservices/woden/branches/xmlschema2/woden-om/pom.xml
    webservices/woden/branches/xmlschema2/woden-tool/pom.xml

Propchange: webservices/woden/branches/xmlschema2/
------------------------------------------------------------------------------
    svn:mergeinfo = /webservices/woden/trunk/java:1158394-1158423

Modified: webservices/woden/branches/xmlschema2/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/pom.xml?rev=1158424&r1=1158423&r2=1158424&view=diff
==============================================================================
--- webservices/woden/branches/xmlschema2/pom.xml (original)
+++ webservices/woden/branches/xmlschema2/pom.xml Tue Aug 16 19:20:20 2011
@@ -174,7 +174,15 @@
                     </excludes>
                 </configuration> 
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                    <compilerArgument>-g</compilerArgument>
+                </configuration>
+            </plugin>
       </plugins> 
   </build>
   <repositories>

Modified: webservices/woden/branches/xmlschema2/woden-ant/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-ant/pom.xml?rev=1158424&r1=1158423&r2=1158424&view=diff
==============================================================================
--- webservices/woden/branches/xmlschema2/woden-ant/pom.xml (original)
+++ webservices/woden/branches/xmlschema2/woden-ant/pom.xml Tue Aug 16 19:20:20 
2011
@@ -43,15 +43,6 @@
            </resource>
        </resources>
        <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-compiler-plugin</artifactId>
-               <configuration>
-                   <source>1.5</source>
-                   <target>1.5</target>
-                   <compilerArgument>-g</compilerArgument>
-               </configuration>
-           </plugin>
                   <plugin>
                                <artifactId>maven-jar-plugin</artifactId>
                                <configuration>

Modified: webservices/woden/branches/xmlschema2/woden-api/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-api/pom.xml?rev=1158424&r1=1158423&r2=1158424&view=diff
==============================================================================
--- webservices/woden/branches/xmlschema2/woden-api/pom.xml (original)
+++ webservices/woden/branches/xmlschema2/woden-api/pom.xml Tue Aug 16 19:20:20 
2011
@@ -45,14 +45,6 @@
                
                <plugins>
                        <plugin>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.5</source>
-                                       <target>1.5</target>
-                                       <compilerArgument>-g</compilerArgument>
-                               </configuration>
-                       </plugin>
-                       <plugin>
                                <artifactId>maven-jar-plugin</artifactId>
                                <configuration>
                                        <archive>

Modified: webservices/woden/branches/xmlschema2/woden-commons/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-commons/pom.xml?rev=1158424&r1=1158423&r2=1158424&view=diff
==============================================================================
--- webservices/woden/branches/xmlschema2/woden-commons/pom.xml (original)
+++ webservices/woden/branches/xmlschema2/woden-commons/pom.xml Tue Aug 16 
19:20:20 2011
@@ -44,15 +44,6 @@
        </resources>
        <plugins>
            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-compiler-plugin</artifactId>
-               <configuration>
-                   <source>1.5</source>
-                   <target>1.5</target>
-                   <compilerArgument>-g</compilerArgument>
-               </configuration>
-           </plugin>
-           <plugin>
                                <artifactId>maven-jar-plugin</artifactId>
                                <configuration>
                                        <archive>

Modified: 
webservices/woden/branches/xmlschema2/woden-converter-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-converter-maven-plugin/pom.xml?rev=1158424&r1=1158423&r2=1158424&view=diff
==============================================================================
--- webservices/woden/branches/xmlschema2/woden-converter-maven-plugin/pom.xml 
(original)
+++ webservices/woden/branches/xmlschema2/woden-converter-maven-plugin/pom.xml 
Tue Aug 16 19:20:20 2011
@@ -46,15 +46,6 @@
                </resources>
                <plugins>
                        <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.5</source>
-                                       <target>1.5</target>
-                                       <compilerArgument>-g</compilerArgument>
-                               </configuration>
-                       </plugin>
-                       <plugin>
                                <artifactId>maven-plugin-plugin</artifactId>
                                <version>2.5</version>
                                <configuration>

Modified: webservices/woden/branches/xmlschema2/woden-dom/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-dom/pom.xml?rev=1158424&r1=1158423&r2=1158424&view=diff
==============================================================================
--- webservices/woden/branches/xmlschema2/woden-dom/pom.xml (original)
+++ webservices/woden/branches/xmlschema2/woden-dom/pom.xml Tue Aug 16 19:20:20 
2011
@@ -43,15 +43,6 @@
            </resource>
        </resources>
        <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-compiler-plugin</artifactId>
-               <configuration>
-                   <source>1.5</source>
-                   <target>1.5</target>
-                   <compilerArgument>-g</compilerArgument>
-               </configuration>
-           </plugin>
                   <plugin>
                                <artifactId>maven-jar-plugin</artifactId>
                                <configuration>

Modified: webservices/woden/branches/xmlschema2/woden-om/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-om/pom.xml?rev=1158424&r1=1158423&r2=1158424&view=diff
==============================================================================
--- webservices/woden/branches/xmlschema2/woden-om/pom.xml (original)
+++ webservices/woden/branches/xmlschema2/woden-om/pom.xml Tue Aug 16 19:20:20 
2011
@@ -43,14 +43,6 @@
        </resources>
 
        <plugins>
-           <plugin>
-               <artifactId>maven-compiler-plugin</artifactId>
-               <configuration>
-                   <source>1.5</source>
-                   <target>1.5</target>
-                   <compilerArgument>-g</compilerArgument>
-               </configuration>
-           </plugin>
                   <plugin>
                                <artifactId>maven-jar-plugin</artifactId>
                                <configuration>

Modified: webservices/woden/branches/xmlschema2/woden-tool/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-tool/pom.xml?rev=1158424&r1=1158423&r2=1158424&view=diff
==============================================================================
--- webservices/woden/branches/xmlschema2/woden-tool/pom.xml (original)
+++ webservices/woden/branches/xmlschema2/woden-tool/pom.xml Tue Aug 16 
19:20:20 2011
@@ -44,14 +44,6 @@
        </resources>
 
        <plugins>
-           <plugin>
-               <artifactId>maven-compiler-plugin</artifactId>
-               <configuration>
-                   <source>1.5</source>
-                   <target>1.5</target>
-                   <compilerArgument>-g</compilerArgument>
-               </configuration>
-           </plugin>
                   <plugin>
                                <artifactId>maven-jar-plugin</artifactId>
                                <configuration>


Reply via email to