Remove unneeded .gitignore, and unneeded libs copy step for Android t…

…argets. Update plugins. Fix javadoc warning / checkstyle problem.
Staricase · Jun 8, 2016 · 58f748a · 58f748a
1 parent 032e154
commit 58f748a
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 121 deletions.
diff --git a/android-integration/.gitignore b/android-integration/.gitignore
diff --git a/android-integration/pom.xml b/android-integration/pom.xml
@@ -34,36 +34,6 @@
     <version>3.2.2-SNAPSHOT</version>
   </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>
   <description>Integration helper classes for Android applications wanting to create/scan barcodes</description>
 

diff --git a/android/.gitignore b/android/.gitignore
diff --git a/androidtest/.gitignore b/androidtest/.gitignore
diff --git a/core/.gitignore b/core/.gitignore
diff --git a/core/pom.xml b/core/pom.xml
@@ -35,55 +35,6 @@
     <version>3.2.2-SNAPSHOT</version>
   </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>
   <description>Core barcode encoding/decoding library</description>
 

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
@@ -84,6 +84,8 @@ protected static int parseFinderValue(int[] counters,
   }
 
   /**
+   * @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
@@ -43,6 +43,8 @@ private 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
diff --git a/javase/.gitignore b/javase/.gitignore
diff --git a/pom.xml b/pom.xml
@@ -216,10 +216,6 @@
               <fileset>
                 <directory>.</directory>
                 <includes>
-                  <include>**/bin/**</include>
-                  <include>**/gen/**</include>
-                  <include>**/libs/*</include>
-                  <include>**/out/**</include>
                   <include>**/classes/**</include>
                   <include>**/gwt-unitCache/**</include>
                   <include>**/webapp/generator/**</include>
@@ -240,7 +236,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.0.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -341,11 +337,6 @@
             </systemPropertyVariables>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
@@ -354,7 +345,7 @@
         <plugin>
           <groupId>com.simpligility.maven.plugins</groupId>
           <artifactId>android-maven-plugin</artifactId>
-          <version>4.4.1</version>
+          <version>4.4.2</version>
           <extensions>true</extensions>
           <executions>
             <execution>
@@ -426,7 +417,7 @@
           <configuration>
             <configLocation>src/checkstyle/checkstyle.xml</configLocation>
             <!-- Android generated files -->
-            <excludes>**/R.java,**/BuildConfig.java</excludes>
+            <excludes>**/R.java,**/BuildConfig.java,**/Manifest.java</excludes>
           </configuration>
           <executions>
             <execution>
@@ -507,7 +498,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.7.6.201602180812</version>
+          <version>0.7.7.201606060606</version>
           <executions>
             <execution>
               <goals>

diff --git a/zxing.appspot.com/.gitignore b/zxing.appspot.com/.gitignore
diff --git a/zxingorg/.gitignore b/zxingorg/.gitignore
diff --git a/zxingorg/pom.xml b/zxingorg/pom.xml
@@ -61,7 +61,7 @@
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>9.3.9.M1</version>
+        <version>9.4.0.M0</version>
         <configuration>
           <webAppSourceDirectory>src/web</webAppSourceDirectory>
         </configuration>