This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 2dd3e1cfd Move Jaxen source code and resources to src/jaxen in
jaxen-testsuite
2dd3e1cfd is described below
commit 2dd3e1cfd199b7dd1dac0b95a44ad85a25a599f5
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Fri May 15 23:09:56 2026 +0100
Move Jaxen source code and resources to src/jaxen in jaxen-testsuite
---
testing/jaxen-testsuite/pom.xml | 32 +++++++++++++++------
.../java/org/jaxen/test/ExprComparator.java | 0
.../java/org/jaxen/test/XPathTestBase.java | 0
.../resources/META-INF/LICENSE-JAXEN | 0
.../src/{main => jaxen}/resources/xml/axis.xml | 0
.../src/{main => jaxen}/resources/xml/basic.xml | 0
.../{main => jaxen}/resources/xml/basicupdate.xml | 0
.../src/{main => jaxen}/resources/xml/cdata.xml | 0
.../src/{main => jaxen}/resources/xml/contents.xml | 0
.../resources/xml/defaultNamespace.xml | 0
.../src/{main => jaxen}/resources/xml/evaluate.xml | 0
.../src/{main => jaxen}/resources/xml/fibo.xml | 0
.../src/{main => jaxen}/resources/xml/id.xml | 0
.../src/{main => jaxen}/resources/xml/jaxen24.xml | 0
.../src/{main => jaxen}/resources/xml/jaxen3.xml | 0
.../src/{main => jaxen}/resources/xml/lang.xml | 0
.../src/{main => jaxen}/resources/xml/message.xml | 0
.../src/{main => jaxen}/resources/xml/moreover.xml | 0
.../src/{main => jaxen}/resources/xml/much_ado.xml | 0
.../{main => jaxen}/resources/xml/namespaces.xml | 0
.../src/{main => jaxen}/resources/xml/nitf.xml | 0
.../src/{main => jaxen}/resources/xml/numbers.xml | 0
.../src/{main => jaxen}/resources/xml/pi.xml | 0
.../src/{main => jaxen}/resources/xml/pi2.xml | 0
.../src/{main => jaxen}/resources/xml/simple.xml | 0
.../resources/xml/simplevariablecontext.ser | Bin
.../{main => jaxen}/resources/xml/test/tests.xml | 0
.../{main => jaxen}/resources/xml/test/tests.xsl | 0
.../resources/xml/testNamespaces.xml | 0
.../src/{main => jaxen}/resources/xml/text.xml | 0
.../{main => jaxen}/resources/xml/underscore.xml | 0
.../src/{main => jaxen}/resources/xml/web.xml | 0
.../src/{main => jaxen}/resources/xml/web2.xml | 0
33 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/testing/jaxen-testsuite/pom.xml b/testing/jaxen-testsuite/pom.xml
index 3d9ddcb4f..56fa6fca4 100644
--- a/testing/jaxen-testsuite/pom.xml
+++ b/testing/jaxen-testsuite/pom.xml
@@ -46,13 +46,31 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/jaxen/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
- <groupId>com.spotify.fmt</groupId>
- <artifactId>fmt-maven-plugin</artifactId>
- <configuration>
- <filesPathPattern>.*/org/apache/.*</filesPathPattern>
- </configuration>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/jaxen/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -68,9 +86,7 @@
<configuration>
<excludes>
<!-- Source code, resources and license files
from Jaxen (see LEGAL-74 & WSCOMMONS-545) -->
- <exclude>src/main/resources/xml/**</exclude>
-
<exclude>src/main/java/org/jaxen/test/**</exclude>
-
<exclude>src/main/resources/META-INF/LICENSE-JAXEN</exclude>
+ <exclude>src/jaxen/**</exclude>
</excludes>
</configuration>
</plugin>
diff --git
a/testing/jaxen-testsuite/src/main/java/org/jaxen/test/ExprComparator.java
b/testing/jaxen-testsuite/src/jaxen/java/org/jaxen/test/ExprComparator.java
similarity index 100%
rename from
testing/jaxen-testsuite/src/main/java/org/jaxen/test/ExprComparator.java
rename to
testing/jaxen-testsuite/src/jaxen/java/org/jaxen/test/ExprComparator.java
diff --git
a/testing/jaxen-testsuite/src/main/java/org/jaxen/test/XPathTestBase.java
b/testing/jaxen-testsuite/src/jaxen/java/org/jaxen/test/XPathTestBase.java
similarity index 100%
rename from
testing/jaxen-testsuite/src/main/java/org/jaxen/test/XPathTestBase.java
rename to
testing/jaxen-testsuite/src/jaxen/java/org/jaxen/test/XPathTestBase.java
diff --git a/testing/jaxen-testsuite/src/main/resources/META-INF/LICENSE-JAXEN
b/testing/jaxen-testsuite/src/jaxen/resources/META-INF/LICENSE-JAXEN
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/META-INF/LICENSE-JAXEN
rename to testing/jaxen-testsuite/src/jaxen/resources/META-INF/LICENSE-JAXEN
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/axis.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/axis.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/axis.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/axis.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/basic.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/basic.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/basic.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/basic.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/basicupdate.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/basicupdate.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/basicupdate.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/basicupdate.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/cdata.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/cdata.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/cdata.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/cdata.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/contents.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/contents.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/contents.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/contents.xml
diff --git
a/testing/jaxen-testsuite/src/main/resources/xml/defaultNamespace.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/defaultNamespace.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/defaultNamespace.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/defaultNamespace.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/evaluate.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/evaluate.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/evaluate.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/evaluate.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/fibo.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/fibo.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/fibo.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/fibo.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/id.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/id.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/id.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/id.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/jaxen24.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/jaxen24.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/jaxen24.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/jaxen24.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/jaxen3.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/jaxen3.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/jaxen3.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/jaxen3.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/lang.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/lang.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/lang.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/lang.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/message.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/message.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/message.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/message.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/moreover.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/moreover.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/moreover.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/moreover.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/much_ado.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/much_ado.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/much_ado.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/much_ado.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/namespaces.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/namespaces.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/namespaces.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/namespaces.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/nitf.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/nitf.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/nitf.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/nitf.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/numbers.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/numbers.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/numbers.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/numbers.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/pi.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/pi.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/pi.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/pi.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/pi2.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/pi2.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/pi2.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/pi2.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/simple.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/simple.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/simple.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/simple.xml
diff --git
a/testing/jaxen-testsuite/src/main/resources/xml/simplevariablecontext.ser
b/testing/jaxen-testsuite/src/jaxen/resources/xml/simplevariablecontext.ser
similarity index 100%
rename from
testing/jaxen-testsuite/src/main/resources/xml/simplevariablecontext.ser
rename to
testing/jaxen-testsuite/src/jaxen/resources/xml/simplevariablecontext.ser
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/test/tests.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/test/tests.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/test/tests.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/test/tests.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/test/tests.xsl
b/testing/jaxen-testsuite/src/jaxen/resources/xml/test/tests.xsl
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/test/tests.xsl
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/test/tests.xsl
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/testNamespaces.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/testNamespaces.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/testNamespaces.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/testNamespaces.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/text.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/text.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/text.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/text.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/underscore.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/underscore.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/underscore.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/underscore.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/web.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/web.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/web.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/web.xml
diff --git a/testing/jaxen-testsuite/src/main/resources/xml/web2.xml
b/testing/jaxen-testsuite/src/jaxen/resources/xml/web2.xml
similarity index 100%
rename from testing/jaxen-testsuite/src/main/resources/xml/web2.xml
rename to testing/jaxen-testsuite/src/jaxen/resources/xml/web2.xml
