From commits-return-6007-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sun Oct 2 19:24:21 2016 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 792A6198B2 for ; Sun, 2 Oct 2016 19:24:21 +0000 (UTC) Received: (qmail 10532 invoked by uid 500); 2 Oct 2016 19:24:21 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 10499 invoked by uid 500); 2 Oct 2016 19:24:21 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 10489 invoked by uid 99); 2 Oct 2016 19:24:21 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Oct 2016 19:24:21 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id CFF46C0E4B for ; Sun, 2 Oct 2016 19:24:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id pz_eCJj5PGWo for ; Sun, 2 Oct 2016 19:24:20 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id B55525F245 for ; Sun, 2 Oct 2016 19:24:19 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id E9AE5E0CBC for ; Sun, 2 Oct 2016 19:24:18 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E67333A027B for ; Sun, 2 Oct 2016 19:24:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1763097 - /jmeter/trunk/bin/templates/templates.xml Date: Sun, 02 Oct 2016 19:24:18 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161002192418.E67333A027B@svn01-us-west.apache.org> Author: pmouawad Date: Sun Oct 2 19:24:18 2016 New Revision: 1763097 URL: http://svn.apache.org/viewvc?rev=1763097&view=rev Log: XStream upgrade Workaround the security fix without losing the DTD Modified: jmeter/trunk/bin/templates/templates.xml Modified: jmeter/trunk/bin/templates/templates.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/templates/templates.xml?rev=1763097&r1=1763096&r2=1763097&view=diff ============================================================================== --- jmeter/trunk/bin/templates/templates.xml (original) +++ jmeter/trunk/bin/templates/templates.xml Sun Oct 2 19:24:18 2016 @@ -18,6 +18,7 @@ +