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

Remove unneeded .gitignore, and unneeded libs copy step for Android targets. Update plugins. Fix javadoc warning / checkstyle problem.

Browse source
This commit is contained in:
Sean Owen 2016-06-08 15:15:06 +01:00
parent 032e1547ae
commit 58f748a451
14 changed files with 9 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android-integration/.gitignore vendored
View file

@ -1,2 +0,0 @@
target/
*.iml

30
android-integration/pom.xml
View file

@ -34,36 +34,6 @@
<version>3.2.2-SNAPSHOT</version> <version>3.2.2-SNAPSHOT</version>
</parent> </parent>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-androidtest</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.google.zxing</groupId>
<artifactId>android-integration</artifactId>
<version>${project.version}</version>
<type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>../androidtest/libs</outputDirectory>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<name>ZXing Android Integration lib</name> <name>ZXing Android Integration lib</name>
<description>Integration helper classes for Android applications wanting to create/scan barcodes</description> <description>Integration helper classes for Android applications wanting to create/scan barcodes</description>

6
android/.gitignore vendored
View file

@ -1,6 +0,0 @@
target/
*.iml
bin/
gen/
libs/
local.properties

6
androidtest/.gitignore vendored
View file

@ -1,6 +0,0 @@
target/
*.iml
bin/
gen/
libs/
local.properties

2
core/.gitignore vendored
View file

@ -1,2 +0,0 @@
target/
*.iml

49
core/pom.xml
View file

@ -35,55 +35,6 @@
<version>3.2.2-SNAPSHOT</version> <version>3.2.2-SNAPSHOT</version>
</parent> </parent>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-android</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
<type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>../android/libs</outputDirectory>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
<execution>
<id>copy-androidtest</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
<type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>../androidtest/libs</outputDirectory>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<name>ZXing Core</name> <name>ZXing Core</name>
<description>Core barcode encoding/decoding library</description> <description>Core barcode encoding/decoding library</description>

2
core/src/main/java/com/google/zxing/oned/rss/AbstractRSSReader.java
View file

@ -84,6 +84,8 @@ public abstract class AbstractRSSReader extends OneDReader {
} }
/** /**
* @param array values to sum
* @return sum of values
* @deprecated call {@link MathUtils#sum(int[])} * @deprecated call {@link MathUtils#sum(int[])}
*/ */
@Deprecated @Deprecated

2
core/src/main/java/com/google/zxing/pdf417/PDF417Common.java
View file

@ -43,6 +43,8 @@ public final class PDF417Common {
} }
/** /**
* @param moduleBitCount values to sum
* @return sum of values
* @deprecated call {@link MathUtils#sum(int[])} * @deprecated call {@link MathUtils#sum(int[])}
*/ */
@Deprecated @Deprecated

6
glass/.gitignore vendored
View file

@ -1,6 +0,0 @@
target/
*.iml
bin/
gen/
libs/
local.properties

2
javase/.gitignore vendored
View file

@ -1,2 +0,0 @@
target/
*.iml

17
pom.xml
View file

@ -216,10 +216,6 @@
<fileset> <fileset>
<directory>.</directory> <directory>.</directory>
<includes> <includes>
<include>**/bin/**</include>
<include>**/gen/**</include>
<include>**/libs/*</include>
<include>**/out/**</include>
<include>**/classes/**</include> <include>**/classes/**</include>
<include>**/gwt-unitCache/**</include> <include>**/gwt-unitCache/**</include>
<include>**/webapp/generator/**</include> <include>**/webapp/generator/**</include>
@ -240,7 +236,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>3.0.0</version> <version>3.0.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -341,11 +337,6 @@
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
@ -354,7 +345,7 @@
<plugin> <plugin>
<groupId>com.simpligility.maven.plugins</groupId> <groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId> <artifactId>android-maven-plugin</artifactId>
<version>4.4.1</version> <version>4.4.2</version>
<extensions>true</extensions> <extensions>true</extensions>
<executions> <executions>
<execution> <execution>
@ -426,7 +417,7 @@
<configuration> <configuration>
<configLocation>src/checkstyle/checkstyle.xml</configLocation> <configLocation>src/checkstyle/checkstyle.xml</configLocation>
<!-- Android generated files --> <!-- Android generated files -->
<excludes>**/R.java,**/BuildConfig.java</excludes> <excludes>**/R.java,**/BuildConfig.java,**/Manifest.java</excludes>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@ -507,7 +498,7 @@
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.6.201602180812</version> <version>0.7.7.201606060606</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>

2
zxing.appspot.com/.gitignore vendored
View file

@ -1,2 +0,0 @@
target/
*.iml

2
zxingorg/.gitignore vendored
View file

@ -1,2 +0,0 @@
target/
*.iml

2
zxingorg/pom.xml
View file

@ -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.9.M1</version> <version>9.4.0.M0</version>
<configuration> <configuration>
<webAppSourceDirectory>src/web</webAppSourceDirectory> <webAppSourceDirectory>src/web</webAppSourceDirectory>
</configuration> </configuration>