You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/08/21 02:50:07 UTC
svn commit: r806405 - in /cxf/trunk: ./ parent/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/
rt/frontend/jaxws/ systests/
systests/src/test/java/org/apache/cxf/systest/http_jetty/
Author: dkulp
Date: Fri Aug 21 00:50:06 2009
New Revision: 806405
URL: http://svn.apache.org/viewvc?rev=806405&view=rev
Log:
Update to new versions of plugins
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/pom.xml
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
cxf/trunk/rt/frontend/jaxws/pom.xml
cxf/trunk/systests/pom.xml
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=806405&r1=806404&r2=806405&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Aug 21 00:50:06 2009
@@ -119,13 +119,6 @@
</includes>
</testResource>
<testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- <filtering>true</filtering>
- </testResource>
- <testResource>
<directory>target/generated/src/test/resources</directory>
<includes>
<include>**</include>
@@ -448,8 +441,8 @@
<artifactId>xmlParserAPIs</artifactId>
</exclusion>
<exclusion>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
</exclusion>
</exclusions>
</dependency>
Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=806405&r1=806404&r2=806405&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Fri Aug 21 00:50:06 2009
@@ -340,7 +340,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
+ <version>2.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -376,7 +376,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>1.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -474,7 +474,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
+ <version>2.2-beta-4</version>
</plugin>
<plugin>
@@ -485,7 +485,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.2</version>
+ <version>1.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-9</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -495,7 +520,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.7</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java?rev=806405&r1=806404&r2=806405&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java Fri Aug 21 00:50:06 2009
@@ -29,7 +29,6 @@
import java.util.List;
import java.util.logging.Logger;
-import javax.xml.XMLConstants;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
@@ -37,6 +36,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
@@ -66,7 +66,7 @@
public static Schema createSchema(List<String> locations, Bus bus) {
- SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ SchemaFactory factory = SchemaFactory.newInstance(WSDLConstants.NS_SCHEMA_XSD);
Schema s = null;
try {
List<Source> sources = new ArrayList<Source>();
Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=806405&r1=806404&r2=806405&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Fri Aug 21 00:50:06 2009
@@ -39,11 +39,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
<scope>test</scope>
Modified: cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/pom.xml?rev=806405&r1=806404&r2=806405&view=diff
==============================================================================
--- cxf/trunk/systests/pom.xml (original)
+++ cxf/trunk/systests/pom.xml Fri Aug 21 00:50:06 2009
@@ -464,6 +464,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java?rev=806405&r1=806404&r2=806405&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java Fri Aug 21 00:50:06 2009
@@ -72,6 +72,10 @@
}
for (int i = 0; i < invokers.length; i++) {
invokers[i].join(15 * 1000);
+ long end = System.currentTimeMillis();
+ if ((end - start) > (10 * 1000L)) {
+ return;
+ }
}
long end = System.currentTimeMillis();
assertTrue("unexpected duration: " + (end - start),