cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1348240 - in /cxf/trunk: ./ api/ common/wstx-msv-validation/ maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/ maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/ parent/ rt...
Date Fri, 08 Jun 2012 20:53:07 GMT
Author: dkulp
Date: Fri Jun  8 20:53:05 2012
New Revision: 1348240

URL: http://svn.apache.org/viewvc?rev=1348240&view=rev
Log:
Remove the JDK 1.5 related profiles and settings from the build

Modified:
    cxf/trunk/api/pom.xml
    cxf/trunk/common/wstx-msv-validation/pom.xml
    cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
    cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
    cxf/trunk/parent/pom.xml
    cxf/trunk/pom.xml
    cxf/trunk/rt/bindings/coloc/pom.xml
    cxf/trunk/rt/bindings/soap/pom.xml
    cxf/trunk/rt/databinding/jibx/pom.xml
    cxf/trunk/rt/databinding/sdo/pom.xml
    cxf/trunk/rt/frontend/jaxws/pom.xml
    cxf/trunk/rt/frontend/js/pom.xml
    cxf/trunk/rt/rs/security/sso/saml/pom.xml
    cxf/trunk/rt/rs/security/xml/pom.xml
    cxf/trunk/rt/transports/jms/pom.xml
    cxf/trunk/rt/ws/addr/pom.xml
    cxf/trunk/rt/ws/policy/pom.xml
    cxf/trunk/rt/ws/rm/pom.xml
    cxf/trunk/rt/ws/security/pom.xml
    cxf/trunk/services/sts/sts-core/pom.xml
    cxf/trunk/services/sts/systests/advanced/pom.xml
    cxf/trunk/services/sts/systests/basic/pom.xml
    cxf/trunk/services/wsn/wsn-api/pom.xml
    cxf/trunk/services/wsn/wsn-core/pom.xml
    cxf/trunk/systests/rs-security/pom.xml
    cxf/trunk/systests/ws-security-examples/pom.xml
    cxf/trunk/systests/ws-security/pom.xml
    cxf/trunk/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
    cxf/trunk/testutils/pom.xml
    cxf/trunk/tools/common/pom.xml
    cxf/trunk/tools/javato/ws/pom.xml
    cxf/trunk/tools/validator/pom.xml
    cxf/trunk/tools/wsdlto/core/pom.xml
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
    cxf/trunk/tools/wsdlto/misc/pom.xml

