Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVioleta Georgieva2018-11-18 16:44:25 +0000
committerVioleta Georgieva2018-11-18 17:04:45 +0000
commit46eb695e64b7ef5213a1cefcc95052b11befa621 (patch)
treec18c513b71686c4ec05bb14e880211aacbeccece /build-web-container
parent78999abf6d74cf6bf5cb1223b0d7f538de920100 (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-46eb695e64b7ef5213a1cefcc95052b11befa621.tar.gz
org.eclipse.gemini.web.gemini-web-container-46eb695e64b7ef5213a1cefcc95052b11befa621.tar.xz
org.eclipse.gemini.web.gemini-web-container-46eb695e64b7ef5213a1cefcc95052b11befa621.zip
Bug 536916: Update Apache Tomcat to version 8.5.35
Signed-off-by: Violeta Georgieva <vgeorgieva@pivotal.io>
Diffstat (limited to 'build-web-container')
-rwxr-xr-xbuild-web-container/copyJavaxToOsgi.sh10
-rwxr-xr-xbuild-web-container/copyToOsgi.sh24
-rw-r--r--build-web-container/resources/About.html4
3 files changed, 19 insertions, 19 deletions
diff --git a/build-web-container/copyJavaxToOsgi.sh b/build-web-container/copyJavaxToOsgi.sh
index 911bd45..3b25e69 100755
--- a/build-web-container/copyJavaxToOsgi.sh
+++ b/build-web-container/copyJavaxToOsgi.sh
@@ -4,13 +4,13 @@ SRC=target/bundles
cp $SRC/com.springsource.javax.activation-1.1.0.jar $REPO/com.springsource.javax.activation/com.springsource.javax.activation-1.1.0.jar
cp $SRC/javax.annotation-1.2.0.v201401042248.jar $REPO/javax.annotation/javax.annotation-1.2.0.v201401042248.jar
cp $SRC/javax.ejb-3.1.1.v201204261316.jar $REPO/javax.ejb/javax.ejb-3.1.1.v201204261316.jar
-cp $SRC/javax.el-3.0.0.20180121.jar $REPO/javax.el/javax.el-3.0.0.jar
+cp $SRC/javax.el-3.0.0.20180730.jar $REPO/javax.el/javax.el-3.0.0.jar
cp $SRC/javax.mail-1.4.0.v201005080615.jar $REPO/javax.mail/javax.mail-1.4.0.v201005080615.jar
cp $SRC/javax.persistence-2.1.0.v201304241213.jar $REPO/javax.persistence/javax.persistence-2.1.0.v201304241213.jar
-cp $SRC/javax.security.auth.message-1.1.0.20180121.jar $REPO/javax.security.auth.message/javax.security.auth.message-1.1.0.jar
-cp $SRC/javax.servlet-3.1.0.20180121.jar $REPO/javax.servlet/javax.servlet-3.1.0.jar
-cp $SRC/javax.servlet.jsp-2.3.0.20180121.jar $REPO/javax.servlet.jsp/javax.servlet.jsp-2.3.0.jar
+cp $SRC/javax.security.auth.message-1.1.0.20180730.jar $REPO/javax.security.auth.message/javax.security.auth.message-1.1.0.jar
+cp $SRC/javax.servlet-3.1.0.20180730.jar $REPO/javax.servlet/javax.servlet-3.1.0.jar
+cp $SRC/javax.servlet.jsp-2.3.0.20180730.jar $REPO/javax.servlet.jsp/javax.servlet.jsp-2.3.0.jar
cp $SRC/javax.transaction-1.1.0.v201205091237.jar $REPO/javax.transaction/javax.transaction-1.1.0.v201205091237.jar
cp $SRC/javax.xml.rpc-1.1.0.v201005080400.jar $REPO/javax.xml.rpc/javax.xml.rpc-1.1.0.v201005080400.jar
cp $SRC/javax.xml.soap-1.3.0.v201105210645.jar $REPO/javax.xml.soap/javax.xml.soap-1.3.0.v201105210645.jar
-cp $SRC/javax.websocket_1.1.0.20180121.jar $REPO/javax.websocket/javax.websocket_1.1.0.jar
+cp $SRC/javax.websocket_1.1.0.20180730.jar $REPO/javax.websocket/javax.websocket_1.1.0.jar
diff --git a/build-web-container/copyToOsgi.sh b/build-web-container/copyToOsgi.sh
index a793061..0074254 100755
--- a/build-web-container/copyToOsgi.sh
+++ b/build-web-container/copyToOsgi.sh
@@ -7,18 +7,18 @@ cp $SRC/org.eclipse.virgo.util.common-3.6.3.*.jar $REPO/org.eclipse.virgo.util.c
cp $SRC/org.eclipse.virgo.util.io-3.6.3.*.jar $REPO/org.eclipse.virgo.util.io/org.eclipse.virgo.util.io-3.6.3.jar
cp $SRC/org.eclipse.virgo.util.math-3.6.3.*.jar $REPO/org.eclipse.virgo.util.math/org.eclipse.virgo.util.math-3.6.3.jar
cp $SRC/org.eclipse.virgo.util.parser.manifest-3.6.3.*.jar $REPO/org.eclipse.virgo.util.parser.manifest/org.eclipse.virgo.util.parser.manifest-3.6.3.jar
-cp $SRC/org.apache.catalina.ha-8.5.24.jar $REPO/org.apache.catalina.ha/org.apache.catalina.ha-8.5.24.jar
-cp $SRC/org.apache.catalina-8.5.24.jar $REPO/org.apache.catalina/org.apache.catalina-8.5.24.jar
-cp $SRC/org.apache.catalina.tribes-8.5.24.jar $REPO/org.apache.catalina.tribes/org.apache.catalina.tribes-8.5.24.jar
-cp $SRC/org.apache.coyote-8.5.24.jar $REPO/org.apache.coyote/org.apache.coyote-8.5.24.jar
-cp $SRC/org.apache.el-8.5.24.jar $REPO/org.apache.el/org.apache.el-8.5.24.jar
-cp $SRC/org.apache.jasper-8.5.24.jar $REPO/org.apache.jasper/org.apache.jasper-8.5.24.jar
-cp $SRC/org.apache.juli.extras-8.5.24.jar $REPO/org.apache.juli.extras/org.apache.juli.extras-8.5.24.jar
-cp $SRC/org.apache.tomcat.api-8.5.24.jar $REPO/org.apache.tomcat.api/org.apache.tomcat.api-8.5.24.jar
-cp $SRC/org.apache.tomcat.jni-8.5.24.jar $REPO/org.apache.tomcat.jni/org.apache.tomcat.jni-8.5.24.jar
-cp $SRC/org.apache.tomcat.util-8.5.24.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-8.5.24.jar
-cp $SRC/org.apache.tomcat.util.scan-8.5.24.jar $REPO/org.apache.tomcat.util.scan/org.apache.tomcat.util.scan-8.5.24.jar
-cp $SRC/org.apache.tomcat.websocket-8.5.24.jar $REPO/org.apache.tomcat.websocket/org.apache.tomcat.websocket-8.5.24.jar
+cp $SRC/org.apache.catalina.ha-8.5.35.jar $REPO/org.apache.catalina.ha/org.apache.catalina.ha-8.5.35.jar
+cp $SRC/org.apache.catalina-8.5.35.jar $REPO/org.apache.catalina/org.apache.catalina-8.5.35.jar
+cp $SRC/org.apache.catalina.tribes-8.5.35.jar $REPO/org.apache.catalina.tribes/org.apache.catalina.tribes-8.5.35.jar
+cp $SRC/org.apache.coyote-8.5.35.jar $REPO/org.apache.coyote/org.apache.coyote-8.5.35.jar
+cp $SRC/org.apache.el-8.5.35.jar $REPO/org.apache.el/org.apache.el-8.5.35.jar
+cp $SRC/org.apache.jasper-8.5.35.jar $REPO/org.apache.jasper/org.apache.jasper-8.5.35.jar
+cp $SRC/org.apache.juli.extras-8.5.35.jar $REPO/org.apache.juli.extras/org.apache.juli.extras-8.5.35.jar
+cp $SRC/org.apache.tomcat.api-8.5.35.jar $REPO/org.apache.tomcat.api/org.apache.tomcat.api-8.5.35.jar
+cp $SRC/org.apache.tomcat.jni-8.5.35.jar $REPO/org.apache.tomcat.jni/org.apache.tomcat.jni-8.5.35.jar
+cp $SRC/org.apache.tomcat.util-8.5.35.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-8.5.35.jar
+cp $SRC/org.apache.tomcat.util.scan-8.5.35.jar $REPO/org.apache.tomcat.util.scan/org.apache.tomcat.util.scan-8.5.35.jar
+cp $SRC/org.apache.tomcat.websocket-8.5.35.jar $REPO/org.apache.tomcat.websocket/org.apache.tomcat.websocket-8.5.35.jar
cp $SRC/org.eclipse.gemini.web.core-3.0.0.*.jar $REPO/org.eclipse.gemini.web.core/org.eclipse.gemini.web.core-3.0.0.jar
cp $SRC/org.eclipse.gemini.web.extender-3.0.0.*.jar $REPO/org.eclipse.gemini.web.extender/org.eclipse.gemini.web.extender-3.0.0.jar
cp $SRC/org.eclipse.gemini.web.tomcat-3.0.0.*.jar $REPO/org.eclipse.gemini.web.tomcat/org.eclipse.gemini.web.tomcat-3.0.0.jar
diff --git a/build-web-container/resources/About.html b/build-web-container/resources/About.html
index 6369600..7cc1b3c 100644
--- a/build-web-container/resources/About.html
+++ b/build-web-container/resources/About.html
@@ -9,7 +9,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 28, 2017</p>
+<p>November 18, 2017</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
@@ -45,7 +45,7 @@ and such source code may be obtained at <a href="http://www.eclipse.org/">http:/
This product contains software developed by the Apache Software Foundation (<a href="http://www.apache.org">http://www.apache.org</a>).
<ul>
<li>
- Apache Tomcat 8.5.24 - binary and source is available from the
+ Apache Tomcat 8.5.35 - binary and source is available from the
<a href="http://tomcat.apache.org/">Apache Tomcat project</a>
</li>
</ul>

Back to the top