mirror of
https://github.com/zxing/zxing.git
synced 2024-11-13 14:34:08 -08:00
Update jai-imageio license; remove unneeded gwt-servlet dep; update clirr
This commit is contained in:
parent
6f0deeeda3
commit
6d61977c2e
|
@ -199,3 +199,47 @@
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
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.
|
2
pom.xml
2
pom.xml
|
@ -488,7 +488,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>clirr-maven-plugin</artifactId>
|
<artifactId>clirr-maven-plugin</artifactId>
|
||||||
<version>2.6.1</version>
|
<version>2.7</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>check-api</id>
|
<id>check-api</id>
|
||||||
|
|
|
@ -22,12 +22,6 @@
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.gwt</groupId>
|
|
||||||
<artifactId>gwt-servlet</artifactId>
|
|
||||||
<version>${gwt.version}</version>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.gwt</groupId>
|
<groupId>com.google.gwt</groupId>
|
||||||
<artifactId>gwt-user</artifactId>
|
<artifactId>gwt-user</artifactId>
|
||||||
|
|
|
@ -16,5 +16,5 @@
|
||||||
-->
|
-->
|
||||||
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
|
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
|
||||||
<application>zxing-hrd</application>
|
<application>zxing-hrd</application>
|
||||||
<version>12</version>
|
<version>13</version>
|
||||||
</appengine-web-app>
|
</appengine-web-app>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
application: zxing-hrd
|
application: zxing-hrd
|
||||||
version: 12
|
version: 13
|
||||||
runtime: python27
|
runtime: python27
|
||||||
api_version: 1
|
api_version: 1
|
||||||
threadsafe: true
|
threadsafe: true
|
||||||
|
|
|
@ -61,7 +61,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-maven-plugin</artifactId>
|
<artifactId>jetty-maven-plugin</artifactId>
|
||||||
<version>9.3.2.v20150730</version>
|
<version>9.3.4.RC0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<webAppSourceDirectory>src/web</webAppSourceDirectory>
|
<webAppSourceDirectory>src/web</webAppSourceDirectory>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
Loading…
Reference in a new issue