Skip to content

Improve Maven Shade and Assembly usage #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkesselm merged 5 commits into from
Nov 15, 2023
Merged

Improve Maven Shade and Assembly usage #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f7c01a
Ignore IntelliJ *.iml project files
kriegaex Nov 15, 2023
2263e9e
Fix Maven Shade usage
kriegaex Nov 15, 2023
56274ed
Exclude jboss-rmi-api_1.0_spec from binary distribution
kriegaex Nov 15, 2023
254bd1e
Bump JUnit to 4.13.2
kriegaex Nov 15, 2023
87b8c15
Merge branch 'xalan-java-mvn-refactored' into improve-shade-assembly
jkesselm Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ target/

# IntelliJ IDEA
.idea/
*.iml

# Xalan
build/
Expand Down
22 changes: 3 additions & 19 deletions distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,39 +10,23 @@

<artifactId>distribution</artifactId>
<name>distribution</name>
<!-- I don't understand why, but on my system when I set the packaging
to pom I wind up with the pom.xml file being overwritten with binary
stuff, apparently one of the archives.

When set to jar, the pom is undamaged. If I mark the dependencies
as provided, I can at least avoid wasting much time on that, but
this is the simplest workaround I've yet found for weird behavior.
-->
<packaging>jar</packaging>
<packaging>pom</packaging>

<!-- NOTE: These dependency declarations are only used to sort
this project to the end of the queue in the multimodule build.
Marking them as provided keeps them out of the output jarfile
(if any).
<!-- Depend on modules containing source code that needs to be compiled
before being able to create a binary distribution
-->
<dependencies>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
<version>2.7.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>samples</artifactId>
<version>2.7.3</version>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
7 changes: 7 additions & 0 deletions distribution/src/assembly/bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@
<binaries>
<outputDirectory>${project.parent.name}_${project.parent.version}</outputDirectory>
<unpack>false</unpack>
<dependencySets>
<dependencySet>
<excludes>
<exclude>org.jboss.spec.javax.rmi:jboss-rmi-api_1.0_spec</exclude>
</excludes>
</dependencySet>
</dependencySets>
</binaries>
</moduleSet>
</moduleSets>
Expand Down
21 changes: 20 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,25 @@
</plugins>
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>samples</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<reporting>
<plugins>
<plugin>
Expand Down Expand Up @@ -382,7 +401,7 @@
<tagletArtifact>
<groupId>xalan</groupId>
<artifactId>xalan2jtaglet</artifactId>
<version>2.7.3</version>
<version>{project.version}</version>
</tagletArtifact>

</configuration>
Expand Down
43 changes: 1 addition & 42 deletions samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,16 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
<version>2.7.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.3</version>
<scope>provided</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/javax.servlet/servlet-api -->
Expand Down Expand Up @@ -89,43 +85,6 @@

<build>
<plugins>
<!--
https://maven.apache.org/plugins/maven-shade-plugin/examples/includes-excludes.html -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<excludes>
<!-- Their examples (testing) -->
<exclude>junit:junit</exclude>
<exclude>jmock:*</exclude>
<exclude>org.apache.maven:lib:tests</exclude>
<!-- What I think I need to exclude.
Some are direct dependencies, some come in
via maven packages. -->
<exclude>com.github.vbmacher:java-cup</exclude>
<exclude>commons-logging:commons-logging</exclude>
<exclude>org.apache.commons:commons-lang3</exclude>
<exclude>org.apache.ant:ant</exclude>
<exclude>org.apache.ant:ant-launcher</exclude>
<exclude>xalan:serializer</exclude>
<exclude>de.jflex:jflex</exclude>
<exclude>org.jboss.spec.javax.rmi:jboss-rmi-api_1.0_spec</exclude>
</excludes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>

<!-- Copy generated jarfile up to xalan-java/build/,
for backward compatibility with Ant builds. -->
<plugin>
Expand Down
35 changes: 0 additions & 35 deletions serializer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,41 +69,6 @@
</configuration>
</plugin>

<!-- Filter out packages we don't want copied to the output jar
https://maven.apache.org/plugins/maven-shade-plugin/examples/includes-excludes.html -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<excludes>
<!-- Their examples (testing) -->
<exclude>junit:junit</exclude>
<exclude>jmock:*</exclude>
<exclude>org.apache.maven:lib:tests</exclude>
<!-- What I think I need to exclude.
Some are direct dependencies, some come in
via maven packages. -->
<exclude>com.github.vbmacher:java-cup</exclude>
<exclude>commons-logging:commons-logging</exclude>
<exclude>org.apache.commons:commons-lang3</exclude>
<exclude>org.apache.ant:ant</exclude>
<exclude>org.apache.ant:ant-launcher</exclude>
<exclude>org.apache.bcel:bcel</exclude>
</excludes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>

<!-- Copy generated jarfile up to xalan-java/build/,
for backward compatibility with Ant builds. -->
<plugin>
Expand Down
1 change: 0 additions & 1 deletion xalan/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
<version>2.7.3</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.bcel/bcel -->
Expand Down