mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-21 02:55:27 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Redirect to https://zxing.org directly, and touch up a build warning

Browse source
This commit is contained in:
Sean Owen 2016-06-20 09:13:21 +01:00
parent cf59354cde
commit 5927f6ef09
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/pom.xml
View file

@ -49,6 +49,7 @@
<plugin> <plugin>
<groupId>com.github.wvengen</groupId> <groupId>com.github.wvengen</groupId>
<artifactId>proguard-maven-plugin</artifactId> <artifactId>proguard-maven-plugin</artifactId>
<version>${proguard.plugin.version}</version>
<configuration> <configuration>
<options combine.children="append"> <options combine.children="append">
<option>-optimizations !code/simplification/cast,!code/allocation/variable,!field/*,!class/*,!method/*</option> <option>-optimizations !code/simplification/cast,!code/allocation/variable,!field/*,!class/*,!method/*</option>

3
pom.xml
View file

@ -96,6 +96,7 @@
<java.version>1.7</java.version> <java.version>1.7</java.version>
<maven.version.min>3.2.1</maven.version.min> <maven.version.min>3.2.1</maven.version.min>
<proguard.version>5.2.1</proguard.version> <proguard.version>5.2.1</proguard.version>
<proguard.plugin.version>2.0.13</proguard.plugin.version>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.21</slf4j.version>
<!-- This can't reference project.version as some subprojects version differently --> <!-- This can't reference project.version as some subprojects version differently -->
<zxing.version>3.2.2-SNAPSHOT</zxing.version> <zxing.version>3.2.2-SNAPSHOT</zxing.version>
@ -389,7 +390,7 @@
<plugin> <plugin>
<groupId>com.github.wvengen</groupId> <groupId>com.github.wvengen</groupId>
<artifactId>proguard-maven-plugin</artifactId> <artifactId>proguard-maven-plugin</artifactId>
<version>2.0.13</version> <version>${proguard.plugin.version}</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>

3
zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java
View file

@ -279,8 +279,7 @@ public final class DecodeServlet extends HttpServlet {
log.info("File upload was not multipart"); log.info("File upload was not multipart");
errorResponse(request, response, "badimage"); errorResponse(request, response, "badimage");
} else { } else {
log.info("Decoding uploaded file " + fileUploadPart.getName() + " " + log.info("Decoding uploaded file " + fileUploadPart.getSubmittedFileName());
fileUploadPart.getSubmittedFileName());
try (InputStream is = fileUploadPart.getInputStream()) { try (InputStream is = fileUploadPart.getInputStream()) {
processStream(is, request, response); processStream(is, request, response);
} }

2
zxingorg/src/main/java/com/google/zxing/web/RedirectFilter.java
View file

@ -62,7 +62,7 @@ public final class RedirectFilter implements Filter {
redirect(servletResponse, "/w/decode.jspx"); redirect(servletResponse, "/w/decode.jspx");
} else if (requestURI.startsWith(OLD_JAVADOC_PREFIX)) { } else if (requestURI.startsWith(OLD_JAVADOC_PREFIX)) {
String withoutPrefix = requestURI.substring(OLD_JAVADOC_PREFIX.length()); String withoutPrefix = requestURI.substring(OLD_JAVADOC_PREFIX.length());
redirect(servletResponse, "http://zxing.github.io/zxing/apidocs" + withoutPrefix); redirect(servletResponse, "https://zxing.github.io/zxing/apidocs" + withoutPrefix);
} else { } else {
filterChain.doFilter(servletRequest, servletResponse); filterChain.doFilter(servletRequest, servletResponse);
} }