Skip to content

Reformat Maven POM and assembly XML, no functional changes #120

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

Closed
kriegaex wants to merge 1 commit into from
Closed

Reformat Maven POM and assembly XML, no functional changes #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<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>
<artifactId>xalan-project</artifactId>
<version>2.7.3</version>
</parent>

<artifactId>distribution</artifactId>
<!-- PROBLEM: Something has been overwriting this pom. I don't know
whether making the packaging "pom" had anything to do with that,
but changing it may have helped.

<!--
PROBLEM: Something has been overwriting this pom. I don't know whether making the packaging "pom" had anything to do
with that, but changing it may have helped.
-->
<packaging>jar</packaging>

<name>distribution</name>

<!-- NOTE: These dependency declarations are only required to sort
this project to the end of the queue in the multimodule build.

<!--
NOTE: These dependency declarations are only required to sort this project to the end of the queue in the
multimodule build.
-->
<dependencies>
<dependency>
Expand All @@ -38,12 +40,12 @@
<version>2.7.3</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>distro-assembly</id>
Expand All @@ -60,8 +62,6 @@
</executions>
</plugin>



</plugins>
</build>
</project>
26 changes: 13 additions & 13 deletions distribution/src/assembly/bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<!-- Maven assembly plugin configuration for executable packaging
See https://maven.apache.org/plugins/maven-assembly-plugin/faq.html#module-binaries
TODO: Should include xercesImpl and xml-apis jarfiles?
Not regex, bcel, commons
And those should be moved to xalan-X_version/
<!--
Maven assembly plugin configuration for executable packaging.
See https://maven.apache.org/plugins/maven-assembly-plugin/faq.html#module-binaries.
TODO: Should include xercesImpl and xml-apis jarfiles?
Not regex, bcel, commons.
And those should be moved to xalan-X_version/.
-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
<id>bin</id>
<formats>
<format>zip</format>
Expand All @@ -28,10 +29,9 @@
</binaries>
</moduleSet>
</moduleSets>
<!-- Should also include source for all the samples, and
all the documentation, for emulation of
Ant behavior. Rename site to docs for back-compatibility.
Should pick up version from variable...?
<!--
Should also include source for all the samples, and all the documentation, for emulation of Ant behavior. Rename
site to docs for back-compatibility. Should pick up version from variable...?
-->
<fileSets>
<fileSet>
Expand All @@ -43,8 +43,8 @@
<directory>../samples</directory>
<outputDirectory>${project.parent.name}_${project.parent.version}/samples</outputDirectory>
<excludes>
<exclude>target/**</exclude>
<exclude>src/site/**</exclude>
<exclude>target/**</exclude>
<exclude>src/site/**</exclude>
</excludes>
</fileSet>
</fileSets>
Expand Down
Loading