diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f68088b..567ab4a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,42 +35,6 @@ jobs: path: target/plantuml.war retention-days: 1 - test-java-8-war: - runs-on: ubuntu-latest - needs: test-java-8-war-generation - strategy: - matrix: - java-version: [ 11, 17 ] - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: retrieve generated files (jre8) - uses: actions/download-artifact@v4.1.7 - with: - name: war-jre8 - path: artifacts - - - uses: actions/setup-java@v3 - with: - distribution: "zulu" - java-version: ${{ matrix.java-version }} - check-latest: true - cache: "maven" - - - name: Prepare jetty-runner tests - run: mvn --batch-mode clean package - - - name: Start jetty server over jetty-runner - run: java -jar target/dependency/jetty-runner.jar --config src/main/config/jetty.xml --path /plantuml artifacts/plantuml.war & - - - name: Wait 5 seconds (to let jetty-runner start the jetty server) - run: sleep 5s - - - name: Run tests against "mvn jetty:run" server - run: mvn --batch-mode test -DskipTests=false -Dgroups=\!graphviz-test -DargLine="-Dsystem.test.server=http://localhost:8080/plantuml" - test-mvn-livecycle: runs-on: ubuntu-latest strategy: @@ -163,36 +127,6 @@ jobs: - name: Run tests against "mvn jetty:run" server run: mvn --batch-mode test -DskipTests=false -Dgroups=\!graphviz-test -DargLine="-Dsystem.test.server=http://localhost:8080/plantuml" - test-jetty-runner: - runs-on: ubuntu-latest - needs: test-mvn-livecycle - strategy: - matrix: - java-version: [ 11, 17 ] - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - uses: actions/setup-java@v3 - with: - distribution: "zulu" - java-version: ${{ matrix.java-version }} - check-latest: true - cache: "maven" - - - name: Prepare jetty-runner tests - run: mvn --batch-mode clean package - - - name: Start jetty server over jetty-runner - run: java -jar target/dependency/jetty-runner.jar --config src/main/config/jetty.xml --path /plantuml target/plantuml.war & - - - name: Wait 5 seconds (to let jetty-runner start the jetty server) - run: sleep 5s - - - name: Run tests against "mvn jetty:run" server - run: mvn --batch-mode test -DskipTests=false -Dgroups=\!graphviz-test -DargLine="-Dsystem.test.server=http://localhost:8080/plantuml" - test-jetty: runs-on: ubuntu-latest needs: test-mvn-livecycle diff --git a/README.md b/README.md index ca30ff1..e811267 100644 --- a/README.md +++ b/README.md @@ -98,20 +98,7 @@ And run `docker-compose up`. This will start a modified version of the image usi You can apply some option to your PlantUML server with environment variable. -If you run the directly the jar: -```sh -# NOTE: jetty-runner is deprecated. -# build war file and jetty-runner -mvn package -# start directly -# java $JVM_ARGS -jar jetty-runner.jar $JETTY_ARGS -java -jar target/dependency/jetty-runner.jar --config src/main/config/jetty.xml --port 9999 --path /plantuml target/plantuml.war -# see help for more possible options -java -jar target/dependency/jetty-runner.jar --help -``` -Note: `--config src/main/config/jetty.xml` is only necessary if you need support for empty path segments in URLs (e.g. for the old proxy) - -Alternatively, start over maven and pass the option with `-D` flag +If you're using the `jetty` Maven plugin, use the -D` flag to pass environment variables: ```sh mvn jetty:run -D THE_ENV_VARIABLE=THE_ENV_VALUE -Djetty.http.port=9999 ``` diff --git a/pom.parent.xml b/pom.parent.xml index e819d62..8231dbb 100644 --- a/pom.parent.xml +++ b/pom.parent.xml @@ -41,7 +41,7 @@ This artifact is required for: 1. EmbeddedJettyServer -> scope: test 2. Tomcat docker image -> scope: compile - BUT: Jetty docker image as well as jetty-runner will crash on runtime if + BUT: Jetty docker image will crash on runtime if this artifact is included because it's already provided so that the artifact would apear multiple times on the classpath. You can test it via: `mvn jetty:run [-Dapache-jsp.scope=compile]` @@ -63,7 +63,7 @@ 1.2025.0 - 11.0.18 + 11.0.24 2.10 - ${jetty.version} ${jetty.version} 1.5.1 3.5.0 @@ -441,23 +440,6 @@ - - - package - - copy - - - - - org.eclipse.jetty - jetty-runner - ${jetty-runner.version} - jetty-runner.jar - - - -