Skip to content

Commit bea620d

Browse files
authored
Merge pull request apache#1 from poolborges/tc9.x
Initial support for Tomact9 - tc9.x
2 parents 2a1797d + 11aac45 commit bea620d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+11750
-2
lines changed

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@
4545
<maven.compiler.target>1.7</maven.compiler.target>
4646
<mavenVersion>2.2.1</mavenVersion>
4747

48+
4849
<mavenPluginPluginVersion>3.6.0</mavenPluginPluginVersion>
50+
4951
<!-- Test settings -->
5052
<maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
5153
<surefire.version>2.22.1</surefire.version>
@@ -55,7 +57,6 @@
5557
<it.sleep.time>2000</it.sleep.time>
5658
<verifier.maven.debug>false</verifier.maven.debug>
5759
<verifier.debugJvm>false</verifier.debugJvm>
58-
<maven.resources.escapeString>\</maven.resources.escapeString>
5960
<distributionReleaseUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distributionReleaseUrl>
6061

6162
<distributionSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distributionSnapshotsUrl>
@@ -325,6 +326,8 @@
325326
<module>tomcat8-war-runner</module>
326327
<module>tomcat8-maven-plugin</module>
327328
<module>tomcat-maven-archetype</module>
329+
<module>tomcat9-war-runner</module>
330+
<module>tomcat9-maven-plugin</module>
328331
</modules>
329332

330333
<dependencyManagement>
@@ -748,6 +751,9 @@
748751
<groupId>org.apache.maven.plugins</groupId>
749752
<artifactId>maven-resources-plugin</artifactId>
750753
<version>3.1.0</version>
754+
<configuration>
755+
<escapeString>\</escapeString>
756+
</configuration>
751757
</plugin>
752758
<plugin>
753759
<groupId>org.apache.maven.plugins</groupId>

tomcat-maven-plugin-it/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<!-- The time to wait between startup and shutdown of tomcat. Realized by a test which waits for the specified
3535
time. -->
3636
<it.sleep.time>2000</it.sleep.time>
37-
<maven.resources.escapeString>\</maven.resources.escapeString>
3837
</properties>
3938

4039
<dependencies>

0 commit comments

Comments
 (0)