1
0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-22 13:05:09 +00:00
Commit Graph

825 Commits

Author SHA1 Message Date
Martin Ross
2ca7dca0e3 Remove extra logging and switch startGroup maps from HashMap to EnumMap 2022-02-15 14:55:21 -05:00
Martin Ross
416325e6c8 Preserve element group structure in svg output to allow more intelligent post-processing 2022-02-15 13:11:51 -05:00
Arnaud Roques
e7785ff144 minor fixes 2022-02-14 18:44:01 +01:00
PlantUML
fe4c5cb957
Merge pull request #921 from soloturn/master
sign plantuml-pdf.jar
2022-02-14 14:20:30 +01:00
soloturn
18e6c41bfb use gradle in-memory asci-armored keys to sign artifacts
on the commadn line this allows as before:
  gradle -q signMavenPublication signPdfJar -Psigning.gnupg.keyName=... - -Psigning.gnupg.passphrase=...

on github this allows to put the key and password into environment variables:
  ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ARTIFACT_SIGNING_KEY }}
  ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ARTIFACT_SIGNING_PASSPHRASE }}
  gradle -q signMavenPublication signPdfJar
2022-02-14 13:46:59 +01:00
soloturn
92e955ef03 upgrade fop, and mvn plugins 2022-02-14 13:33:27 +01:00
soloturn
2c44343fad gradle, sign plantuml-pdf.jar, and gh upload 2022-02-14 13:33:27 +01:00
PlantUML
8015ed1285
Remove contentScriptType: application/ecmascript 2022-02-14 12:42:16 +01:00
PlantUML
fce81ce267
Merge pull request #917 from soloturn/pdfjar
create plantuml-pdf.jar and upload it to github
2022-02-13 16:33:47 +01:00
soloturn
357720e4cb gradle upload artifacts in any case, like mvn did before 2022-02-13 15:44:16 +01:00
soloturn
8417f23d3e gradle, github publish plantuml-pdf jar
plantuml-pdf-<version>.jar is not signed at the moment.
2022-02-13 15:44:12 +01:00
soloturn
d582935e04 gradle pdfJar produces plantuml-pdf-<version>.jar 2022-02-13 14:54:25 +01:00
PlantUML
4b3683be83
Merge pull request #916 from soloturn/master
optional pdf deps, local publish without signing
2022-02-13 09:26:35 +01:00
soloturn
858903fec3 pdf optional dependencies 2022-02-13 08:40:15 +01:00
soloturn
6fe6a4c988 gradle, reorder to permit fat jar and features 2022-02-13 08:21:51 +01:00
soloturn
b18175b25c gradle, avoid configuring tasks not run 2022-02-13 08:21:51 +01:00
soloturn
255b5180fe gradle, javadoc, add class-use + utf8 2022-02-13 08:20:58 +01:00
soloturn
06b6493f69 gradle, only sign when properties are there 2022-02-13 07:44:56 +01:00
Arnaud Roques
81fd6d4943 test update 2022-02-12 18:34:19 +01:00
Arnaud Roques
2761d1e922 Style improvement 2022-02-12 18:27:51 +01:00
PlantUML
45e89d12a8
Merge pull request #914 from soloturn/master
separate build and test
2022-02-12 10:09:36 +01:00
soloturn
d201e7de64 gradle, store POM_VERSION in properties so it is taken everywhere. 2022-02-12 09:46:48 +01:00
soloturn
ba4c7da3e4 gradle, separate test, and build/upload 2022-02-12 09:46:43 +01:00
soloturn
a08af697e4 gradle release, gh publish signatures. 2022-02-12 08:39:38 +01:00
soloturn
defeb87909 gradle, clean, maven publication, same version for build/sign 2022-02-12 08:13:40 +01:00
PlantUML
6cfeabefc2
Merge pull request #913 from soloturn/master
sign step checks environment var from gpg step
2022-02-11 13:12:54 +01:00
soloturn
fc674de09f sign step checks environment var from gpg step 2022-02-11 13:00:55 +01:00
PlantUML
e8e923d8e2
Merge pull request #912 from soloturn/master
switch default build to gradle, fixes #47
2022-02-11 12:24:16 +01:00
soloturn
8603c8da91 gradle, build and sign artifacts in 2 steps
release is not from windows 2019, daemon can be used
2022-02-11 12:10:58 +01:00
soloturn
ad222ccc1b build.gradle.kts, project uses tab, not space indent 2022-02-11 11:13:46 +01:00
soloturn
12fce2cfd6 no gradle daemon so windows 2019 can use the cache.
in case somebody wonders about the confusing message that a daemon
is started, an explanation here:
https://discuss.gradle.org/t/no-daemon-switch-ineffective-if-jvm-settings-cause-new-fork/14919/7
2022-02-11 10:00:05 +01:00
soloturn
7d256adde6 switch default build to gradle, fixes #47 2022-02-11 09:41:40 +01:00
PlantUML
b687dccd9f
Merge pull request #911 from soloturn/master
revert github workflows to use java8, java11, java17
2022-02-11 08:24:07 +01:00
soloturn
b27c1fc50d revert github workflows to use java8, java11, java17
github workflow should use the various java versions to test,
which permits to test especially 2d rendering differences.

