From c2ea05cf09ec0b62f07216cb77c6755f40aa9451 Mon Sep 17 00:00:00 2001 From: Bjorn Svensson Date: Thu, 5 Nov 2015 18:37:26 -0800 Subject: [PATCH 1/2] Update version number to 1.1.0 for release --- CHANGELOG.md | 2 ++ DotNet/proxy.ashx | 4 ++-- Java/proxy.jsp | 4 ++-- PHP/proxy.php | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2c6fc72..e9da3027 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [1.1.0] +## [1.1.0] - 2015-11-05 + ### Added - Support for 10.3 tokens - Support for federated services diff --git a/DotNet/proxy.ashx b/DotNet/proxy.ashx index 27b2dd09..14be3d38 100644 --- a/DotNet/proxy.ashx +++ b/DotNet/proxy.ashx @@ -3,7 +3,7 @@ /* * DotNet proxy client. * - * Version 1.1.0-beta + * Version 1.1.0 * See https://github.com/Esri/resource-proxy for more information. * */ @@ -20,7 +20,7 @@ using System.Text.RegularExpressions; public class proxy : IHttpHandler { - private static String version = "1.1.0-beta"; + private static String version = "1.1.0"; class RateMeter { double _rate; //internal rate is stored in requests per second diff --git a/Java/proxy.jsp b/Java/proxy.jsp index e1cdddea..ad590d28 100644 --- a/Java/proxy.jsp +++ b/Java/proxy.jsp @@ -35,12 +35,12 @@ java.text.SimpleDateFormat" %> * * JSP proxy client * -* Version 1.1.0-beta +* Version 1.1.0 * See https://github.com/Esri/resource-proxy for more information. * ----------------------------------------------------------- --> -<%! final String version = "1.1.0-beta"; %> +<%! final String version = "1.1.0"; %> <%! public static final class DataValidUtil { diff --git a/PHP/proxy.php b/PHP/proxy.php index a34bc5f0..ffb0f33a 100644 --- a/PHP/proxy.php +++ b/PHP/proxy.php @@ -3,12 +3,12 @@ /** * PHP Proxy Client * - * Version 1.1.0-beta + * Version 1.1.0 * See https://github.com/Esri/resource-proxy for more information. * */ -$version = "1.1.0-beta"; +$version = "1.1.0"; error_reporting(0); From 51e89e80292a0a3562c25cb680ac641aca0997b9 Mon Sep 17 00:00:00 2001 From: jgravois Date: Thu, 5 Nov 2015 20:31:36 -0800 Subject: [PATCH 2/2] bump changelog --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9da3027..718a0447 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,6 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [1.1.0] - ## [1.1.0] - 2015-11-05 ### Added