You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/11/08 12:42:48 UTC
[tomee] branch main updated: TOMEE-4014 - Unable to see TomEE version in Tomcat home page with Java 17
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 328d3899df TOMEE-4014 - Unable to see TomEE version in Tomcat home page with Java 17
328d3899df is described below
commit 328d3899dfed6c4c0c6d283a5476b819de347816
Author: Richard Zowalla <ri...@hs-heilbronn.de>
AuthorDate: Tue Nov 8 13:42:02 2022 +0100
TOMEE-4014 - Unable to see TomEE version in Tomcat home page with Java 17
---
.gitignore | 3 ---
tomee/apache-tomee/pom.xml | 24 ++++++++++++++----------
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore
index dca0d1967c..da38c0a197 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,3 @@ tck/**/temp
examples/jaxrs-json-provider-jettison/temp/
transformer/jakartaee-prototype/
transformer/transformer-0.1.0-SNAPSHOT/
-.DS_Store
-dependency-reduced-pom.xml
-/tomee/apache-tomee/src/patch/java/org/apache/catalina/util/ServerInfo.properties
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index a2aff00f72..03d41d86cc 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -530,10 +530,10 @@
<format property="today" pattern="MMM d yyyy" locale="en" timezone="UTC" />
<format property="tstamp" pattern="HH:mm:ss" locale="en" timezone="UTC" />
</tstamp>
- <copy file="src/template/patch/java/org/apache/catalina/util/ServerInfo.properties" tofile="src/patch/java/org/apache/catalina/util/ServerInfo.properties" />
- <replace file="src/patch/java/org/apache/catalina/util/ServerInfo.properties" token="@TOMCAT-VERSION-REPLACED-BY-MAVEN@" value="${tomcat.version}" />
- <replace file="src/patch/java/org/apache/catalina/util/ServerInfo.properties" token="@TOMEE-VERSION-REPLACED-BY-MAVEN@" value="${tomee.version}" />
- <replace file="src/patch/java/org/apache/catalina/util/ServerInfo.properties" token="@DATE-REPLACED-BY-MAVEN@" value="${today} ${tstamp} UTC" />
+ <copy file="src/template/patch/java/org/apache/catalina/util/ServerInfo.properties" tofile="target/classes/ServerInfo.properties" />
+ <replace file="target/classes/ServerInfo.properties" token="@TOMCAT-VERSION-REPLACED-BY-MAVEN@" value="${tomcat.version}" />
+ <replace file="target/classes/ServerInfo.properties" token="@TOMEE-VERSION-REPLACED-BY-MAVEN@" value="${tomee.version}" />
+ <replace file="target/classes/ServerInfo.properties" token="@DATE-REPLACED-BY-MAVEN@" value="${today} ${tstamp} UTC" />
</target>
</configuration>
</execution>
@@ -604,9 +604,11 @@
<select>apache-tomee-(plus|plume|webprofile|microprofile).*\.zip</select>
<skipTransform>true</skipTransform>
<createTarGz>true</createTarGz>
- <!-- <sourceExcludes>-->
- <!-- <exclude>org/apache/cxf</exclude>-->
- <!-- </sourceExcludes>-->
+ <replace>
+ <resources>
+ <ServerInfo.properties>${project.build.outputDirectory}/ServerInfo.properties</ServerInfo.properties>
+ </resources>
+ </replace>
</configuration>
<executions>
<execution>
@@ -833,9 +835,11 @@
<select>apache-tomee-(plus|plume|webprofile|microprofile).*\.zip</select>
<skipTransform>true</skipTransform>
<createTarGz>true</createTarGz>
- <!-- <sourceExcludes>-->
- <!-- <exclude>org/apache/cxf</exclude>-->
- <!-- </sourceExcludes>-->
+ <replace>
+ <resources>
+ <ServerInfo.properties>${project.build.sourceDirectory}/ServerInfo.properties</ServerInfo.properties>
+ </resources>
+ </replace>
</configuration>
<executions>
<execution>