You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by jk...@apache.org on 2023/10/17 20:47:51 UTC

[xalan-java] 02/06: Fix Maven group/artifact identifiers

This is an automated email from the ASF dual-hosted git repository.

jkesselm pushed a commit to branch maven-build
in repository https://gitbox.apache.org/repos/asf/xalan-java.git

commit c33e7a6eb7e93590a821ad31a80c54830765f1a8
Author: kubycsolutions <ke...@kubyc.solutions>
AuthorDate: Sat Oct 14 18:24:16 2023 -0400

    Fix Maven group/artifact identifiers
---
 pom.xml                                  | 11 +++++------
 samples/pom.xml                          | 18 +++++++++---------
 serializer/pom.xml                       |  7 ++++---
 xalan/pom.xml                            | 16 ++++++++--------
 xalan2jtaglet/dependency-reduced-pom.xml | 24 ------------------------
 xalan2jtaglet/pom.xml                    |  9 +++++----
 6 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4f446e11..dd5e7f8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,6 @@
   <packaging>pom</packaging>
   <!-- KNOWN ISSUES:
 	"Production" jar/tar files?
-	Doclet and taglet (taglet working, but only for ./xalan?)
 	stylebook (currenly, see stylebook.docgen.sh)
        
        xalan-test compatibility/success/submodule
@@ -13,9 +12,9 @@
   -->
   
   <modelVersion>4.0.0</modelVersion>
-  <groupId>apache-xalan-j-2.7.3-maint-main</groupId>
-  <artifactId>apache-xalan-j-2.7.3-maint-main</artifactId>
-  <version>2.7.3-SNAPSHOT</version>
+  <groupId>xalan</groupId>
+  <artifactId>xalan-project</artifactId>
+  <version>2.7.3</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -165,9 +164,9 @@
 	    </taglet>
 	  </taglets>
 	  <tagletArtifact>
-	    <groupId>apache-xalan-j-2.7.3-maint-main</groupId>
+	    <groupId>xalan</groupId>
 	    <artifactId>xalan2jtaglet</artifactId>
-	    <version>2.7.3-SNAPSHOT</version>
+	    <version>2.7.3</version>
 	  </tagletArtifact>
 
 	</configuration>
diff --git a/samples/pom.xml b/samples/pom.xml
index ce8e682e..2fce6e67 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>apache-xalan-j-2.7.3-maint-main</artifactId>
-    <groupId>apache-xalan-j-2.7.3-maint-main</groupId>
-    <version>2.7.3-SNAPSHOT</version>
+    <artifactId>xalan-project</artifactId>
+    <groupId>xalan</groupId>
+    <version>2.7.3</version>
   </parent>
 
   <artifactId>samples</artifactId>
-  <name>Apache Xalan-Java 2.7.3 Samples</name>
+  <name>Apache Xalan-Java Samples</name>
   <!-- FIXME change it to the project's website -->
   <url>http://www.example.com</url>
 
@@ -26,15 +26,15 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>apache-xalan-j-2.7.3-maint-main</groupId>
+      <groupId>xalan</groupId>
       <artifactId>serializer</artifactId>
-      <version>2.7.3-SNAPSHOT</version>
+      <version>2.7.3</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>apache-xalan-j-2.7.3-maint-main</groupId>
+      <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
-      <version>2.7.3-SNAPSHOT</version>
+      <version>2.7.3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -114,7 +114,7 @@
 		  <exclude>org.apache.commons:commons-lang3</exclude>
 		  <exclude>org.apache.ant:ant</exclude>
 		  <exclude>org.apache.ant:ant-launcher</exclude>
-		  <exclude>apache-xalan-j-2.7.3-maint-main:serializer</exclude>
+		  <exclude>xalan:serializer</exclude>
 		  <exclude>de.jflex:jflex</exclude>	
 		</excludes>
 	      </artifactSet>
