From 036f7edf016e184b0a693d00a88829bd55aac002 Mon Sep 17 00:00:00 2001 From: Stephan Fuhrmann Date: Thu, 18 Nov 2021 14:23:23 +0100 Subject: [PATCH 1/3] Maven build profile for building with PDF dependencies to a fat jar --- pom.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4fd922bd5..3e4587269 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,7 @@ 1.7 1.8 1.8 + net.sourceforge.plantuml.Run @@ -202,15 +203,22 @@ + org.apache.maven.plugins maven-jar-plugin 3.2.0 - manifest.txt + + true + false + ${main.class} + true + true + - + maven-surefire-plugin 3.0.0-M5 @@ -255,5 +263,51 @@ 1.8 + + pdf + + false + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.1.1 + + + jar-with-dependencies + + + + ${main.class} + + + + + + make-assembly + package + + single + + + + + + + + + org.apache.xmlgraphics + fop + 2.6 + + + org.apache.xmlgraphics + batik-all + 1.14 + + + From e20db045cd304988c621a9062c639e1ab4e99cca Mon Sep 17 00:00:00 2001 From: Stephan Fuhrmann Date: Thu, 18 Nov 2021 15:45:49 +0100 Subject: [PATCH 2/3] Restore the use of manifest.txt as discussed Resolve Git conflicts --- pom.xml | 510 +++++++++++++++++++++++++++----------------------------- 1 file changed, 245 insertions(+), 265 deletions(-) diff --git a/pom.xml b/pom.xml index 3e4587269..ec863c82c 100644 --- a/pom.xml +++ b/pom.xml @@ -31,15 +31,13 @@ --> - 4.0.0 - - net.sourceforge.plantuml - plantuml - 1.2021.15-SNAPSHOT - jar - - PlantUML - + 4.0.0 + net.sourceforge.plantuml + plantuml + 1.2021.15-SNAPSHOT + jar + PlantUML + PlantUML is a component that allows to quickly write : * sequence diagram, * use case diagram, @@ -49,265 +47,247 @@ * state diagram * object diagram - https://plantuml.com - - - org.sonatype.oss - oss-parent - 7 - - - - ${project.artifactId}-${project.version} - 1.7 - 1.7 - 1.8 - 1.8 - net.sourceforge.plantuml.Run - - - - - - org.junit - junit-bom - 5.8.1 - pom - import - - - - - + https://plantuml.com + + org.sonatype.oss + oss-parent + 7 + + + ${project.artifactId}-${project.version} + 1.7 + 1.7 + 1.8 + 1.8 + net.sourceforge.plantuml.Run + + - - org.apache.ant - ant - 1.10.12 - provided - - - org.assertj - assertj-core - 3.21.0 - test - - - org.junit.jupiter - junit-jupiter - test - - - org.scilab.forge - jlatexmath - 1.0.7 - test - + + org.junit + junit-bom + 5.8.1 + pom + import + - - - - The GNU General Public License - http://www.gnu.org/licenses/gpl.txt - repo - - - - - scm:svn:svn://svn.code.sf.net/p/plantuml/code/trunk - scm:svn:https://svn.code.sf.net/p/plantuml/code/trunk - svn://svn.code.sf.net/p/plantuml/code/trunk - - - - Sourceforge - http://sourceforge.net/tracker/?group_id=259736 - - - - - arnaud.roques - Arnaud Roques - plantuml@gmail.com - - - - - ${finalName} - ${project.basedir}/src - ${project.basedir}/test - - - ${project.basedir}/src - - net/sourceforge/plantuml/version/*.png - net/sourceforge/plantuml/openiconic/data/*.txt - net/sourceforge/plantuml/openiconic/data/*.svg - net/sourceforge/plantuml/fun/*.png - sprites/archimate/*.png - net/sourceforge/plantuml/dedication/*.png - net/sourceforge/plantuml/math/*.js - net/sourceforge/plantuml/windowsdot/*.dat - - - - ${project.basedir} - - stdlib/**/*.repx - skin/**/*.skin - themes/**/*.puml - svg/**/*.css - svg/**/*.js - - - - - - maven-compiler-plugin - 3.8.1 - - true - - - - maven-dependency-plugin - 3.2.0 - - - maven-source-plugin - 3.2.1 - - - attach-sources - - jar - - - - - - maven-javadoc-plugin - 3.2.0 - - - attach-javadocs - - jar - - - -Xdoclint:none - -Xdoclint:none - none - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - - true - false - ${main.class} - true - true - - - - - - maven-surefire-plugin - 3.0.0-M5 - - - UNSECURE - - - true - - - - - maven-release-plugin - 2.5.3 - - forked-path - - - - org.codehaus.mojo - versions-maven-plugin - 2.8.1 - - - - - - - - intellij - - false - - idea.maven.embedder.version - - - - 1.8 - 1.8 - - - - pdf - - false - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.1.1 - - - jar-with-dependencies - - - - ${main.class} - - - - - - make-assembly - package - - single - - - - - - - - - org.apache.xmlgraphics - fop - 2.6 - - - org.apache.xmlgraphics - batik-all - 1.14 - - - - + intellij + + false + + idea.maven.embedder.version + + + + 1.8 + 1.8 + + + + pdf + + false + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.1.1 + + + jar-with-dependencies + + + + ${main.class} + + + + + + make-assembly + package + + single + + + + + + + + + org.apache.xmlgraphics + fop + 2.6 + + + org.apache.xmlgraphics + batik-all + 1.14 + + + + From 1469b22e3fabb1614887d745b96ae2976ab7d558 Mon Sep 17 00:00:00 2001 From: Stephan Fuhrmann Date: Thu, 18 Nov 2021 16:10:29 +0100 Subject: [PATCH 3/3] Fix indentation --- pom.xml | 92 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/pom.xml b/pom.xml index ec863c82c..25453a32c 100644 --- a/pom.xml +++ b/pom.xml @@ -243,51 +243,51 @@ 1.8 - - pdf - - false - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.1.1 - - - jar-with-dependencies - - - - ${main.class} - - - - - - make-assembly - package - - single - - - - - - - - - org.apache.xmlgraphics - fop - 2.6 - - - org.apache.xmlgraphics - batik-all - 1.14 - - - + + pdf + + false + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.1.1 + + + jar-with-dependencies + + + + ${main.class} + + + + + + make-assembly + package + + single + + + + + + + + + org.apache.xmlgraphics + fop + 2.6 + + + org.apache.xmlgraphics + batik-all + 1.14 + + +