You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/03/14 12:09:54 UTC
svn commit: r1734920 - in /ofbiz/branches/release15.12: ./ .classpath LICENSE
Author: jleroux
Date: Mon Mar 14 11:09:54 2016
New Revision: 1734920
URL: http://svn.apache.org/viewvc?rev=1734920&view=rev
Log:
"Applied fix from trunk for revision: 1734918"
------------------------------------------------------------------------
r1734918 | jleroux | 2016-03-14 12:09:02 +0100 (lun. 14 mars 2016) | 5 lignes
Fixes "Update Tomcat to 7.0.68" - https://issues.apache.org/jira/browse/OFBIZ-6913
As ever forgot .classpath and LICENSE files, here they are.
I decided to no longer move the new entries in.classpath which are not automatically alphabetically ordered by Eclipse. Since we should now use the given tool no need for that.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/.classpath
ofbiz/branches/release15.12/LICENSE
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 11:09:54 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918
Modified: ofbiz/branches/release15.12/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/.classpath?rev=1734920&r1=1734919&r2=1734920&view=diff
==============================================================================
--- ofbiz/branches/release15.12/.classpath (original)
+++ ofbiz/branches/release15.12/.classpath Mon Mar 14 11:09:54 2016
@@ -93,15 +93,6 @@
<classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/>
<classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/ecj-4.4.2.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-catalina.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-catalina-ha.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-catalina-tribes.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-jasper.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-tomcat-api.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-tomcat-coyote.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.65-tomcat-util.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.65-tomcat-juli.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.65-tomcat-juli-adapters.jar"/>
<classpathentry kind="lib" path="framework/entity/lib/commons-dbcp2-2.1.jar"/>
<classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/>
<classpathentry kind="lib" path="framework/service/lib/axiom-api-1.2.17.jar"/>
@@ -113,7 +104,7 @@
<classpathentry kind="lib" path="framework/service/lib/neethi-3.0.3.jar"/>
<classpathentry kind="lib" path="framework/service/lib/woden-core-1.0M10.jar"/>
<classpathentry kind="lib" path="framework/service/lib/wsdl4j-1.6.2.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/xmlschema-core-2.2.1.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/xmlschema-core-2.2.1.jar"/>
<classpathentry kind="lib" path="framework/testtools/lib/spring-core-4.2.3.jar"/>
<classpathentry kind="lib" path="framework/testtools/lib/spring-test-4.2.3.jar"/>
<classpathentry kind="lib" path="framework/webapp/lib/ezmorph-0.9.1.jar"/>
@@ -202,5 +193,14 @@
<classpathentry kind="lib" path="specialpurpose/solr/lib/runtime/org.restlet-2.3.0.jar"/>
<classpathentry kind="lib" path="specialpurpose/solr/lib/runtime/org.restlet.ext.servlet-2.3.0.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.68-catalina-ha.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.68-catalina-tribes.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.68-catalina.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.68-jasper.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.68-tomcat-api.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.68-tomcat-coyote.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.68-tomcat-util.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli-adapters.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ofbiz/branches/release15.12/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/LICENSE?rev=1734920&r1=1734919&r2=1734920&view=diff
==============================================================================
--- ofbiz/branches/release15.12/LICENSE (original)
+++ ofbiz/branches/release15.12/LICENSE Mon Mar 14 11:09:54 2016
@@ -78,15 +78,15 @@ framework/base/lib/scripting/jansi-1.2.1
framework/base/lib/xmlrpc-client-3.1.2.jar
framework/base/lib/xmlrpc-common-3.1.2.jar
framework/base/lib/xmlrpc-server-3.1.2.jar
-framework/catalina/lib/tomcat-7.0.65-catalina-ha.jar
-framework/catalina/lib/tomcat-7.0.65-catalina-tribes.jar
-framework/catalina/lib/tomcat-7.0.65-catalina.jar
-framework/catalina/lib/tomcat-7.0.65-jasper.jar
-framework/catalina/lib/tomcat-7.0.65-tomcat-api.jar
-framework/catalina/lib/tomcat-7.0.65-tomcat-coyote.jar
-framework/catalina/lib/tomcat-7.0.65-tomcat-util.jar
-framework/catalina/lib/tomcat-extras-7.0.65-tomcat-juli.jar
-framework/catalina/lib/tomcat-extras-7.0.65-tomcat-juli-adapters.jar
+framework/catalina/lib/tomcat-7.0.68-catalina-ha.jar
+framework/catalina/lib/tomcat-7.0.68-catalina-tribes.jar
+framework/catalina/lib/tomcat-7.0.68-catalina.jar
+framework/catalina/lib/tomcat-7.0.68-jasper.jar
+framework/catalina/lib/tomcat-7.0.68-tomcat-api.jar
+framework/catalina/lib/tomcat-7.0.68-tomcat-coyote.jar
+framework/catalina/lib/tomcat-7.0.68-tomcat-util.jar
+framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli.jar
+framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli-adapters.jar
framework/entity/lib/commons-dbcp2-2.1.jar
framework/entity/lib/jdbc/derby-10.11.1.1.jar
framework/geronimo/lib/geronimo-transaction-3.1.1.jar