From 92d12940e284af72902ec4a891dd33fd1f76b7b7 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Thu, 28 Sep 2017 11:22:25 +0900
Subject: [PATCH] #1286 update tomcat to 8.5.21
---
.gitignore | 2 ++
deps.xml | 33 +++++++++++++++++++++++++++++++++
pom.xml | 23 +++++++++++------------
3 files changed, 46 insertions(+), 12 deletions(-)
create mode 100644 deps.xml
diff --git a/.gitignore b/.gitignore
index 2523ccfb8..5799e1f57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
/src/main/webapp/WEB-INF/classes/
/src/main/webapp/WEB-INF/lib/
/src/main/webapp/WEB-INF/site/
+/src/main/webapp/WEB-INF/crawler/lib/
+/src/main/webapp/WEB-INF/suggest/lib/
/src/main/webapp/WEB-INF/thumbnails/
/src/main/webapp/jar/
/dbflute_fess/log/*.log
diff --git a/deps.xml b/deps.xml
new file mode 100644
index 000000000..c25848f76
--- /dev/null
+++ b/deps.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="deos" basedir=".">
+ <property name="target.dir" value="${basedir}/target/deps" />
+ <property name="crawler.dir" value="${basedir}/src/main/webapp/WEB-INF/crawler" />
+ <property name="suggest.dir" value="${basedir}/src/main/webapp/WEB-INF/suggest" />
+
+ <!-- Maven Repository -->
+ <property name="maven.snapshot.repo.url" value="https://oss.sonatype.org/content/repositories/snapshots" />
+ <property name="maven.release.repo.url" value="http://central.maven.org/maven2" />
+
+ <target name="install.jars">
+ <mkdir dir="${target.dir}" />
+ <mkdir dir="${crawler.dir}/lib" />
+ <mkdir dir="${suggest.dir}/lib" />
+ <!-- javax.annotation-api -->
+ <antcall target="download.jar">
+ <param name="repo.url" value="${maven.release.repo.url}" />
+ <param name="jar.groupId" value="javax/annotation" />
+ <param name="jar.artifactId" value="javax.annotation-api" />
+ <param name="jar.version" value="1.3.1" />
+ </antcall>
+ </target>
+
+ <target name="download.jar">
+ <get dest="${target.dir}">
+ <url url="${repo.url}/${jar.groupId}/${jar.artifactId}/${jar.version}/${jar.artifactId}-${jar.version}.jar" />
+ </get>
+ <copy file="${target.dir}/${jar.artifactId}-${jar.version}.jar"
+ todir="${crawler.dir}/lib"/>
+ <copy file="${target.dir}/${jar.artifactId}-${jar.version}.jar"
+ todir="${suggest.dir}/lib"/>
+ </target>
+</project>
diff --git a/pom.xml b/pom.xml
index e7a670cd6..021fb4043 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,8 +71,8 @@
<cluster.runner.version>5.5.2.0</cluster.runner.version>
<!-- Tomcat -->
- <tomcat.version>8.5.20</tomcat.version>
- <tomcat.boot.version>0.5.8</tomcat.boot.version>
+ <tomcat.version>8.5.21</tomcat.version>
+ <tomcat.boot.version>0.5.9-RC1</tomcat.boot.version>
<!-- DEB & RPM build -->
<packaging.fess.home.dir>/usr/share/fess</packaging.fess.home.dir>
@@ -328,6 +328,7 @@
<ant antfile="${basedir}/plugin.xml" target="install.plugins">
<property name="with.fess" value="true" />
</ant>
+ <ant antfile="deps.xml" target="install.jars" />
</tasks>
</configuration>
<goals>
@@ -1079,7 +1080,14 @@
<version>${dbflute.version}</version>
</dependency>
- <!-- transaction -->
+ <!-- J2EE -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <!-- contains taglibs.standard -->
+ <!-- <scope>provided</scope> -->
+ </dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
@@ -1123,15 +1131,6 @@
<version>${log4j.version}</version>
</dependency>
- <!-- servlet -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <!-- contains taglibs.standard -->
- <!-- <scope>provided</scope> -->
- </dependency>
-
<!-- elasticsearch -->
<dependency>
<groupId>org.elasticsearch</groupId>
--
GitLab