cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1543061 - in /cxf/xjc-utils/trunk: javadoc/pom.xml javadoc/src/test/java/org/apache/cxf/xjc/javadoc/JavadocPluginTest.java pom.xml
Date Mon, 18 Nov 2013 15:57:08 GMT
Author: dkulp
Date: Mon Nov 18 15:57:08 2013
New Revision: 1543061

URL: http://svn.apache.org/r1543061
Log:
Seems to have some strange command line compiler problem (OK with eclipse compiler)

Modified:
    cxf/xjc-utils/trunk/javadoc/pom.xml
    cxf/xjc-utils/trunk/javadoc/src/test/java/org/apache/cxf/xjc/javadoc/JavadocPluginTest.java
    cxf/xjc-utils/trunk/pom.xml

Modified: cxf/xjc-utils/trunk/javadoc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/javadoc/pom.xml?rev=1543061&r1=1543060&r2=1543061&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/javadoc/pom.xml (original)
+++ cxf/xjc-utils/trunk/javadoc/pom.xml Mon Nov 18 15:57:08 2013
@@ -43,7 +43,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
 			<scope>test</scope>
         </dependency>
 		<dependency>
@@ -59,4 +58,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: cxf/xjc-utils/trunk/javadoc/src/test/java/org/apache/cxf/xjc/javadoc/JavadocPluginTest.java
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/javadoc/src/test/java/org/apache/cxf/xjc/javadoc/JavadocPluginTest.java?rev=1543061&r1=1543060&r2=1543061&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/javadoc/src/test/java/org/apache/cxf/xjc/javadoc/JavadocPluginTest.java
(original)
+++ cxf/xjc-utils/trunk/javadoc/src/test/java/org/apache/cxf/xjc/javadoc/JavadocPluginTest.java
Mon Nov 18 15:57:08 2013
@@ -18,8 +18,6 @@
  */
 package org.apache.cxf.xjc.javadoc;
 
-
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -31,6 +29,7 @@ import java.util.Map;
 
 import com.sun.tools.xjc.BadCommandLineException;
 import com.sun.tools.xjc.Driver;
+import com.sun.tools.xjc.Plugin;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -45,25 +44,19 @@ import org.eclipse.jdt.core.dom.MethodDe
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import static org.apache.cxf.xjc.javadoc.JavadocTestHelper.containsTag;
 import static org.apache.cxf.xjc.javadoc.JavadocTestHelper.javadocContains;
-import static org.hamcrest.CoreMatchers.any;
-import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
 /**
  * End-to-end integration test of JavadocPlugin
- * 
- * @author Dawid Pytel
  */
-public class JavadocPluginTest {
+public class JavadocPluginTest extends Assert {
 
     private static final String PACKAGE_DIR = "org/example/xjc_javadoc_plugin";
     private static final String OUTPUT_DIR = "target";
@@ -80,7 +73,12 @@ public class JavadocPluginTest {
             Driver.run(new String[] {}, System.out, System.out);
             fail("Expected xjc to fail with BadCommandLineException");
         } catch (BadCommandLineException e) {
-            assertThat(e.getOptions().getAllPlugins(), hasItem(any(JavadocPlugin.class)));
+            for (Plugin p : e.getOptions().getAllPlugins()) {
+                if (p instanceof JavadocPlugin) {
+                    return;
+                }
+            }
+            fail("Did not load plugin");
         }
     }
 

Modified: cxf/xjc-utils/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/xjc-utils/trunk/pom.xml?rev=1543061&r1=1543060&r2=1543061&view=diff
==============================================================================
--- cxf/xjc-utils/trunk/pom.xml (original)
+++ cxf/xjc-utils/trunk/pom.xml Mon Nov 18 15:57:08 2013
@@ -95,7 +95,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.7</version>
+                <version>4.11</version>
             </dependency>
             <dependency>
                 <groupId>jaxme</groupId>
@@ -239,7 +239,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>3.1</version>
                     <configuration>
                         <source>1.5</source>
                         <target>1.5</target>
@@ -468,7 +468,7 @@
                          <plugin>
                              <groupId>org.apache.maven.plugins</groupId>
                              <artifactId>maven-compiler-plugin</artifactId>
-                             <version>2.1</version>
+                             <version>3.1</version>
                              <configuration>
                                  <source>${jdk.version}</source>
                                  <target>${jdk.version}</target>



Mime
View raw message