This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
The following commit(s) were added to refs/heads/master by this push:
new 53959399 Bump commons-parent from 58 to 79
53959399 is described below
commit 539593993d47bcf696181f31db40b38f8a949fd6
Author: Gary D. Gregory <[email protected]>
AuthorDate: Tue Jan 14 08:15:43 2025 -0500
Bump commons-parent from 58 to 79
- Disable Moditect for now
- Bump commons-logging from 1.3.0 to 1.3.4
- Bump jaxen:jaxen from 1.1.6 to 1.2.0
- Remove plugin overrides
---
.github/workflows/maven.yml | 2 +-
core/pom.xml | 2 +-
jelly-tags/interaction/xdocs/navigation.xml | 2 +-
jelly-tags/jaxme/pom.xml | 2 +-
pom.xml | 31 +++++++----------------------
src/changes/changes.xml | 11 +++++-----
6 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 76d94977..f6f6b310 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -58,4 +58,4 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Build with Maven
- run: mvn --errors --show-version --batch-mode --no-transfer-progress test
+ run: mvn --errors --show-version --batch-mode --no-transfer-progress
test -P'!java-9-up' -Dmaven.compiler.release=8
diff --git a/core/pom.xml b/core/pom.xml
index fe4b6c5a..0a4d3cbe 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -110,7 +110,7 @@
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>1.1.6</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
diff --git a/jelly-tags/interaction/xdocs/navigation.xml
b/jelly-tags/interaction/xdocs/navigation.xml
index 8a812132..47d6dc23 100644
--- a/jelly-tags/interaction/xdocs/navigation.xml
+++ b/jelly-tags/interaction/xdocs/navigation.xml
@@ -24,7 +24,7 @@
<menu name="Interaction Tag Library">
<item name="Overview" href="/index.html"/>
<item name="Tags" href="/tags.html"/>
- <item name="Changes" href="/changes-report.html"/>
+ <item name="Changes" href="/changes.html"/>
</menu>
&commons;
</body>
diff --git a/jelly-tags/jaxme/pom.xml b/jelly-tags/jaxme/pom.xml
index 5f4b7e2e..fb4ce888 100644
--- a/jelly-tags/jaxme/pom.xml
+++ b/jelly-tags/jaxme/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.3.0</version>
+ <version>1.3.4</version>
</dependency>
<!-- TODO: These versions probably want updating -->
<dependency>
diff --git a/pom.xml b/pom.xml
index f830c8b3..af008bab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>58</version>
+ <version>79</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-jelly</groupId>
@@ -338,28 +338,6 @@
<defaultGoal>clean verify javadoc:javadoc</defaultGoal>
<pluginManagement>
<plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <debug>true</debug>
- <optimize>false</optimize>
- <showDeprecation>true</showDeprecation>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.source}</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-
<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
-
<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -444,13 +422,18 @@
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>1.1.6</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.3.4</version>
+ </dependency>
</dependencies>
<reporting>
<plugins>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fe2e13ce..922ec718 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -38,9 +38,9 @@ then tweak the source formatting if necessary and regenerate,
then commit
The <action> type attribute can be add,update,fix,remove.
-->
-<document xmlns="http://maven.apache.org/changes/1.0.0";
+<document xmlns="http://maven.apache.org/changes/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/changes/1.0.0
http://maven.apache.org/xsd/changes-1.0.0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/changes/2.0.0
http://maven.apache.org/xsd/changes-2.0.0.xsd";>
<properties>
<title>Apache Commons IO Release Notes</title>
</properties>
@@ -54,10 +54,11 @@ The <action> type attribute can be add,update,fix,remove.
<action type="fix" due-to="ggregory">Fix building on modern
Java.</action>
<!-- UPDATE -->
<action type="update" due-to="ggregory">Bump Java from 7 to 8.</action>
- <action type="update" due-to="ggregory">Bump commons-parent from 42 to
58.</action>
- <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-logging from 1.0.3 to 1.3.0.</action>
+ <action type="update" due-to="ggregory">Bump commons-parent from 42 to
79.</action>
+ <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-logging from 1.0.3 to 1.3.4.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-beanutils:commons-beanutils from a mix of 1.6 and 1.7.0 to
1.10.0.</action>
- <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
xmlunit:xmlunit from a mix of 0.8 and 1.0 to 1.6.</action>
+ <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
xmlunit:xmlunit from a mix of 0.8 and 1.0 to 1.6.</action>
+ <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
jaxen:jaxen from 1.1.6 to 1.2.0.</action>
</release>
</body>
</document>