diff --git a/serializer/pom.xml b/serializer/pom.xml
index 364a8882..af9abcaf 100644
--- a/serializer/pom.xml
+++ b/serializer/pom.xml
@@ -3,10 +3,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>apache-xalan-j-2.7.3-maint-main</groupId>
-    <artifactId>apache-xalan-j-2.7.3-maint-main</artifactId>
-    <version>2.7.3-SNAPSHOT</version>
+    <groupId>xalan</groupId>
+    <artifactId>xalan-project</artifactId>
+    <version>2.7.3</version>
   </parent>
+
   <artifactId>serializer</artifactId>
   <name>XML Serializer</name>
   <description>Apache's XML serialization layer, as used in the Xalan XSLT processor</description>
diff --git a/xalan/pom.xml b/xalan/pom.xml
index 4dca507d..a47df1a4 100644
--- a/xalan/pom.xml
+++ b/xalan/pom.xml
@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>apache-xalan-j-2.7.3-maint-main</groupId>
-    <artifactId>apache-xalan-j-2.7.3-maint-main</artifactId>
-    <version>2.7.3-SNAPSHOT</version>
+    <groupId>xalan</groupId>
+    <artifactId>xalan-project</artifactId>
+    <version>2.7.3</version>
   </parent>
+
   <artifactId>xalan</artifactId>
-  <version>2.7.3-SNAPSHOT</version>
-  <name>Apache Xalan-Java 2.7.3</name>
+  <name>Apache Xalan-Java</name>
   <description>Apache's XSLT processor</description>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -116,7 +116,7 @@
 		  <exclude>org.apache.commons:commons-lang3</exclude>
 		  <exclude>org.apache.ant:ant</exclude>
 		  <exclude>org.apache.ant:ant-launcher</exclude>
-		  <exclude>apache-xalan-j-2.7.3-maint-main:serializer</exclude>
+		  <exclude>xalan:serializer</exclude>
 		  <exclude>de.jflex:jflex</exclude>	
 		</excludes>
 	      </artifactSet>
@@ -131,9 +131,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>apache-xalan-j-2.7.3-maint-main</groupId>
+      <groupId>xalan</groupId>
       <artifactId>serializer</artifactId>
-      <version>2.7.3-SNAPSHOT</version>
+      <version>2.7.3</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/org.apache.bcel/bcel -->
diff --git a/xalan2jtaglet/dependency-reduced-pom.xml b/xalan2jtaglet/dependency-reduced-pom.xml
deleted file mode 100644
index 60bc23e7..00000000
--- a/xalan2jtaglet/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>apache-xalan-j-2.7.3-maint-main</artifactId>
-    <groupId>apache-xalan-j-2.7.3-maint-main</groupId>
-    <version>2.7.3-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>xalan2jtaglet</artifactId>
-  <name>xalan2jtaglet</name>
-  <description>Implementation of the @xsl.usage taglet, used in the Xalan package's javadoc to indicate classes which, while public for cross-module access, are not intended to be called by end-users.</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.sun</groupId>
-      <artifactId>tools</artifactId>
-      <version>1.6.0</version>
-      <scope>system</scope>
-      <systemPath>${toolsjar}</systemPath>
-    </dependency>
-  </dependencies>
-  <properties>
-    <toolsjar>${java.home}/../lib/tools.jar</toolsjar>
-  </properties>
-</project>
diff --git a/xalan2jtaglet/pom.xml b/xalan2jtaglet/pom.xml
index 1ef604fc..9228b20a 100644
--- a/xalan2jtaglet/pom.xml
+++ b/xalan2jtaglet/pom.xml
@@ -3,12 +3,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>apache-xalan-j-2.7.3-maint-main</groupId>
-    <artifactId>apache-xalan-j-2.7.3-maint-main</artifactId>
-    <version>2.7.3-SNAPSHOT</version>
+    <groupId>xalan</groupId>
+    <artifactId>xalan-project</artifactId>
+    <version>2.7.3</version>
   </parent>
+
   <artifactId>xalan2jtaglet</artifactId>
-  <name>xalan2jtaglet</name>
+  <name>@xsl.usage taglet</name>
   <description>Implementation of the @xsl.usage taglet, used in the Xalan package's javadoc to indicate classes which, while public for cross-module access, are not intended to be called by end-users.</description>
 
   <!-- Needs com.sun.javadoc.*, of course.  WARNING: The rules for


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org