Skip to content

Commit

Permalink
Use published plantuml-asl version instead of building from sources (…
Browse files Browse the repository at this point in the history
…finally!)

Signed-off-by: Sjoerd Talsma <sjoerdtalsma@users.noreply.github.com>
  • Loading branch information
sjoerdtalsma committed Nov 24, 2023
1 parent 6769010 commit 593975c
Show file tree
Hide file tree
Showing 4,338 changed files with 43 additions and 356,792 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
44 changes: 43 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.release>9</maven.compiler.release>
<plantuml-asl.version>1.2023.12</plantuml-asl.version>

<!-- Plant UML apache-licensed sources: https://sourceforge.net/projects/plantuml/files/ -->
<plantuml-asl.directory>${project.basedir}/src/plantuml-asl</plantuml-asl.directory>
Expand Down Expand Up @@ -104,6 +105,7 @@
<include>LICENSE</include>
</includes>
</resource>
<!--
<resource>
<directory>${plantuml-asl.directory}/src</directory>
<includes>
Expand All @@ -118,6 +120,8 @@
<include>net/sourceforge/plantuml/windowsdot/*.dat</include>
</includes>
</resource>
-->
<!--
<resource>
<directory>${plantuml-asl.directory}</directory>
<includes>
Expand All @@ -128,8 +132,10 @@
<include>svg/**/*.css</include>
</includes>
</resource>
-->
</resources>
<plugins>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand All @@ -148,6 +154,30 @@
</execution>
</executions>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<executions>
<execution>
<id>shade-dependencies</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<artifactSet>
<includes>
<include>net.sourceforge.plantuml:plantuml-asl</include>
</includes>
</artifactSet>
<minimizeJar>true</minimizeJar>
<!-- TODO exclude unused packages and resources to save space. -->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down Expand Up @@ -175,6 +205,7 @@
</goals>
</execution>
</executions>
<!--
<configuration>
<excludes>
<exclude>gen/**/*</exclude>
Expand All @@ -183,6 +214,7 @@
<exclude>smetana/**/*</exclude>
</excludes>
</configuration>
-->
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
Expand Down Expand Up @@ -267,8 +299,10 @@
<artifactId>umldoclet</artifactId>
<version>${project.version}</version>
</docletArtifact>
<!--
<sourcepath>${project.build.sourceDirectory}:${plantuml-asl.directory}/src</sourcepath>
<excludePackageNames>gen.*:h:net.sourceforge.*:smetana.*</excludePackageNames>
-->
<additionalOptions>
<additionalOption>-createPumlFiles</additionalOption>
<additionalOption>-failOnCyclicPackageDependencies true</additionalOption>
Expand Down Expand Up @@ -303,13 +337,21 @@
</build>

<dependencies>
<dependency> <!-- Required to compile 'net.sourceforge.plantuml.ant.*' -->
<!--
<dependency> &lt;!&ndash; Required to compile 'net.sourceforge.plantuml.ant.*' &ndash;&gt;
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.14</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
-->
<dependency>
<groupId>net.sourceforge.plantuml</groupId>
<artifactId>plantuml-asl</artifactId>
<version>${plantuml-asl.version}</version>
</dependency>

<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>findbugs-annotations</artifactId>
Expand Down
1 change: 0 additions & 1 deletion src/plantuml-asl/.gitignore

This file was deleted.

198 changes: 0 additions & 198 deletions src/plantuml-asl/COPYING

This file was deleted.

1 change: 0 additions & 1 deletion src/plantuml-asl/README

This file was deleted.

Loading

0 comments on commit 593975c

Please sign in to comment.