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 2018/01/05 16:48:06 UTC

[cxf-xjc-utils] branch master updated: Update to latest build-utils

This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-xjc-utils.git


The following commit(s) were added to refs/heads/master by this push:
     new 52eae25  Update to latest build-utils
52eae25 is described below

commit 52eae255a2ab3ffcbf4a1472c6b65f6385064ecf
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Jan 5 11:47:49 2018 -0500

    Update to latest build-utils
---
 .../java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java  |  7 +++----
 .../test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java  |  1 +
 pom.xml                                                    | 14 +++++++++++++-
 .../src/test/java/org/apache/cxf/xjc/ts/ToStringTest.java  |  1 +
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
index f0c8838..7ca2f2f 100644
--- a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
+++ b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaRunner.java
@@ -52,13 +52,12 @@ import com.sun.tools.xjc.reader.internalizer.AbstractReferenceFinderImpl;
 import com.sun.tools.xjc.reader.internalizer.DOMForest;
 import com.sun.tools.xjc.reader.xmlschema.parser.XMLSchemaInternalizationLogic;
 
-import org.apache.xml.resolver.CatalogManager;
-import org.apache.xml.resolver.tools.CatalogResolver;
-import org.sonatype.plexus.build.incremental.BuildContext;
-
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.CtMethod;
+import org.apache.xml.resolver.CatalogManager;
+import org.apache.xml.resolver.tools.CatalogResolver;
+import org.sonatype.plexus.build.incremental.BuildContext;
 
 /**
  * 
diff --git a/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java b/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
index 2f6cab5..e11845a 100644
--- a/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
+++ b/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
@@ -37,6 +37,7 @@ import javax.xml.validation.SchemaFactory;
 
 import org.apache.cxf.configuration.foo.Foo;
 import org.apache.ws.jaxme.impl.DatatypeConverterImpl;
+
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/pom.xml b/pom.xml
index bda3a78..09212c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
     </prerequisites>
 
     <properties>
-        <cxf-buildtools-version>3.3.0</cxf-buildtools-version>
+        <cxf-buildtools-version>3.3.1-SNAPSHOT</cxf-buildtools-version>
         <jdk.version>1.8</jdk.version>
 
         <eclipse.outputDirectory>${basedir}/target/classes</eclipse.outputDirectory>
@@ -386,6 +386,18 @@
                             <artifactId>cxf-buildtools</artifactId>
                             <version>${cxf-buildtools-version}</version>
                         </dependency>
+                        <dependency>
+                            <groupId>com.puppycrawl.tools</groupId>
+                            <artifactId>checkstyle</artifactId>
+                            <version>8.7</version>
+                            <exclusions>
+                                <!--  MCHECKSTYLE-156  -->
+                                <exclusion>
+                                    <groupId>com.sun</groupId>
+                                    <artifactId>tools</artifactId>
+                                </exclusion>
+                            </exclusions>
+                        </dependency>
                     </dependencies>
                     <configuration>
                         <encoding>UTF-8</encoding>
diff --git a/ts-test/src/test/java/org/apache/cxf/xjc/ts/ToStringTest.java b/ts-test/src/test/java/org/apache/cxf/xjc/ts/ToStringTest.java
index 3a36dee..0c420f0 100644
--- a/ts-test/src/test/java/org/apache/cxf/xjc/ts/ToStringTest.java
+++ b/ts-test/src/test/java/org/apache/cxf/xjc/ts/ToStringTest.java
@@ -25,6 +25,7 @@ import java.lang.reflect.Method;
 import org.apache.cxf.configuration.foo.Foo;
 import org.apache.cxf.configuration.foo.TpAddress;
 import org.apache.cxf.configuration.foo.TpAddressPresentation;
+
 import org.junit.Assert;
 import org.junit.Test;
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].