This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
The following commit(s) were added to refs/heads/master by this push:
new 431e0e0 Add dependency on tomcat-catalina to assist in IDE debugging
The best way to debug a plume server is to open just this module into an IDE so
we have just the right libraries. If you open at the root you'll get multiple
versions of of many dependencies. You won't see Tomcat classes, however, so
adding them as a provided dep will ensure Tomcat is in the IDE classpath but
not added to the war.
431e0e0 is described below
commit 431e0e088621d397d6ce2b77488ca9a2c609bbf3
Author: David Blevins <[email protected]>
AuthorDate: Fri Mar 26 03:15:23 2021 -0700
Add dependency on tomcat-catalina to assist in IDE debugging
The best way to debug a plume server is to open just this module into an
IDE so we have just the right libraries. If you open at the root you'll get
multiple versions of of many dependencies. You won't see Tomcat classes,
however, so adding them as a provided dep will ensure Tomcat is in the IDE
classpath but not added to the war.
---
tomee/tomee-plume-webapp/pom.xml | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 62dcf04..1c902e4 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -187,7 +187,11 @@
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -243,10 +247,10 @@
<configuration>
<target>
<tstamp>
- <format property="TSTAMP" pattern="hh:mm" />
+ <format property="TSTAMP" pattern="hh:mm"/>
</tstamp>
- <replace file="target/classes/openejb-version.properties"
token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}" />
- <replace file="target/classes/openejb-version.properties"
token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}" />
+ <replace file="target/classes/openejb-version.properties"
token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}"/>
+ <replace file="target/classes/openejb-version.properties"
token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}"/>
</target>
</configuration>
</execution>
@@ -284,10 +288,19 @@
<select>tomee-plume-webapp-transformed-.*\.war</select>
<patchSources>
<source>${project.basedir}/../../transform/src/patch/java/</source>
+ <source>${project.basedir}/src/patch/java/</source>
</patchSources>
- <replacements>
-
<openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
- </replacements>
+ <replace>
+ <!-- We don't want these bytecode modified at all, so we overwrite
+ any modifications made by the Eclipse Transformer with the
originals -->
+ <jars>
+
<jakarta.faces-3.0.0.jar>org.glassfish:jakarta.faces:jar:3.0.0</jakarta.faces-3.0.0.jar>
+
<eclipselink-3.0.0.jar>org.eclipse.persistence:eclipselink:jar:3.0.0</eclipselink-3.0.0.jar>
+ </jars>
+ <resources>
+
<openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
+ </resources>
+ </replace>
</configuration>
<executions>
<execution>
