ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1672901 - in /webservices/axiom/trunk: modules/axiom-api/pom.xml modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java pom.xml systests/osgi-tests/pom.xml
Date Sat, 11 Apr 2015 17:04:31 GMT
Author: veithen
Date: Sat Apr 11 17:04:31 2015
New Revision: 1672901

URL: http://svn.apache.org/r1672901
Log:
Instead of copying artifacts with maven-dependency-plugin, generate a list of paths to the
artifacts.

Modified:
    webservices/axiom/trunk/modules/axiom-api/pom.xml
    webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
    webservices/axiom/trunk/pom.xml
    webservices/axiom/trunk/systests/osgi-tests/pom.xml

Modified: webservices/axiom/trunk/modules/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/pom.xml?rev=1672901&r1=1672900&r2=1672901&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-api/pom.xml Sat Apr 11 17:04:31 2015
@@ -115,78 +115,80 @@
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
+                <groupId>com.github.veithen.alta</groupId>
+                <artifactId>alta-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-parsers</id>
                         <phase>generate-test-resources</phase>
                         <goals>
-                            <goal>copy</goal>
+                            <goal>generate-files</goal>
                         </goals>
                         <configuration>
-                            <artifactItems>
-                                <artifactItem>
+                            <name>parsers.list</name>
+                            <value>%file%</value>
+                            <separator>${line.separator}</separator>
+                            <artifacts>
+                                <artifact>
                                     <groupId>org.codehaus.woodstox</groupId>
                                     <artifactId>wstx-asl</artifactId>
                                     <version>3.2.7</version>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     <groupId>org.codehaus.woodstox</groupId>
                                     <artifactId>wstx-asl</artifactId>
                                     <version>3.2.8</version>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     <groupId>org.codehaus.woodstox</groupId>
                                     <artifactId>wstx-asl</artifactId>
                                     <version>3.2.9</version>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     <groupId>org.codehaus.woodstox</groupId>
                                     <artifactId>woodstox-core-asl</artifactId>
                                     <version>4.0.8</version>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     <groupId>org.codehaus.woodstox</groupId>
                                     <artifactId>woodstox-core-asl</artifactId>
                                     <version>4.0.11</version>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     <groupId>org.codehaus.woodstox</groupId>
                                     <artifactId>woodstox-core-asl</artifactId>
                                     <version>4.1.0</version>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     <groupId>org.codehaus.woodstox</groupId>
                                     <artifactId>woodstox-core-asl</artifactId>
                                     <version>4.1.2</version>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     <groupId>org.codehaus.woodstox</groupId>
                                     <artifactId>woodstox-core-asl</artifactId>
                                     <version>4.1.3</version>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     <groupId>org.codehaus.woodstox</groupId>
                                     <artifactId>woodstox-core-asl</artifactId>
                                     <version>4.1.4</version>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     <groupId>org.codehaus.woodstox</groupId>
                                     <artifactId>woodstox-core-asl</artifactId>
                                     <version>4.2.0</version>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     <groupId>com.sun.xml.stream</groupId>
                                     <artifactId>sjsxp</artifactId>
                                     <version>1.0.1</version>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     <groupId>stax</groupId>
                                     <artifactId>stax</artifactId>
                                     <version>1.2.0</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/parsers</outputDirectory>
+                                </artifact>
+                            </artifacts>
                         </configuration>
                     </execution>
                 </executions>

Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java?rev=1672901&r1=1672900&r2=1672901&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
(original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
Sat Apr 11 17:04:31 2015
@@ -18,9 +18,12 @@
  */
 package org.apache.axiom.util.stax.dialect;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.Properties;
 
@@ -56,7 +59,7 @@ public class DialectTestSuite extends Te
             builder.exclude(TestGetTextInProlog.class, "(implementation=JRE)");
         }
         
-        addParsersFromDirectory(builder, new File("parsers"));
+        addParsersFromFile(builder, new File(targetDir, "parsers.list"));
         addParsersFromDirectory(builder, new File(targetDir, "parsers"));
         
         // SJSXP and XLXP don't report whitespace in prolog
@@ -65,6 +68,18 @@ public class DialectTestSuite extends Te
         return builder.build();
     }
 
+    private static void addParsersFromFile(DialectTestSuiteBuilder builder, File file) throws
Exception {
+        BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),
"UTF-8"));
+        try {
+            String line;
+            while ((line = in.readLine()) != null) {
+                addParserJar(builder, new File(line));
+            }
+        } finally {
+            in.close();
+        }
+    }
+    
     private static void addParsersFromDirectory(DialectTestSuiteBuilder builder, File dir)
throws Exception {
         if (dir.exists()) {
             File[] parserJars = dir.listFiles(jarFilter);

Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1672901&r1=1672900&r2=1672901&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sat Apr 11 17:04:31 2015
@@ -653,6 +653,11 @@
                         </lifecycleMappingMetadata>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>com.github.veithen.alta</groupId>
+                    <artifactId>alta-maven-plugin</artifactId>
+                    <version>0.1-SNAPSHOT</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

Modified: webservices/axiom/trunk/systests/osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/pom.xml?rev=1672901&r1=1672900&r2=1672901&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/osgi-tests/pom.xml Sat Apr 11 17:04:31 2015
@@ -104,7 +104,6 @@
             <plugin>
                 <groupId>com.github.veithen.alta</groupId>
                 <artifactId>alta-maven-plugin</artifactId>
-                <version>0.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>



Mime
View raw message