Merge pull request #135 from kriegaex/delete-doclet-taglet-binaries
At some point I want to look at what this used to do. But it's perfectly possible we were carrying it around just because it was distributed with the taglet. I agree with dropping it for now.
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 43185c7..acc2a57 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,6 +1,6 @@
-<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">
+<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>xalan</groupId>
@@ -11,7 +11,7 @@
<artifactId>distribution</artifactId>
<name>distribution</name>
<packaging>pom</packaging>
-
+
<!-- Depend on modules containing source code that needs to be compiled
before being able to create a binary distribution
-->
@@ -29,45 +29,57 @@
<artifactId>samples</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.6.0</version>
- <executions>
- <execution>
- <id>distro-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>${project.parent.build.finalName}</finalName>
- <outputDirectory>../build</outputDirectory>
- <descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>${project.parent.build.finalName}</finalName>
- <outputDirectory>../build</outputDirectory>
- <descriptors>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>create-distros</id>
+ <activation>
+ <!--
+ Activate by default. Workaround for 'activeByDefault', which is broken
+ by design, see https://issues.apache.org/jira/browse/MNG-4917.
+ -->
+ <jdk>[1.)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.6.0</version>
+ <executions>
+ <execution>
+ <id>distro-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${project.parent.build.finalName}</finalName>
+ <outputDirectory>../build</outputDirectory>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${project.parent.build.finalName}</finalName>
+ <outputDirectory>../build</outputDirectory>
+ <descriptors>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/pom.xml b/pom.xml
index 156e94d..17660ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,100 @@
<module>xalan2jtaglet_jdk9</module>
</modules>
</profile>
+ <profile>
+ <id>create-docs</id>
+ <activation>
+ <!--
+ Activate by default. Workaround for 'activeByDefault', which is broken
+ by design, see https://issues.apache.org/jira/browse/MNG-4917.
+ -->
+ <jdk>[1.)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <!-- StyleBook processing.
+ NOTE: Stylebook as it has been calls System.exit() on its way out.
+ That means running exec:java will malfunction since it'll blow out
+ the entire Maven process. Workaround is to invoke Stylebook from
+ the command line with exec:exec. Proper fix is to remove that
+ behavior from Stylebook's code and have it exit more cleanly,
+ or to have exec optionally fork a process for java.
+ The latter is in development.
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>3.1.0</version>
+ <inherited>false</inherited> <!-- Run only in xalan-project parent -->
+ <executions>
+ <execution>
+ <id>Xalan2 design documentation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>java</executable>
+ <commandlineArgs>-cp ${stylebook.classpath} org.apache.stylebook.StyleBook
+ loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/design/
+ ./stylebook/sources/xalandesign.xml ./stylebook/style</commandlineArgs>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>Xalan2 compiled (xsltc) documentation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>java</executable>
+ <commandlineArgs>-cp ${stylebook.classpath} org.apache.stylebook.StyleBook
+ loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/xsltc/
+ ./stylebook/sources/xsltc.xml ./stylebook/style</commandlineArgs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>Xalan2 interpretive documentation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>java</executable>
+ <commandlineArgs>-cp ${stylebook.classpath} org.apache.stylebook.StyleBook
+ loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/xalan
+ ./stylebook/sources/xalan-jsite.xml ./stylebook/style</commandlineArgs>
+ </configuration>
+ </execution>
+
+ <!-- Diff tells me that the -jlocal output is almost
+ identical to the -jsite output despite the slight
+ difference in the .xml files used as their
+ sources. (The only effective difference appears to be
+ that -jlocal doesn't produce the index or charter
+ documents.) I'm not convinced that's enough difference
+ to merit generating both, but until I better grok why
+ this duplication was done in the first place I'm
+ hesitant to remove it. (jkesselm, 20231105) -->
+ <execution>
+ <id>Xalan2 interpretive documentation, local</id>
+ <phase>package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>java</executable>
+ <commandlineArgs>-cp ${stylebook.classpath} org.apache.stylebook.StyleBook
+ loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/xalan/local
+ ./stylebook/sources/xalan-jlocal.xml ./stylebook/style</commandlineArgs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<build>
@@ -204,87 +298,6 @@
</configuration>
</plugin>
- <!-- StyleBook processing.
- NOTE: Stylebook as it has been calls System.exit() on its way out.
- That means running exec:java will malfunction since it'll blow out
- the entire Maven process. Workaround is to invoke Stylebook from
- the command line with exec:exec. Proper fix is to remove that
- behavior from Stylebook's code and have it exit more cleanly,
- or to have exec optionally fork a process for java.
- The latter is in development.
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>3.1.0</version>
- <inherited>false</inherited> <!-- Run only in xalan-project parent -->
- <executions>
- <execution>
- <id>Xalan2 design documentation</id>
- <phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>java</executable>
- <commandlineArgs>-cp ${stylebook.classpath} org.apache.stylebook.StyleBook
- loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/design/
- ./stylebook/sources/xalandesign.xml ./stylebook/style</commandlineArgs>
- </configuration>
- </execution>
-
- <execution>
- <id>Xalan2 compiled (xsltc) documentation</id>
- <phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>java</executable>
- <commandlineArgs>-cp ${stylebook.classpath} org.apache.stylebook.StyleBook
- loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/xsltc/
- ./stylebook/sources/xsltc.xml ./stylebook/style</commandlineArgs>
- </configuration>
- </execution>
- <execution>
- <id>Xalan2 interpretive documentation</id>
- <phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>java</executable>
- <commandlineArgs>-cp ${stylebook.classpath} org.apache.stylebook.StyleBook
- loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/xalan
- ./stylebook/sources/xalan-jsite.xml ./stylebook/style</commandlineArgs>
- </configuration>
- </execution>
-
- <!-- Diff tells me that the -jlocal output is almost
- identical to the -jsite output despite the slight
- difference in the .xml files used as their
- sources. (The only effective difference appears to be
- that -jlocal doesn't produce the index or charter
- documents.) I'm not convinced that's enough difference
- to merit generating both, but until I better grok why
- this duplication was done in the first place I'm
- hesitant to remove it. (jkesselm, 20231105) -->
- <execution>
- <id>Xalan2 interpretive documentation, local</id>
- <phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>java</executable>
- <commandlineArgs>-cp ${stylebook.classpath} org.apache.stylebook.StyleBook
- loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/xalan/local
- ./stylebook/sources/xalan-jlocal.xml ./stylebook/style</commandlineArgs>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<!-- Two more files to copy to the site directory -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
