From 7487e45881e590af588d359fcbd423c64364d2f1 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Tue, 25 Jun 2024 13:13:31 +0000
Subject: [PATCH] [XMLBEANS-651] remove dependency on xml-apis

git-svn-id: https://svn.apache.org/repos/asf/xmlbeans/trunk@1918595 13f79535-47bb-0310-9956-ffa450edef68
---
 build.gradle                                  |  6 +++---
 build.xml                                     |  6 +++---
 release-guide.txt                             |  4 +++-
 .../org.apache.xmlbeans/xmlbeans/pom.xml      | 20 ++-----------------
 4 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/build.gradle b/build.gradle
index f52354a96..8ce388d72 100644
--- a/build.gradle
+++ b/build.gradle
@@ -148,9 +148,9 @@ dependencies {
     testRuntimeOnly 'org.xmlresolver:xmlresolver:4.6.4'
 
     // maven plugin dependencies
-    implementation('org.apache.maven:maven-core:3.9.6')
-    implementation 'org.apache.maven:maven-model:3.9.6'
-    implementation('org.apache.maven:maven-plugin-api:3.9.6')
+    implementation('org.apache.maven:maven-core:3.9.8')
+    implementation 'org.apache.maven:maven-model:3.9.8'
+    implementation('org.apache.maven:maven-plugin-api:3.9.8')
     implementation 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.13.0'
 
 
diff --git a/build.xml b/build.xml
index b15ee41f0..0872e3df9 100644
--- a/build.xml
+++ b/build.xml
@@ -148,9 +148,9 @@
     <dependency prefix="xerces" artifact="xerces:xercesImpl:2.12.2" usage="tests"/>
 
     <!-- maven plugin dependencies -->
-    <dependency prefix="maven-core" artifact="org.apache.maven:maven-core:3.9.6" usage="maven-plugin"/>
-    <dependency prefix="maven-model" artifact="org.apache.maven:maven-model:3.9.6" usage="maven-plugin"/>
-    <dependency prefix="maven-plugin-api" artifact="org.apache.maven:maven-plugin-api:3.9.6" usage="maven-plugin"/>
+    <dependency prefix="maven-core" artifact="org.apache.maven:maven-core:3.9.8" usage="maven-plugin"/>
+    <dependency prefix="maven-model" artifact="org.apache.maven:maven-model:3.9.8" usage="maven-plugin"/>
+    <dependency prefix="maven-plugin-api" artifact="org.apache.maven:maven-plugin-api:3.9.8" usage="maven-plugin"/>
     <dependency prefix="maven-plugin-annotations" artifact="org.apache.maven.plugin-tools:maven-plugin-annotations:3.13.0" usage="maven-plugin"/>
     <!-- only necessary to compile against JDK8 internals - for Java9+ there's a mulitmodule implementation -->
     <dependency prefix="xml-resolver" artifact="com.sun.org.apache.xml.internal:resolver:20050927" usage="maven-plugin"/>
diff --git a/release-guide.txt b/release-guide.txt
index 5cab3df11..67cd42eaf 100644
--- a/release-guide.txt
+++ b/release-guide.txt
@@ -100,8 +100,10 @@ svn pd 'svn:executable' $(find -name .svn -prune -or -type f ! -name \*.sh \
      - apache-xmlbeans-src-VERSION-DATE.zip
      - apache-xmlbeans-src-VERSION-DATE.tgz
 
-  2. Grab the current deployed POM, and edit the version # and anything else that has changed:
+  2. Grab the current deployed POM, and edit the version # and anything else that has changed (eg dependencies):
      https://repository.apache.org/service/local/repo_groups/public/content/org/apache/xmlbeans/xmlbeans/VERSION/xmlbeans-VERSION.pom
+     - you should also check src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml
+     - there might be changes in that pom.xml that should be reflected in the new POM
 
   3. Sign the jars, zip, tgz, and pom with your key (gpg doesn't sign via --multifile yet):
      for f in *.jar *.zip *.tgz *.pom; do gpg --default-key 1556F3A4 -ab $f; done
diff --git a/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml b/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml
index 951a870aa..2a7adf44f 100644
--- a/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml
+++ b/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.9.6</version>
+            <version>3.9.8</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
-            <version>3.9.6</version>
+            <version>3.9.8</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -121,20 +121,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>java8</id>
-            <activation>
-                <jdk>1.8</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                    <version>1.4.01</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>