mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor dependency and inspection changes

Browse source
This commit is contained in:
Sean Owen 2018-10-25 07:43:26 -05:00
parent 71f5773d8e
commit 1f4aaad628
3 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -1,8 +1,8 @@
language: java language: java
sudo: false sudo: false
install: mvn -Ptravis -DskipTests=true -B -V install install: mvn -Ptravis -DskipTests=true -nsu -B install
script: script:
- mvn -Ptravis ${JACOCO} test - mvn -Ptravis ${JACOCO} -nsu -B test
- find $HOME/.m2/repository/com/google/zxing -path "*SNAPSHOT/*" -delete - find $HOME/.m2/repository/com/google/zxing -path "*SNAPSHOT/*" -delete
- find $HOME/.m2/repository/com/google/zxing -name "*SNAPSHOT" -type d -delete - find $HOME/.m2/repository/com/google/zxing -name "*SNAPSHOT" -type d -delete
matrix: matrix:
@ -10,8 +10,8 @@ matrix:
# Covers Java 7, Open JDK, and code coverage # Covers Java 7, Open JDK, and code coverage
- jdk: openjdk7 - jdk: openjdk7
env: JACOCO=-Pjacoco env: JACOCO=-Pjacoco
# Covers Java 8, Oracle JDK, Android apps # Covers Java 8, Android apps
- jdk: oraclejdk8 - jdk: openjdk8
env: ANDROID_HOME=$HOME/android-sdk-linux env: ANDROID_HOME=$HOME/android-sdk-linux
before_install: if [ ! -d $HOME/android-sdk-linux/platforms ]; then curl -s https://storage.googleapis.com/zxing-build/android-sdk-linux.tar.bz2 | bunzip2 | tar xf - -C $HOME; else ls -l $HOME/android-sdk-linux; fi before_install: if [ ! -d $HOME/android-sdk-linux/platforms ]; then curl -s https://storage.googleapis.com/zxing-build/android-sdk-linux.tar.bz2 | bunzip2 | tar xf - -C $HOME; else ls -l $HOME/android-sdk-linux; fi
# Covers Java 9 # Covers Java 9

1
core/src/main/java/com/google/zxing/pdf417/decoder/DecodedBitStreamParser.java
View file

@ -164,6 +164,7 @@ final class DecodedBitStreamParser {
return decoderResult; return decoderResult;
} }
@SuppressWarnings("deprecation")
static int decodeMacroBlock(int[] codewords, int codeIndex, PDF417ResultMetadata resultMetadata) static int decodeMacroBlock(int[] codewords, int codeIndex, PDF417ResultMetadata resultMetadata)
throws FormatException { throws FormatException {
if (codeIndex + NUMBER_OF_SEQUENCE_CODEWORDS > codewords[0]) { if (codeIndex + NUMBER_OF_SEQUENCE_CODEWORDS > codewords[0]) {

40
pom.xml
View file

@ -127,15 +127,13 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<!-- 3.0.0-M2 has a regression re: plugin versions --> <version>3.0.0-M2</version>
<version>3.0.0-M1</version>
<executions> <executions>
<execution> <execution>
<id>enforce</id> <id>enforce</id>
<configuration> <configuration>
<rules> <rules>
<requireModuleConvergence /> <requireModuleConvergence />
<requirePluginVersions />
<requireUpperBoundDeps /> <requireUpperBoundDeps />
<dependencyConvergence /> <dependencyConvergence />
<requireMavenVersion> <requireMavenVersion>
@ -197,14 +195,6 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
<dependencies>
<!-- For Java 10 compatibility until javadoc-plugin updates this after 3.0.0 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8</version>
</dependency>
</dependencies>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -227,7 +217,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version> <version>3.0.0-M1</version>
<configuration> <configuration>
<createChecksum>true</createChecksum> <createChecksum>true</createChecksum>
</configuration> </configuration>
@ -300,7 +290,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version> <version>3.0.0-M1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -332,7 +322,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version> <version>2.22.1</version>
<configuration> <configuration>
<forkCount>0.5C</forkCount> <forkCount>0.5C</forkCount>
<systemPropertyVariables> <systemPropertyVariables>
@ -470,7 +460,7 @@
<dependency> <dependency>
<groupId>com.puppycrawl.tools</groupId> <groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId> <artifactId>checkstyle</artifactId>
<version>8.12</version> <version>8.14</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
@ -847,6 +837,26 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>javadoc-9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration combine.children="append">
<!-- Choose HTML5 output over deprecated HTML 4.01 -->
<additionalOptions>-html5</additionalOptions>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles> </profiles>
</project> </project>