Author: jleroux
Date: Tue Feb 16 19:27:33 2016
New Revision: 1730738
URL:
http://svn.apache.org/viewvc?rev=1730738&view=revLog:
"Applied fix from trunk for revision: 1730736"
------------------------------------------------------------------------
r1730736 | jleroux | 2016-02-16 20:25:19 +0100 (mar. 16 févr. 2016) | 1 ligne
Because I had changes pending for "Use only HTTPS in OFBiz" - OFBIZ-6849, I forgot to commit changes done for the start*-secure ant targets and notsoserial in the main build.xml files in previous commit (r1730735)
------------------------------------------------------------------------
Added:
ofbiz/branches/release15.12/tools/security/dependency-check/
- copied from r1730735, ofbiz/trunk/tools/security/dependency-check/
ofbiz/branches/release15.12/tools/security/notsoserial/
- copied from r1730735, ofbiz/trunk/tools/security/notsoserial/
Removed:
ofbiz/branches/release15.12/tools/security/LICENSE.txt
ofbiz/branches/release15.12/tools/security/NOTICE.txt
ofbiz/branches/release15.12/tools/security/README
ofbiz/branches/release15.12/tools/security/README.md
ofbiz/branches/release15.12/tools/security/dependency-check-report.html
ofbiz/branches/release15.12/tools/security/suppress.xml
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/LICENSE
ofbiz/branches/release15.12/NOTICE
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 16 19:27:33 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
+/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
Modified: ofbiz/branches/release15.12/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/LICENSE?rev=1730738&r1=1730737&r2=1730738&view=diff==============================================================================
--- ofbiz/branches/release15.12/LICENSE (original)
+++ ofbiz/branches/release15.12/LICENSE Tue Feb 16 19:27:33 2016
@@ -116,6 +116,7 @@ applications/product/lib/dozer-4.2.1.jar
applications/product/lib/watermarker-0.0.4.jar
framework/images/webapp/images/date/timezones*
framework/resources/fonts/NotoSans/*
+tools/security/notsoserial/notsoserial-1.0-SNAPSHOT.jar
=========================================================================
Apache License
Version 2.0, January 2004
Modified: ofbiz/branches/release15.12/NOTICE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/NOTICE?rev=1730738&r1=1730737&r2=1730738&view=diff==============================================================================
--- ofbiz/branches/release15.12/NOTICE (original)
+++ ofbiz/branches/release15.12/NOTICE Tue Feb 16 19:27:33 2016
@@ -285,3 +285,11 @@ Under the following conditions:
* Notice â For any reuse or distribution, you must make clear to others
the license terms of this work. The best way to do this is with a link to
this web page.
+=========================================================================
+== notsoserial Notice ==
+=========================================================================
+
+NotSoSerial
+Copyright 2015 Kantega AS
+
+This product includes the software from the ASM project developed at France Télécom:
http://asm.objectweb.org
Locked
