MALIO-DEV/PlantUmlServer
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: MALIO-DEV:d03fae1c36ce089b3dbe0b41f1447baf38fa0dd1
Branches Tags
MALIO-DEV:master
..
compare: MALIO-DEV:4df35390e10fe5c72bcd65309ebc1f45290ec3fe
Branches Tags
MALIO-DEV:master

10 Commits
d03fae1c36 ... 4df35390e1

Author SHA1 Message Date
Arnaud Roques
4df35390e1 version 1.2025.10
Some checks failed
Tests / test-java-8-war-generation (push) Failing after 2m6s
Details
Tests / test-mvn-livecycle (11) (push) Failing after 14s
Details
Tests / test-mvn-livecycle (17) (push) Failing after 15s
Details
Tests / test-embedded (11) (push) Has been skipped
Details
Tests / test-embedded (17) (push) Has been skipped
Details
Tests / test-mvn-jetty-run (11) (push) Has been skipped
Details
Tests / test-mvn-jetty-run (17) (push) Has been skipped
Details
Tests / test-jetty (11) (push) Has been skipped
Details
Tests / test-jetty (17) (push) Has been skipped
Details
Tests / test-tomcat (11) (push) Has been skipped
Details
Tests / test-tomcat (17) (push) Has been skipped
Details
2025-11-05 19:59:03 +01:00
Antoine Auger
c028584eee chore(deps): pin graphviz version in Dockerfiles (#394) 2025-10-15 16:00:01 +02:00
Arnaud Roques
9f16a8f9a5 update jetty version 2025-10-13 19:34:03 +02:00
Arnaud Roques
fe4fa7b984 version 1.2025.8 2025-10-05 19:12:38 +02:00
Arnaud Roques
0f6551d781 simplify test after PNG compression 2025-09-10 17:02:11 +02:00
Arnaud Roques
430e00674e version 1.2025.7 2025-09-10 16:23:29 +02:00
Arnaud Roques
efe6157bff version 1.2025.4 2025-06-29 10:14:34 +02:00
Ivo Šmíd
69d631783c fix: Bump batik & fop versions to align with plantuml lib (#369) 
When not fixed, wrong versions are on WAR classpath & vulnerabilities are reported.
 2025-06-02 11:52:20 +02:00
Arnaud Roques
9600f9adf2 version 1.2025.3 2025-06-01 13:03:06 +02:00
Arnaud Roques
293cc9fc53 test: change size limit 2025-03-05 23:17:34 +01:00
7 changed files with 16 additions and 23 deletions
Expand all files Collapse all files

3
Dockerfile.jetty
View File

@@ -26,8 +26,8 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/* && \
/generate-jetty-start.sh
ARG GRAPHVIZ_VERSION=14.0.1
# Build Graphviz from source because there are no binary distributions for recent versions
ARG GRAPHVIZ_VERSION
ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
RUN apt-get update && \
apt-get install -y --no-install-recommends \
@@ -39,7 +39,6 @@ RUN apt-get update && \
&& \
mkdir -p $GRAPHVIZ_BUILD_DIR && \
cd $GRAPHVIZ_BUILD_DIR && \
GRAPHVIZ_VERSION=${GRAPHVIZ_VERSION:-$(curl -s https://gitlab.com/api/v4/projects/4207231/releases/ | jq -r '.[] | .name' | sort -V -r | head -1)} && \
curl -o graphviz.tar.gz https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${GRAPHVIZ_VERSION}/graphviz-${GRAPHVIZ_VERSION}.tar.gz && \
tar -xzf graphviz.tar.gz && \
cd graphviz-$GRAPHVIZ_VERSION && \

7
Dockerfile.jetty-alpine
View File

@@ -8,7 +8,7 @@ RUN mvn --batch-mode --define java.net.useSystemProxies=true package
########################################################################################
FROM jetty:11.0.24-jre17-alpine-eclipse-temurin
FROM jetty:11.0.26-jre17-alpine-eclipse-temurin
# Proxy and OldProxy need empty path segments support in URIs
# Hence: allow AMBIGUOUS_EMPTY_SEGMENT
@@ -24,8 +24,8 @@ RUN apk add --no-cache \
&& \
/generate-jetty-start.sh
#RUN apk add --no-cache graphviz
ARG GRAPHVIZ_VERSION
ARG GRAPHVIZ_VERSION=14.0.1
# Build Graphviz from source because there are no binary distributions for recent versions
ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
RUN apk add --no-cache \
g++ \
@@ -37,7 +37,6 @@ RUN apk add --no-cache \
&& \
mkdir -p $GRAPHVIZ_BUILD_DIR && \
cd $GRAPHVIZ_BUILD_DIR && \
GRAPHVIZ_VERSION=${GRAPHVIZ_VERSION:-$(curl -s https://gitlab.com/api/v4/projects/4207231/releases/ | jq -r '.[] | .name' | sort -V -r | head -1)} && \
curl -o graphviz.tar.gz https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${GRAPHVIZ_VERSION}/graphviz-${GRAPHVIZ_VERSION}.tar.gz && \
tar -xzf graphviz.tar.gz && \
cd graphviz-$GRAPHVIZ_VERSION && \

3
Dockerfile.tomcat
View File

@@ -18,8 +18,8 @@ RUN apt-get update && \
&& \
rm -rf /var/lib/apt/lists/*
ARG GRAPHVIZ_VERSION=14.0.1
# Build Graphviz from source because there are no binary distributions for recent versions
ARG GRAPHVIZ_VERSION
ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
RUN apt-get update && \
apt-get install -y --no-install-recommends \
@@ -31,7 +31,6 @@ RUN apt-get update && \
&& \
mkdir -p $GRAPHVIZ_BUILD_DIR && \
cd $GRAPHVIZ_BUILD_DIR && \
GRAPHVIZ_VERSION=${GRAPHVIZ_VERSION:-$(curl -s https://gitlab.com/api/v4/projects/4207231/releases/ | jq -r '.[] | .name' | sort -V -r | head -1)} && \
curl -o graphviz.tar.gz https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${GRAPHVIZ_VERSION}/graphviz-${GRAPHVIZ_VERSION}.tar.gz && \
tar -xzf graphviz.tar.gz && \
cd graphviz-$GRAPHVIZ_VERSION && \

6
pom.parent.xml
View File

@@ -61,7 +61,7 @@
<jetty.contextpath>/${wtp.contextName}</jetty.contextpath>
<!-- main versions -->
<plantuml.version>1.2025.2</plantuml.version>
<plantuml.version>1.2025.10</plantuml.version>
<!-- Please keep the jetty version identical with the docker image -->
<jetty.version>11.0.24</jetty.version>
<!--
@@ -82,8 +82,8 @@
<jlatexmath-font-greek.version>${jlatexmath.version}</jlatexmath-font-greek.version>
<jlatexmath-font-cyrillic.version>${jlatexmath.version}</jlatexmath-font-cyrillic.version>
<!-- PDF -->
<batik.version>1.17</batik.version>
<fop.version>2.8</fop.version>
<batik.version>1.19</batik.version>
<fop.version>2.11</fop.version>
<!-- Testing -->
<junit.version>5.9.3</junit.version>

14
src/test/java/net/sourceforge/plantuml/servlet/TestMultipageUml.java
View File

@@ -30,9 +30,8 @@ public class TestMultipageUml extends WebappTestCase {
);
// Get the image and verify its size
byte[] inMemoryImage = getContentAsBytes(conn);
int diagramLen = inMemoryImage.length; // 7525
Assertions.assertTrue(diagramLen > 6000);
Assertions.assertTrue(diagramLen < 9000);
int diagramLen = inMemoryImage.length;
Assertions.assertTrue(diagramLen > 100);
}
/**
@@ -52,9 +51,8 @@ public class TestMultipageUml extends WebappTestCase {
);
// Get the image and verify its size
byte[] inMemoryImage = getContentAsBytes(conn);
int diagramLen = inMemoryImage.length; // 4196
Assertions.assertTrue(diagramLen > 3000);
Assertions.assertTrue(diagramLen < 5000);
int diagramLen = inMemoryImage.length;
Assertions.assertTrue(diagramLen > 100);
}
/**
@@ -76,7 +74,7 @@ public class TestMultipageUml extends WebappTestCase {
String diagram = getContentText(conn);
int diagramLen = diagram.length();
Assertions.assertTrue(diagramLen > 4500);
Assertions.assertTrue(diagramLen < 6000);
Assertions.assertTrue(diagramLen < 8000);
}
/**
@@ -98,7 +96,7 @@ public class TestMultipageUml extends WebappTestCase {
String diagram = getContentText(conn);
int diagramLen = diagram.length();
Assertions.assertTrue(diagramLen > 1500);
Assertions.assertTrue(diagramLen < 4000);
Assertions.assertTrue(diagramLen < 6000);
}
/**

3
src/test/java/net/sourceforge/plantuml/servlet/TestOldProxy.java
View File

@@ -32,8 +32,7 @@ public class TestOldProxy extends WebappTestCase {
// Get the image and verify its size (~2000 bytes)
byte[] inMemoryImage = getContentAsBytes(conn);
int diagramLen = inMemoryImage.length;
Assertions.assertTrue(diagramLen > 2000);
Assertions.assertTrue(diagramLen < 3000);
Assertions.assertTrue(diagramLen > 100);
}
/**

3
src/test/java/net/sourceforge/plantuml/servlet/TestProxy.java
View File

@@ -32,8 +32,7 @@ public class TestProxy extends WebappTestCase {
// Get the image and verify its size (~2000 bytes)
byte[] inMemoryImage = getContentAsBytes(conn);
int diagramLen = inMemoryImage.length;
Assertions.assertTrue(diagramLen > 2000);
Assertions.assertTrue(diagramLen < 3000);
Assertions.assertTrue(diagramLen > 100);
}
/**