the javac release flag is set to produce java8 binaries in
any case. not perfect, but we only loose a warning that
applets are to be removed after java17, trivial to display
by adding the javac release property, when using java17:

  mvn --batch-mode compile -Dmaven.compiler.release=17
  gradle clean build -x javaDoc -PjavacRelease=17

better would be to separate build and test, as suggested
by https://github.com/matthew16550, here:
https://github.com/plantuml/plantuml/pull/904
2022-02-11 08:13:03 +01:00
Arnaud Roques
4534dc4ee2 Change default theme 2022-02-10 19:16:18 +01:00
PlantUML
edacfb5dbc
Merge pull request #908 from soloturn/master
gradle, permit 'gradle test' with java8
2022-02-10 17:36:31 +01:00
soloturn
2d4024f2f3 mvn, source and target java8, maven-compiler-plugin default still is java7. 2022-02-10 17:32:46 +01:00
soloturn
1bb80c929c gradle, permit 'gradle test' with java8 2022-02-10 17:11:11 +01:00
PlantUML
b438f6561c
Merge pull request #907 from soloturn/master
permit "mvn test" with java8.
2022-02-10 16:09:06 +01:00
soloturn
e4a560a998 permit "mvn test" with java8.
activate javac --release only on higher java versions. it allows to compile
with java11+, but permits afterwards running tests with java8 to make sure
rendering errors can be catched.

parmit the syntax of the source to include java17, and tell the user about
it instead of just failing the compilation.
2022-02-10 10:23:15 +01:00
PlantUML
4397977d8a
Merge pull request #904 from soloturn/master
github workflow with various release again
2022-02-09 14:14:03 +01:00
soloturn
2baa696e60 github workflow with various release again
it runs on all platforms with java-17, but the javac release flag
is set to 8, 11, and 17 respectively. artifact upload happens
from latest ubuntu LTS, 20.04, java-8.
2022-02-08 12:53:41 +01:00
PlantUML
f67ebad086
Merge pull request #903 from soloturn/gradle
gradle, allow java17 binary
2022-02-08 12:39:42 +01:00
soloturn
e15c58d9a2 allow "gradle build -PjavacRelease=17" to build java-17 binary
for gradle now one could do:
gradle clean build -x test -x javaDoc -PjavacRelease=17

for maven something like this works to build a different target binary:
mvn clean package -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.compiler.release=17
2022-02-08 11:12:24 +01:00
soloturn
ecc8dfe60a gradle javadoc, addBooleanOption instead of addStringOption 2022-02-08 11:11:50 +01:00
PlantUML
065e2b34d9
Merge pull request #899 from soloturn/master
use javac --release, java8 minimum version
2022-02-07 09:31:12 +01:00
soloturn
2bdb2f8300 github workflow --release flag needs build with 11
https://github.com/plantuml/plantuml/issues/898
2022-02-05 19:04:17 +01:00
soloturn
856cef2478 javac --release to build for java8, with java11+
javac since java9 has a new flat --release to build a binary which can be run
with an older java. the public API of that older release must be followed as
well.

the flags used before, -source, -target do not do this. therefor it got
unnoticed that plantuml did not compile and run in java7 any more, despite
beeing compiled for for java7.

https://github.com/plantuml/plantuml/issues/898
2022-02-05 19:04:17 +01:00
PlantUML
88947b9dc7
Merge pull request #901 from soloturn/gradle
simpler syntax, clazz.newInstance deprecated with java17
2022-02-04 15:29:45 +01:00
soloturn
90fd3b5a51 simpler syntax, clazz.newInstance deprecated with java17 2022-02-04 15:21:27 +01:00