Modified: cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Fri Jun  8 20:53:05 2012
@@ -291,61 +291,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${cxf.saaj.impl.groupId}</groupId>
-                    <artifactId>${cxf.saaj.impl.artifactId}</artifactId>
-                    <version>${cxf.saaj.impl.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${extra.saaj.dep.groupId}</groupId>
-                    <artifactId>${extra.saaj.dep.artifactId}</artifactId>
-                    <version>${extra.saaj.dep.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${cxf.stax.impl.groupId}</groupId>
-                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
 
 </project>

Modified: cxf/trunk/common/wstx-msv-validation/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/common/wstx-msv-validation/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/common/wstx-msv-validation/pom.xml (original)
+++ cxf/trunk/common/wstx-msv-validation/pom.xml Fri Jun  8 20:53:05 2012
@@ -62,18 +62,4 @@
 	  <artifactId>xmlschema-core</artifactId>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>

Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml Fri Jun  8 20:53:05 2012
@@ -68,8 +68,8 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>1.6</source>
+                        <target>1.6</target>
                     </configuration>
                 </plugin>
                 <plugin>

Modified: cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml (original)
+++ cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml Fri Jun  8 20:53:05 2012
@@ -73,8 +73,8 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>1.6</source>
+                        <target>1.6</target>
                     </configuration>
                 </plugin>
                 <plugin>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Jun  8 20:53:05 2012
@@ -341,7 +341,7 @@
                             <ruleset>${cxf.resources.base.path}cxf-pmd-custom.xml</ruleset>
                         </rulesets>
                         <sourceEncoding>UTF-8</sourceEncoding>
-                        <targetJdk>1.5</targetJdk>
+                        <targetJdk>1.6</targetJdk>
                         <linkXRef>false</linkXRef>
                         <includeTests>true</includeTests>
                         <verbose>true</verbose>
@@ -1524,18 +1524,6 @@
 
     <profiles>
         <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <properties>
-                <cxf.jaxb.version>${cxf.jaxb22.version}</cxf.jaxb.version>
-                <cxf.jaxb.impl.version>${cxf.jaxb22.impl.version}</cxf.jaxb.impl.version>
-                <cxf.jaxb.xjc.version>${cxf.jaxb22.impl.version}</cxf.jaxb.xjc.version>
-                <jdk.version>1.5</jdk.version>
-            </properties>
-        </profile>
-        <profile>
             <id>jdk17</id>
             <activation>
                 <jdk>1.7</jdk>
@@ -1776,7 +1764,7 @@
                                 <ruleset>${cxf.resources.base.path}cxf-pmd-ruleset.xml</ruleset>
                             </rulesets>
                             <sourceEncoding>UTF-8</sourceEncoding>
-                            <targetJdk>1.5</targetJdk>
+                            <targetJdk>1.6</targetJdk>
                             <linkXRef>false</linkXRef>
                             <includeTests>true</includeTests>
                             <verbose>true</verbose>

Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Fri Jun  8 20:53:05 2012
@@ -423,15 +423,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <properties>
-                <jdk.version>1.5</jdk.version>
-            </properties>
-        </profile>
     <profile>
       <id>maven-3-site</id>
       <activation>
@@ -515,10 +506,10 @@
                     <version>2.8</version>
                     <configuration>
                         <attach>true</attach>
-                        <source>1.5</source>
+                        <source>1.6</source>
                         <quiet>true</quiet>
                         <bottom>Apache CXF</bottom>
-                        <javadocVersion>1.5</javadocVersion>
+                        <javadocVersion>1.6</javadocVersion>
                         <encoding>UTF-8</encoding>
                         <detectOfflineLinks>false</detectOfflineLinks>
                         <notimestamp>true</notimestamp>
@@ -540,8 +531,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>2.5.1</version>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>1.6</source>
+                        <target>1.6</target>
                         <maxmem>256M</maxmem>
                         <fork>${cxf.compiler.fork}</fork>
                         <encoding>UTF-8</encoding>

Modified: cxf/trunk/rt/bindings/coloc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/coloc/pom.xml (original)
+++ cxf/trunk/rt/bindings/coloc/pom.xml Fri Jun  8 20:53:05 2012
@@ -86,18 +86,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>

Modified: cxf/trunk/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/pom.xml (original)
+++ cxf/trunk/rt/bindings/soap/pom.xml Fri Jun  8 20:53:05 2012
@@ -94,58 +94,4 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
-
-
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-javamail_1.4_spec</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                    <scope>compile</scope>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${cxf.saaj.impl.groupId}</groupId>
-                    <artifactId>${cxf.saaj.impl.artifactId}</artifactId>
-                    <version>${cxf.saaj.impl.version}</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>${extra.saaj.dep.groupId}</groupId>
-                    <artifactId>${extra.saaj.dep.artifactId}</artifactId>
-                    <version>${extra.saaj.dep.version}</version>
-                    <optional>true</optional>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                    <optional>true</optional>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
 </project>

Modified: cxf/trunk/rt/databinding/jibx/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jibx/pom.xml (original)
+++ cxf/trunk/rt/databinding/jibx/pom.xml Fri Jun  8 20:53:05 2012
@@ -100,22 +100,4 @@
             <artifactId>jibx-tools</artifactId>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${cxf.stax.impl.groupId}</groupId>
-                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>

Modified: cxf/trunk/rt/databinding/sdo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/pom.xml (original)
+++ cxf/trunk/rt/databinding/sdo/pom.xml Fri Jun  8 20:53:05 2012
@@ -186,18 +186,6 @@
 
     <profiles>
         <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
             <id>setup.eclipse</id>
             <build>
                 <defaultGoal>process-test-sources</defaultGoal>

Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Fri Jun  8 20:53:05 2012
@@ -347,90 +347,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <properties>
-                <cxf.spi-dir>spi-2.2</cxf.spi-dir>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-transports-http</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${cxf.stax.impl.groupId}</groupId>
-                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${cxf.saaj.impl.groupId}</groupId>
-                    <artifactId>${cxf.saaj.impl.artifactId}</artifactId>
-                    <version>${cxf.saaj.impl.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>${extra.saaj.dep.groupId}</groupId>
-                    <artifactId>${extra.saaj.dep.artifactId}</artifactId>
-                    <version>${extra.saaj.dep.version}</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-jaxws22-source</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${basedir}/src/main/jaxws22</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>add-jaxws22-test-source</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${basedir}/src/test/jaxws22</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
-
 </project>

Modified: cxf/trunk/rt/frontend/js/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/js/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/js/pom.xml (original)
+++ cxf/trunk/rt/frontend/js/pom.xml Fri Jun  8 20:53:05 2012
@@ -66,27 +66,4 @@
 
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                </dependency>
-
-            </dependencies>
-        </profile>
-    </profiles>
 </project>

Modified: cxf/trunk/rt/rs/security/sso/saml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/sso/saml/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/sso/saml/pom.xml (original)
+++ cxf/trunk/rt/rs/security/sso/saml/pom.xml Fri Jun  8 20:53:05 2012
@@ -77,55 +77,4 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>create-endorsed-dir</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>xerces</groupId>
-                                            <artifactId>xercesImpl</artifactId>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>xml-apis</groupId>
-                                            <artifactId>xml-apis</artifactId>
-                                            <version>1.3.04</version>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

Modified: cxf/trunk/rt/rs/security/xml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/xml/pom.xml (original)
+++ cxf/trunk/rt/rs/security/xml/pom.xml Fri Jun  8 20:53:05 2012
@@ -61,55 +61,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>create-endorsed-dir</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>xerces</groupId>
-                                            <artifactId>xercesImpl</artifactId>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>xml-apis</groupId>
-                                            <artifactId>xml-apis</artifactId>
-                                            <version>1.3.04</version>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

Modified: cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Fri Jun  8 20:53:05 2012
@@ -185,24 +185,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
 </project>

Modified: cxf/trunk/rt/ws/addr/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/pom.xml (original)
+++ cxf/trunk/rt/ws/addr/pom.xml Fri Jun  8 20:53:05 2012
@@ -86,22 +86,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-         <profile>
-             <id>jdk15</id>
-             <activation>
-                 <jdk>1.5</jdk>
-             </activation>
-             <dependencies>
-                 <dependency>
-                      <groupId>org.apache.geronimo.specs</groupId>
-                      <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                  </dependency>
-                  <dependency>
-                      <groupId>org.apache.geronimo.specs</groupId>
-                      <artifactId>geronimo-activation_1.1_spec</artifactId>
-                  </dependency>
-             </dependencies>
-         </profile>
-    </profiles>
 </project>

Modified: cxf/trunk/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/pom.xml (original)
+++ cxf/trunk/rt/ws/policy/pom.xml Fri Jun  8 20:53:05 2012
@@ -180,27 +180,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>

Modified: cxf/trunk/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/pom.xml (original)
+++ cxf/trunk/rt/ws/rm/pom.xml Fri Jun  8 20:53:05 2012
@@ -191,20 +191,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
 </project>

Modified: cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Fri Jun  8 20:53:05 2012
@@ -176,82 +176,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${cxf.saaj.impl.groupId}</groupId>
-                    <artifactId>${cxf.saaj.impl.artifactId}</artifactId>
-                    <version>${cxf.saaj.impl.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${extra.saaj.dep.groupId}</groupId>
-                    <artifactId>${extra.saaj.dep.artifactId}</artifactId>
-                    <version>${extra.saaj.dep.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>xalan</groupId>
-                    <artifactId>xalan</artifactId>
-                    <version>2.7.1</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>xml-apis</groupId>
-                            <artifactId>xml-apis</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>create-endorsed-dir</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>xerces</groupId>
-                                            <artifactId>xercesImpl</artifactId>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>xml-apis</groupId>
-                                            <artifactId>xml-apis</artifactId>
-                                            <version>1.3.04</version>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        </profiles>
-
 </project>

Modified: cxf/trunk/services/sts/sts-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/pom.xml (original)
+++ cxf/trunk/services/sts/sts-core/pom.xml Fri Jun  8 20:53:05 2012
@@ -115,53 +115,5 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>create-endorsed-dir</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>xerces</groupId>
-                                            <artifactId>xercesImpl</artifactId>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>xml-apis</groupId>
-                                            <artifactId>xml-apis</artifactId>
-                                            <version>1.3.04</version>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                 </configuration>
-                             </execution>
-                         </executions>
-                    </plugin>
-                    <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-surefire-plugin</artifactId>
-                         <configuration>
-                             <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine>
-                         </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-    
 </project>
  

Modified: cxf/trunk/services/sts/systests/advanced/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/pom.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/pom.xml Fri Jun  8 20:53:05 2012
@@ -192,68 +192,6 @@
                 </plugins>
              </build>
         </profile>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>create-endorsed-dir</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>xerces</groupId>
-                                            <artifactId>xercesImpl</artifactId>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>xml-apis</groupId>
-                                            <artifactId>xml-apis</artifactId>
-                                            <version>1.3.04</version>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                 </configuration>
-                             </execution>
-                         </executions>
-                    </plugin>
-                    <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-surefire-plugin</artifactId>
-                         <configuration>
-                             <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine>
-                             <systemPropertyVariables>
-                                <sts.deployment>standalone</sts.deployment>
-                                <java.security.auth.login.config>src/test/resources/kerberos.jaas</java.security.auth.login.config>
-                                <java.io.tmpdir>${basedir}/target/tmp</java.io.tmpdir>
-                             </systemPropertyVariables>
-                         </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
 </project>

Modified: cxf/trunk/services/sts/systests/basic/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/pom.xml (original)
+++ cxf/trunk/services/sts/systests/basic/pom.xml Fri Jun  8 20:53:05 2012
@@ -184,67 +184,6 @@
                 </plugins>
              </build>
         </profile>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>create-endorsed-dir</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>xerces</groupId>
-                                            <artifactId>xercesImpl</artifactId>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>xml-apis</groupId>
-                                            <artifactId>xml-apis</artifactId>
-                                            <version>1.3.04</version>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                 </configuration>
-                             </execution>
-                         </executions>
-                    </plugin>
-                    <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-surefire-plugin</artifactId>
-                         <configuration>
-                             <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine>
-                             <systemPropertyVariables>
-                                <sts.deployment>standalone</sts.deployment>
-                                <java.io.tmpdir>${basedir}/target/tmp</java.io.tmpdir>
-                             </systemPropertyVariables>
-                         </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
 </project>

Modified: cxf/trunk/services/wsn/wsn-api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-api/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-api/pom.xml Fri Jun  8 20:53:05 2012
@@ -105,32 +105,4 @@
             </plugin>
 		</plugins>
 	</build>
-
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                 <jdk>1.5</jdk>
-             </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
 </project>

Modified: cxf/trunk/services/wsn/wsn-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-core/pom.xml Fri Jun  8 20:53:05 2012
@@ -178,32 +178,4 @@
             </plugin>
 		</plugins>
 	</build>
-
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                 <jdk>1.5</jdk>
-             </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
 </project>

Modified: cxf/trunk/systests/rs-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/rs-security/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/systests/rs-security/pom.xml (original)
+++ cxf/trunk/systests/rs-security/pom.xml Fri Jun  8 20:53:05 2012
@@ -221,54 +221,6 @@
         </plugins>
     </build>
     
-
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>create-endorsed-dir</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>xerces</groupId>
-                                            <artifactId>xercesImpl</artifactId>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>xml-apis</groupId>
-                                            <artifactId>xml-apis</artifactId>
-                                            <version>1.3.04</version>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
     <repositories>
         <repository>
             <id>oauth</id>
@@ -276,6 +228,4 @@
             <url>http://oauth.googlecode.com/svn/code/maven/</url>
         </repository>
     </repositories>
-    
-
 </project>

Modified: cxf/trunk/systests/ws-security-examples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security-examples/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security-examples/pom.xml (original)
+++ cxf/trunk/systests/ws-security-examples/pom.xml Fri Jun  8 20:53:05 2012
@@ -208,51 +208,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>create-endorsed-dir</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>xerces</groupId>
-                                            <artifactId>xercesImpl</artifactId>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>xml-apis</groupId>
-                                            <artifactId>xml-apis</artifactId>
-                                            <version>1.3.04</version>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                 </configuration>
-                             </execution>
-                         </executions>
-                    </plugin>
-                    <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-surefire-plugin</artifactId>
-                         <configuration>
-                             <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine>
-                         </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
 </project>

Modified: cxf/trunk/systests/ws-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/pom.xml (original)
+++ cxf/trunk/systests/ws-security/pom.xml Fri Jun  8 20:53:05 2012
@@ -213,51 +213,6 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>create-endorsed-dir</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>xerces</groupId>
-                                            <artifactId>xercesImpl</artifactId>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>xml-apis</groupId>
-                                            <artifactId>xml-apis</artifactId>
-                                            <version>1.3.04</version>
-                                            <outputDirectory>${basedir}/target/endorsed</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                 </configuration>
-                             </execution>
-                         </executions>
-                    </plugin>
-                    <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-surefire-plugin</artifactId>
-                         <configuration>
-                             <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine>
-                         </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
 </project>

Modified: cxf/trunk/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml (original)
+++ cxf/trunk/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml Fri Jun  8 20:53:05 2012
@@ -37,10 +37,10 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.3.2</version>
+                    <version>2.5.1</version>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>1.6</source>
+                        <target>1.6</target>
                     </configuration>
                 </plugin>
             </plugins>

Modified: cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/testutils/pom.xml (original)
+++ cxf/trunk/testutils/pom.xml Fri Jun  8 20:53:05 2012
@@ -267,38 +267,6 @@
 
     <profiles>
         <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
             <id>setup.eclipse</id>
             <build>
                 <defaultGoal>process-test-sources</defaultGoal>

Modified: cxf/trunk/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/tools/common/pom.xml (original)
+++ cxf/trunk/tools/common/pom.xml Fri Jun  8 20:53:05 2012
@@ -76,28 +76,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>

Modified: cxf/trunk/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/pom.xml (original)
+++ cxf/trunk/tools/javato/ws/pom.xml Fri Jun  8 20:53:05 2012
@@ -209,32 +209,4 @@
 
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${cxf.stax.impl.groupId}</groupId>
-                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
 </project>

Modified: cxf/trunk/tools/validator/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/tools/validator/pom.xml (original)
+++ cxf/trunk/tools/validator/pom.xml Fri Jun  8 20:53:05 2012
@@ -89,27 +89,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${cxf.stax.impl.groupId}</groupId>
-                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>

Modified: cxf/trunk/tools/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/pom.xml (original)
+++ cxf/trunk/tools/wsdlto/core/pom.xml Fri Jun  8 20:53:05 2012
@@ -112,27 +112,4 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${cxf.stax.impl.groupId}</groupId>
-                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm Fri Jun  8 20:53:05 2012
@@ -38,15 +38,15 @@
         <pathelement location="${tools.jar}"/>
     </path>
 
-    <condition property="is.java.version.15">
+    <condition property="is.java.version.16">
         <or>
-          <equals arg1="${ant.java.version}" arg2="1.5"/>
           <equals arg1="${ant.java.version}" arg2="1.6"/>
+          <equals arg1="${ant.java.version}" arg2="1.7"/>
         </or>
     </condition>
 
-    <fail message="cxf requires Java version 1.5 or higher. You are currently using Java version ${ant.java.version}."
-          unless="is.java.version.15"/>
+    <fail message="cxf requires Java version 1.6 or higher. You are currently using Java version ${ant.java.version}."
+          unless="is.java.version.16"/>
 
     <!-- Determine cxf.home, either from the environment variable CXF_HOME
          - or using ../..

Modified: cxf/trunk/tools/wsdlto/misc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/pom.xml?rev=1348240&r1=1348239&r2=1348240&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/pom.xml (original)
+++ cxf/trunk/tools/wsdlto/misc/pom.xml Fri Jun  8 20:53:05 2012
@@ -101,24 +101,4 @@
         </dependency>
 
     </dependencies>
-    <profiles>
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>${cxf.stax.impl.groupId}</groupId>
-                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
 </project>



Mime
View raw message