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 232d390f9 Prevent Dependabot from updating Woodstox versions where
that's not desired.
232d390f9 is described below
commit 232d390f93b7b1b296f919629318c1dbd2cc51b7
Author: Andreas Veithen <[email protected]>
AuthorDate: Mon Sep 16 09:04:58 2024 +0000
Prevent Dependabot from updating Woodstox versions
where that's not desired.
---
pom.xml | 54 +++++++++++++++---------------
testing/jaxp-testsuite/pom.xml | 75 ++++++++++++++++++++++++++----------------
2 files changed, 74 insertions(+), 55 deletions(-)
diff --git a/pom.xml b/pom.xml
index afcf89774..e6ec7440f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -902,6 +902,33 @@
</rules>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
+ <version>0.8.1</version>
+ <executions>
+ <!-- Automatically configure the Byte Buddy agent if it's
present in the dependencies.
+ This avoids problems with installation at runtime. -->
+ <execution>
+ <id>byte-buddy-agent</id>
+ <goals>
+ <goal>generate-properties</goal>
+ </goals>
+ <configuration>
+ <name>argLine</name>
+ <value>-javaagent:%file%</value>
+ <artifactSet>
+ <dependencySet>
+ <scope>test</scope>
+ <includes>
+
<include>net.bytebuddy:byte-buddy-agent:jar:*</include>
+ </includes>
+ </dependencySet>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
@@ -1034,33 +1061,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.github.veithen.alta</groupId>
- <artifactId>alta-maven-plugin</artifactId>
- <version>0.8.1</version>
- <executions>
- <!-- Automatically configure the Byte Buddy agent if it's
present in the dependencies.
- This avoids problems with installation at runtime. -->
- <execution>
- <id>byte-buddy-agent</id>
- <goals>
- <goal>generate-properties</goal>
- </goals>
- <configuration>
- <name>argLine</name>
- <value>-javaagent:%file%</value>
- <artifactSet>
- <dependencySet>
- <scope>test</scope>
- <includes>
-
<include>net.bytebuddy:byte-buddy-agent:jar:*</include>
- </includes>
- </dependencySet>
- </artifactSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin><!-- This serves two purposes:
(1) we want to generate source JARs for all builds, not
just release builds;
(2) we need (some of) the source JARs to generate the
Javadoc in the apidocs module. -->
diff --git a/testing/jaxp-testsuite/pom.xml b/testing/jaxp-testsuite/pom.xml
index 644464484..d500e6fb4 100644
--- a/testing/jaxp-testsuite/pom.xml
+++ b/testing/jaxp-testsuite/pom.xml
@@ -34,6 +34,20 @@
<xalan.version>2.7.3</xalan.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.stream</groupId>
+ <artifactId>sjsxp</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -90,42 +104,47 @@
</resources>
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>com.github.veithen.alta</groupId>
+ <!-- We don't use maven-dependency-plugin here because
Dependabot would try to update
+ all the Woodstox versions to the most recent one, but we
explicitly want older
+ versions. -->
+ <artifactId>alta-maven-plugin</artifactId>
<executions>
<execution>
+ <id>copy-stax-jars</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.4.1</version>
- </artifactItem>
- <artifactItem>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- <version>5.3.0</version>
- </artifactItem>
- <artifactItem>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- <version>6.7.0</version>
- </artifactItem>
- <artifactItem>
- <groupId>com.sun.xml.stream</groupId>
- <artifactId>sjsxp</artifactId>
- <version>1.0.1</version>
- </artifactItem>
- <artifactItem>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.2.0</version>
- </artifactItem>
- </artifactItems>
+ <artifactSet>
+ <artifacts>
+ <artifact>
+
<groupId>org.codehaus.woodstox</groupId>
+
<artifactId>woodstox-core-asl</artifactId>
+ <version>4.4.1</version>
+ </artifact>
+ <artifact>
+
<groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ <version>5.3.0</version>
+ </artifact>
+ <artifact>
+
<groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </artifact>
+ <artifact>
+ <groupId>com.sun.xml.stream</groupId>
+ <artifactId>sjsxp</artifactId>
+ </artifact>
+ <artifact>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ </artifact>
+ </artifacts>
+ </artifactSet>
<outputDirectory>${project.build.directory}/generated-resources/org/apache/axiom/ts/jaxp/stax</outputDirectory>
+ <name>%artifactId%-%version%.%type%</name>
</configuration>
</execution>
</executions>
