You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2023/02/14 07:22:26 UTC
[struts-archetypes] branch WW-5283-update updated: WW-5283 Extracts Jetty version into property
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5283-update
in repository https://gitbox.apache.org/repos/asf/struts-archetypes.git
The following commit(s) were added to refs/heads/WW-5283-update by this push:
new 06e19c0 WW-5283 Extracts Jetty version into property
06e19c0 is described below
commit 06e19c0e31c1303a8cd1afdbae2d1def48b5feef
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Tue Feb 14 08:22:21 2023 +0100
WW-5283 Extracts Jetty version into property
---
pom.xml | 1 +
.../src/main/resources/archetype-resources/pom.xml | 3 ++-
struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml | 3 ++-
.../src/main/resources/archetype-resources/pom.xml | 3 ++-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a2735d6..c54d3a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,7 @@
<supported.struts2.version>6.1.1</supported.struts2.version>
<supported.log4j.version>2.19.0</supported.log4j.version>
+ <supported.jetty.version>9.4.46.v20220331</supported.jetty.version>
</properties>
<build>
diff --git a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
index 2867dfe..6c89ad2 100644
--- a/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
@@ -166,13 +166,14 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.46.v20220331</version>
+ <version>${supported.jetty.version}</version>
<configuration>
<stopKey>CTRL+C</stopKey>
<stopPort>8999</stopPort>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webAppSourceDirectory>\${basedir}/src/main/webapp/</webAppSourceDirectory>
<webAppConfig>
+ <contextPath>/\${artifactId}</contextPath>
<descriptor>\${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
</webAppConfig>
</configuration>
diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
index 7e9e74d..4f8ca8a 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
@@ -78,13 +78,14 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.46.v20220331</version>
+ <version>${supported.jetty.version}</version>
<configuration>
<stopKey>CTRL+C</stopKey>
<stopPort>8999</stopPort>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webAppSourceDirectory>\${basedir}/src/main/webapp/</webAppSourceDirectory>
<webAppConfig>
+ <contextPath>/\${artifactId}</contextPath>
<descriptor>\${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
</webAppConfig>
</configuration>
diff --git a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
index e0c09db..347d3ed 100644
--- a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
@@ -92,13 +92,14 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.46.v20220331</version>
+ <version>${supported.jetty.version}</version>
<configuration>
<stopKey>CTRL+C</stopKey>
<stopPort>8999</stopPort>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webAppSourceDirectory>\${basedir}/src/main/webapp/</webAppSourceDirectory>
<webAppConfig>
+ <contextPath>/\${artifactId}</contextPath>
<descriptor>\${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
</webAppConfig>
</configuration>
diff --git a/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
index d7cfa0e..e317993 100644
--- a/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
@@ -98,7 +98,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.46.v20220331</version>
+ <version>${supported.jetty.version}</version>
<configuration>
<stopKey>CTRL+C</stopKey>
<stopPort>8999</stopPort>