From 6d61977c2efd578f67830305791e5a0a06c263e2 Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Fri, 25 Sep 2015 11:25:51 +0100
Subject: [PATCH] Update jai-imageio license; remove unneeded gwt-servlet dep;
 update clirr

---
 COPYING => LICENSE                            | 44 +++++++++++++++++++
 pom.xml                                       |  2 +-
 zxing.appspot.com/pom.xml                     |  6 ---
 .../src/main/webapp/WEB-INF/appengine-web.xml |  2 +-
 zxing.appspot.com/src/main/webapp/app.yaml    |  2 +-
 zxingorg/pom.xml                              |  2 +-
 6 files changed, 48 insertions(+), 10 deletions(-)
 rename COPYING => LICENSE (85%)

diff --git a/COPYING b/LICENSE
similarity index 85%
rename from COPYING
rename to LICENSE
index 261eeb9e9..510991eda 100644
--- a/COPYING
+++ b/LICENSE
@@ -199,3 +199,47 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+========================================================================
+jai-imageio
+========================================================================
+
+Copyright (c) 2005 Sun Microsystems, Inc.
+Copyright © 2010-2014 University of Manchester
+Copyright © 2010-2015 Stian Soiland-Reyes
+Copyright © 2015 Peter Hull
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistribution of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+- Redistribution in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in
+  the documentation and/or other materials provided with the
+  distribution.
+
+Neither the name of Sun Microsystems, Inc. or the names of
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
+
+This software is provided "AS IS," without a warranty of any
+kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
+WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
+EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
+NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
+USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
+DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
+ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
+CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
+REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
+INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+You acknowledge that this software is not designed or intended for
+use in the design, construction, operation or maintenance of any
+nuclear facility.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ec5f518f4..6718acf7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -488,7 +488,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>clirr-maven-plugin</artifactId>
-          <version>2.6.1</version>
+          <version>2.7</version>
           <executions>
             <execution>
               <id>check-api</id>
diff --git a/zxing.appspot.com/pom.xml b/zxing.appspot.com/pom.xml
index 1e37f403e..93220a261 100644
--- a/zxing.appspot.com/pom.xml
+++ b/zxing.appspot.com/pom.xml
@@ -22,12 +22,6 @@
   <packaging>war</packaging>
 
   <dependencies>
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-servlet</artifactId>
-      <version>${gwt.version}</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.gwt</groupId>
       <artifactId>gwt-user</artifactId>
diff --git a/zxing.appspot.com/src/main/webapp/WEB-INF/appengine-web.xml b/zxing.appspot.com/src/main/webapp/WEB-INF/appengine-web.xml
index db6a94c5f..f3ce54da0 100644
--- a/zxing.appspot.com/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/zxing.appspot.com/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,5 +16,5 @@
  -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>zxing-hrd</application>
-  <version>12</version>
+  <version>13</version>
 </appengine-web-app>
diff --git a/zxing.appspot.com/src/main/webapp/app.yaml b/zxing.appspot.com/src/main/webapp/app.yaml
index 607129621..8d95aef91 100644
--- a/zxing.appspot.com/src/main/webapp/app.yaml
+++ b/zxing.appspot.com/src/main/webapp/app.yaml
@@ -1,5 +1,5 @@
 application: zxing-hrd
-version: 12
+version: 13
 runtime: python27
 api_version: 1
 threadsafe: true
diff --git a/zxingorg/pom.xml b/zxingorg/pom.xml
index b42b778d7..5887bf704 100644
--- a/zxingorg/pom.xml
+++ b/zxingorg/pom.xml
@@ -61,7 +61,7 @@
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>9.3.2.v20150730</version>
+        <version>9.3.4.RC0</version>
         <configuration>
           <webAppSourceDirectory>src/web</webAppSourceDirectory>
         </configuration>