You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/09/30 17:30:56 UTC
[jspwiki] 05/16: switch to servlet 3.1 - jsp 2.3 - updating
portable build (III): update pom.xml and tomcat-launcher's assembly build
to include needed tomcat 8.5 libraries
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit af8ddc011ca4ae8e35208a8f2970880c988cd3e2
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Sep 30 01:51:46 2018 +0200
switch to servlet 3.1 - jsp 2.3 - updating portable build (III): update pom.xml and tomcat-launcher's assembly build to include needed tomcat 8.5 libraries
---
jspwiki-portable/pom.xml | 20 +++++++++++++-------
.../src/main/assembly/tomcat-launcher.xml | 3 ++-
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/jspwiki-portable/pom.xml b/jspwiki-portable/pom.xml
index a92570e..4194496 100644
--- a/jspwiki-portable/pom.xml
+++ b/jspwiki-portable/pom.xml
@@ -31,7 +31,6 @@
<properties>
<jspwiki.woas.language>en</jspwiki.woas.language>
- <tomcat.version>7.0.90</tomcat.version>
</properties>
<build>
@@ -57,6 +56,11 @@
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.catalina.startup.Bootstrap</mainClass>
+ </manifest>
+ </archive>
<descriptors>
<descriptor>${basedir}/src/main/assembly/tomcat-launcher.xml</descriptor>
</descriptors>
@@ -99,6 +103,7 @@
<configuration>
<target>
<property name="jspwiki.woas.version" value="${project.version}" />
+ <property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:info" />
<ant antfile="${basedir}/build.xml" target="woas:copy-woas" />
</target>
@@ -108,12 +113,13 @@
</goals>
</execution>
<execution>
- <id>woas:copy-tomcat-7</id>
+ <id>woas:copy-tomcat</id>
<phase>prepare-package</phase>
<configuration>
<target>
<property name="jspwiki.woas.version" value="${project.version}" />
- <ant antfile="${basedir}/build.xml" target="woas:copy-tomcat-7" />
+ <property name="jspwiki.tomcat.version" value="${tomcat.version}" />
+ <ant antfile="${basedir}/build.xml" target="woas:copy-tomcat" />
</target>
</configuration>
<goals>
@@ -126,8 +132,9 @@
<configuration>
<target>
<property name="jspwiki.woas.version" value="${project.version}" />
+ <property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:info" />
- <ant antfile="${basedir}/build.xml" target="woas:copy-tomcat-7-launchers" />
+ <ant antfile="${basedir}/build.xml" target="woas:copy-tomcat-launchers" />
</target>
</configuration>
<goals>
@@ -226,10 +233,9 @@
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
<version>${tomcat.version}</version>
</dependency>
</dependencies>
diff --git a/jspwiki-portable/src/main/assembly/tomcat-launcher.xml b/jspwiki-portable/src/main/assembly/tomcat-launcher.xml
index 392c1f0..42d462c 100755
--- a/jspwiki-portable/src/main/assembly/tomcat-launcher.xml
+++ b/jspwiki-portable/src/main/assembly/tomcat-launcher.xml
@@ -24,11 +24,12 @@
<format>jar</format>
</formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
<dependencySets>
<dependencySet>
<unpack>true</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file