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/24 04:36:36 UTC
[xalan-java] branch xalan-java-mvn-refactored updated: Improved logic for creating xalan-java/build/ directory, back-compatability for xalan-test etc.
This is an automated email from the ASF dual-hosted git repository.
jkesselm pushed a commit to branch xalan-java-mvn-refactored
in repository https://gitbox.apache.org/repos/asf/xalan-java.git
The following commit(s) were added to refs/heads/xalan-java-mvn-refactored by this push:
new 5355e7ed Improved logic for creating xalan-java/build/ directory, back-compatability for xalan-test etc.
5355e7ed is described below
commit 5355e7ed90cb27d4ce84b98ddb4c720e6bf05fd7
Author: kubycsolutions <ke...@kubyc.solutions>
AuthorDate: Tue Oct 24 00:36:24 2023 -0400
Improved logic for creating xalan-java/build/ directory, back-compatability for xalan-test etc.
---
pom.xml | 92 ++++++++++++++++++++++++++++--------------------------
samples/pom.xml | 10 +++++-
serializer/pom.xml | 7 +++++
xalan/pom.xml | 7 +++++
4 files changed, 70 insertions(+), 46 deletions(-)
diff --git a/pom.xml b/pom.xml
index bd45afa6..6eafc82a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,48 @@
<module>xalan2jtaglet</module>
</modules>
+
<build>
+ <pluginManagement>
+ <!-- Standardized configuration for plugin used by child modules,
+ though not invoked by parent module -->
+ <plugins>
+ <!-- Copy produced jarfile up to xalan-java/build/,
+ renaming to remove the version number, for
+ backward compatibility with things build for the
+ Ant builds.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-artifact</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <type>${project.packaging}</type>
+ <!-- Copy without the "-${project.version}" suffix,
+ but with the filetype?
+ -->
+ <destFileName>${project.artifactId}.${project.packaging}</destFileName>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>../build</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
@@ -97,8 +138,12 @@
<version>3.4.5</version>
</plugin>
- <!-- During cleaning phase, empty the /build directory, which
- is normally not present except in the parent module. -->
+ <!-- During cleaning phase, empty the ./build directory, which
+ is normally not present except in the parent module.
+ NOTE that even with the current problem where the POM
+ is being copied up to ../build, this does NOT reach upward
+ to clean.
+ -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
@@ -112,49 +157,6 @@
</configuration>
</plugin>
- <!-- Copy produced jarfile up to xalan-java/build/,
- renaming to remove the version number, for
- backward compatibility with things build for the
- Ant builds.
- ...
- ISSUE: We really want this NOT to run for the
- parent module. It looks like a conditional profile
- is Maven's standard solution for this, using an
- </exists> test to see if the expected jarfile is
- present.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-artifact</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <skip></skip> <!-- Sensitive only to exactly "false" -->
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <type>${project.packaging}</type>
- <!-- Copy without the "-${project.version}" suffix,
- but with the filetype?
- -->
- <destFileName>${project.artifactId}.${project.packaging}</destFileName>
- <!--
- -->
- </artifactItem>
- </artifactItems>
- <outputDirectory>../build</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
diff --git a/samples/pom.xml b/samples/pom.xml
index 2fce6e67..1ae4d059 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -122,6 +122,14 @@
</execution>
</executions>
</plugin>
- </plugins>
+
+ <!-- Copy generated jarfile up to xalan-java/build/,
+ for backward compatibility with Ant builds. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+
+ </plugins>
</build>
</project>
diff --git a/serializer/pom.xml b/serializer/pom.xml
index af9abcaf..f7bfb2a6 100644
--- a/serializer/pom.xml
+++ b/serializer/pom.xml
@@ -104,6 +104,13 @@
</executions>
</plugin>
+ <!-- Copy generated jarfile up to xalan-java/build/,
+ for backward compatibility with Ant builds. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+
</plugins>
</build>
diff --git a/xalan/pom.xml b/xalan/pom.xml
index a47df1a4..4ef8315b 100644
--- a/xalan/pom.xml
+++ b/xalan/pom.xml
@@ -125,6 +125,13 @@
</executions>
</plugin>
+ <!-- Copy generated jarfile up to xalan-java/build/,
+ for backward compatibility with Ant builds. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org