diff --git a/ccm-lcs-bundle/bundles/devel/cfg/project.xml b/ccm-lcs-bundle/bundles/devel/cfg/project.xml index dafdce408..9199cc229 100644 --- a/ccm-lcs-bundle/bundles/devel/cfg/project.xml +++ b/ccm-lcs-bundle/bundles/devel/cfg/project.xml @@ -1,7 +1,11 @@ - + diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml index f7b2439db..fe3342f9e 100755 --- a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml +++ b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml @@ -10,10 +10,10 @@ diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml index cc82fdbdd..42408e8e7 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/project.xml +++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml @@ -13,7 +13,7 @@ name="scientificcms-dev" prettyName="Scientific CMS" version="2.3.99" - release="SNAPSHOT-r5629" + release="SNAPSHOT-r5758" webxml="sci-web.xml" portletxml="sci-portlet.xml" webapp="ROOT" diff --git a/tools-ng/ecdc/bundles/apache-tomcat-6.0.39.zip b/tools-ng/ecdc/bundles/apache-tomcat-6.0.39.zip deleted file mode 100644 index c9ab499f1..000000000 Binary files a/tools-ng/ecdc/bundles/apache-tomcat-6.0.39.zip and /dev/null differ diff --git a/tools-ng/ecdc/bundles/apache-tomcat-7.0.53.zip b/tools-ng/ecdc/bundles/apache-tomcat-7.0.92.zip similarity index 55% rename from tools-ng/ecdc/bundles/apache-tomcat-7.0.53.zip rename to tools-ng/ecdc/bundles/apache-tomcat-7.0.92.zip index 428ac30c4..529aad69e 100644 Binary files a/tools-ng/ecdc/bundles/apache-tomcat-7.0.53.zip and b/tools-ng/ecdc/bundles/apache-tomcat-7.0.92.zip differ diff --git a/tools-ng/ecdc/bundles/apache-tomcat-8.5.35.zip b/tools-ng/ecdc/bundles/apache-tomcat-8.5.35.zip new file mode 100644 index 000000000..7d6b82cfb Binary files /dev/null and b/tools-ng/ecdc/bundles/apache-tomcat-8.5.35.zip differ diff --git a/tools-ng/ecdc/conf/runtime.properties b/tools-ng/ecdc/conf/runtime.properties index 65c59a5d2..89b1d5859 100644 --- a/tools-ng/ecdc/conf/runtime.properties +++ b/tools-ng/ecdc/conf/runtime.properties @@ -20,7 +20,7 @@ app.server.vendor=apache app.server.type=tomcat - app.server.version=6.0.39 + app.server.version=7.0.92 app.server.bundles.name=${app.server.vendor}-${app.server.type}-${app.server.version} diff --git a/tools-ng/ecdc/local.runtime.properties b/tools-ng/ecdc/local.runtime.properties index a88b8f813..f38c6d9e0 100644 --- a/tools-ng/ecdc/local.runtime.properties +++ b/tools-ng/ecdc/local.runtime.properties @@ -10,15 +10,15 @@ #app.server.vendor=apache #app.server.type=tomcat - #app.server.version=6.0.39 #app.server.version=6.0.53 + #app.server.version=6.0.78 - # app.server.version=7.0.53 - # app.server.version=7.0.78 + # app.server.version=7.0.92 # app.server.version=8.0.44 - app.server.version=8.5.15 + # app.server.version=8.5.15 + app.server.version=8.5.35 ## Alternative available server