diff options
| author |   vasraz <vasyl.razinkov@est.tech> | 2022-11-19 18:46:16 +0000 |
|---|---|---|
| committer | Vasyl Razinkov <vasyl.razinkov@est.tech> | 2022-11-20 17:40:21 +0000 |
| commit | 843ffbeee4a48a5c61dc1dedbf5f352596f5bffa (patch) | |
| tree | 61e4395011b93746158a17686ecf0a5ae84c40db /sdc-workflow-designer-ui | |
| parent | 9bf89a232e97f9f9cbd71da9d8784cdf9b17004e (diff) | |
Align jetty version
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I90b61b52f87331d974dc919ecf4d89022d1df516
Issue-ID: SDC-4273
Diffstat (limited to 'sdc-workflow-designer-ui')
| -rw-r--r-- | sdc-workflow-designer-ui/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | sdc-workflow-designer-ui/pom.xml | 28 | ||||
| -rw-r--r-- | sdc-workflow-designer-ui/src/main/webapp/WEB-INF/jetty-web.xml | 2 |
3 files changed, 25 insertions, 7 deletions
diff --git a/sdc-workflow-designer-ui/docker/Dockerfile b/sdc-workflow-designer-ui/docker/Dockerfile index 482cd205..2be5ea56 100644 --- a/sdc-workflow-designer-ui/docker/Dockerfile +++ b/sdc-workflow-designer-ui/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM jetty:9.4.31-jre11-slim +FROM jetty:${jetty.docker.version}-jre11-alpine EXPOSE 8080 EXPOSE 8443 diff --git a/sdc-workflow-designer-ui/pom.xml b/sdc-workflow-designer-ui/pom.xml index b054b091..ada4d62e 100644 --- a/sdc-workflow-designer-ui/pom.xml +++ b/sdc-workflow-designer-ui/pom.xml @@ -17,8 +17,8 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>sdc-workflow-designer-ui</artifactId> @@ -31,8 +31,7 @@ </parent> <properties> - <jest.command /> - <jetty.version>9.4.48.v20220622</jetty.version> + <jest.command/> </properties> <dependencies> @@ -137,6 +136,26 @@ </webResources> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>3.3.0</version> + <executions> + <execution> + <id>regex-property</id> + <goals> + <goal>regex-property</goal> + </goals> + <configuration> + <name>jetty.docker.version</name> + <value>${jetty.version}</value> + <regex>.v[0-9]+</regex> + <replacement/> + <failIfNoMatch>false</failIfNoMatch> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> @@ -208,4 +227,3 @@ </profile> </profiles> </project> - diff --git a/sdc-workflow-designer-ui/src/main/webapp/WEB-INF/jetty-web.xml b/sdc-workflow-designer-ui/src/main/webapp/WEB-INF/jetty-web.xml index 92e847c8..e235c9c6 100644 --- a/sdc-workflow-designer-ui/src/main/webapp/WEB-INF/jetty-web.xml +++ b/sdc-workflow-designer-ui/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Set name="contextPath">/workflows</Set> |