diff --git a/android-integration/.gitignore b/android-integration/.gitignore
deleted file mode 100644
index 0bdd78e13..000000000
--- a/android-integration/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-target/
-*.iml
\ No newline at end of file
diff --git a/android-integration/pom.xml b/android-integration/pom.xml
index 8296e0a49..81f6fa0a3 100644
--- a/android-integration/pom.xml
+++ b/android-integration/pom.xml
@@ -34,36 +34,6 @@
3.2.2-SNAPSHOT
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- copy-androidtest
- package
-
- copy
-
-
-
-
- com.google.zxing
- android-integration
- ${project.version}
- jar
-
-
- ../androidtest/libs
- true
-
-
-
-
-
-
-
ZXing Android Integration lib
Integration helper classes for Android applications wanting to create/scan barcodes
diff --git a/android/.gitignore b/android/.gitignore
deleted file mode 100644
index 8213249e8..000000000
--- a/android/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target/
-*.iml
-bin/
-gen/
-libs/
-local.properties
diff --git a/androidtest/.gitignore b/androidtest/.gitignore
deleted file mode 100644
index 8213249e8..000000000
--- a/androidtest/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target/
-*.iml
-bin/
-gen/
-libs/
-local.properties
diff --git a/core/.gitignore b/core/.gitignore
deleted file mode 100644
index 0bdd78e13..000000000
--- a/core/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-target/
-*.iml
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index feb8d4c61..a9d75ec87 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -35,55 +35,6 @@
3.2.2-SNAPSHOT
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- copy-android
- package
-
- copy
-
-
-
-
- com.google.zxing
- core
- ${project.version}
- jar
-
-
- ../android/libs
- true
-
-
-
- copy-androidtest
- package
-
- copy
-
-
-
-
- com.google.zxing
- core
- ${project.version}
- jar
-
-
- ../androidtest/libs
- true
-
-
-
-
-
-
-
ZXing Core
Core barcode encoding/decoding library
diff --git a/core/src/main/java/com/google/zxing/oned/rss/AbstractRSSReader.java b/core/src/main/java/com/google/zxing/oned/rss/AbstractRSSReader.java
index 70d69b6f9..583817b46 100644
--- a/core/src/main/java/com/google/zxing/oned/rss/AbstractRSSReader.java
+++ b/core/src/main/java/com/google/zxing/oned/rss/AbstractRSSReader.java
@@ -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
diff --git a/core/src/main/java/com/google/zxing/pdf417/PDF417Common.java b/core/src/main/java/com/google/zxing/pdf417/PDF417Common.java
index c54aad0fe..5e7cafd95 100644
--- a/core/src/main/java/com/google/zxing/pdf417/PDF417Common.java
+++ b/core/src/main/java/com/google/zxing/pdf417/PDF417Common.java
@@ -43,6 +43,8 @@ public final class PDF417Common {
}
/**
+ * @param moduleBitCount values to sum
+ * @return sum of values
* @deprecated call {@link MathUtils#sum(int[])}
*/
@Deprecated
diff --git a/glass/.gitignore b/glass/.gitignore
deleted file mode 100644
index 8213249e8..000000000
--- a/glass/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target/
-*.iml
-bin/
-gen/
-libs/
-local.properties
diff --git a/javase/.gitignore b/javase/.gitignore
deleted file mode 100644
index 0bdd78e13..000000000
--- a/javase/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-target/
-*.iml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0bc83d60b..d6dc4c76a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,10 +216,6 @@
.
- **/bin/**
- **/gen/**
- **/libs/*
- **/out/**
**/classes/**
**/gwt-unitCache/**
**/webapp/generator/**
@@ -240,7 +236,7 @@
org.apache.maven.plugins
maven-resources-plugin
- 3.0.0
+ 3.0.1
org.apache.maven.plugins
@@ -341,11 +337,6 @@
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 2.10
-
org.apache.maven.plugins
maven-war-plugin
@@ -354,7 +345,7 @@
com.simpligility.maven.plugins
android-maven-plugin
- 4.4.1
+ 4.4.2
true
@@ -426,7 +417,7 @@
src/checkstyle/checkstyle.xml
- **/R.java,**/BuildConfig.java
+ **/R.java,**/BuildConfig.java,**/Manifest.java
@@ -507,7 +498,7 @@
org.jacoco
jacoco-maven-plugin
- 0.7.6.201602180812
+ 0.7.7.201606060606
diff --git a/zxing.appspot.com/.gitignore b/zxing.appspot.com/.gitignore
deleted file mode 100644
index 0bdd78e13..000000000
--- a/zxing.appspot.com/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-target/
-*.iml
\ No newline at end of file
diff --git a/zxingorg/.gitignore b/zxingorg/.gitignore
deleted file mode 100644
index 0bdd78e13..000000000
--- a/zxingorg/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-target/
-*.iml
\ No newline at end of file
diff --git a/zxingorg/pom.xml b/zxingorg/pom.xml
index 7ed5efce7..aad9e30ce 100644
--- a/zxingorg/pom.xml
+++ b/zxingorg/pom.xml
@@ -61,7 +61,7 @@
org.eclipse.jetty
jetty-maven-plugin
- 9.3.9.M1
+ 9.4.0.M0
src/web