pom.xml (zxing-zxing-3.4.0) | : | pom.xml (zxing-zxing-3.4.1) | ||
---|---|---|---|---|
skipping to change at line 22 | skipping to change at line 22 | |||
distributed under the License is distributed on an "AS IS" BASIS, | distributed under the License is distributed on an "AS IS" BASIS, | |||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |||
See the License for the specific language governing permissions and | See the License for the specific language governing permissions and | |||
limitations under the License. | limitations under the License. | |||
--> | --> | |||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/ 2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 h ttp://maven.apache.org/maven-v4_0_0.xsd"> | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/ 2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 h ttp://maven.apache.org/maven-v4_0_0.xsd"> | |||
<modelVersion>4.0.0</modelVersion> | <modelVersion>4.0.0</modelVersion> | |||
<groupId>com.google.zxing</groupId> | <groupId>com.google.zxing</groupId> | |||
<artifactId>zxing-parent</artifactId> | <artifactId>zxing-parent</artifactId> | |||
<version>3.4.0</version> | <version>3.4.1</version> | |||
<packaging>pom</packaging> | <packaging>pom</packaging> | |||
<dependencyManagement> | <dependencyManagement> | |||
<dependencies> | <dependencies> | |||
<dependency> | <dependency> | |||
<groupId>org.slf4j</groupId> | ||||
<artifactId>slf4j-api</artifactId> | ||||
<version>${slf4j.version}</version> | ||||
</dependency> | ||||
<dependency> | ||||
<groupId>org.slf4j</groupId> | ||||
<artifactId>slf4j-jdk14</artifactId> | ||||
<version>${slf4j.version}</version> | ||||
<scope>runtime</scope> | ||||
</dependency> | ||||
<dependency> | ||||
<groupId>org.slf4j</groupId> | ||||
<artifactId>jcl-over-slf4j</artifactId> | ||||
<version>${slf4j.version}</version> | ||||
<scope>runtime</scope> | ||||
</dependency> | ||||
<dependency> | ||||
<groupId>com.google.zxing</groupId> | <groupId>com.google.zxing</groupId> | |||
<artifactId>core</artifactId> | <artifactId>core</artifactId> | |||
<version>${zxing.version}</version> | <version>${zxing.version}</version> | |||
</dependency> | </dependency> | |||
<dependency> | <dependency> | |||
<groupId>com.google.zxing</groupId> | <groupId>com.google.zxing</groupId> | |||
<artifactId>android-core</artifactId> | <artifactId>android-core</artifactId> | |||
<version>${zxing.version}</version> | <version>${zxing.version}</version> | |||
</dependency> | </dependency> | |||
<dependency> | <dependency> | |||
skipping to change at line 67 | skipping to change at line 50 | |||
<version>${zxing.version}</version> | <version>${zxing.version}</version> | |||
</dependency> | </dependency> | |||
<dependency> | <dependency> | |||
<groupId>com.google.zxing</groupId> | <groupId>com.google.zxing</groupId> | |||
<artifactId>javase</artifactId> | <artifactId>javase</artifactId> | |||
<version>${zxing.version}</version> | <version>${zxing.version}</version> | |||
</dependency> | </dependency> | |||
<dependency> | <dependency> | |||
<groupId>junit</groupId> | <groupId>junit</groupId> | |||
<artifactId>junit</artifactId> | <artifactId>junit</artifactId> | |||
<version>4.13-beta-3</version> | <version>4.13</version> | |||
<scope>test</scope> | <scope>test</scope> | |||
</dependency> | </dependency> | |||
</dependencies> | </dependencies> | |||
</dependencyManagement> | </dependencyManagement> | |||
<modules> | <modules> | |||
<module>core</module> | <module>core</module> | |||
<module>javase</module> | <module>javase</module> | |||
<!-- android modules are activated by a profile below --> | <!-- android modules are activated by a profile below --> | |||
<module>zxingorg</module> | <module>zxingorg</module> | |||
<!-- appspot app activated by a profile below --> | <!-- appspot app activated by a profile below --> | |||
</modules> | </modules> | |||
<properties> | <properties> | |||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | |||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | |||
<java.version>1.8</java.version> | <java.version>1.8</java.version> | |||
<proguard.version>6.1.0</proguard.version> | <android.home>${env.ANDROID_HOME}</android.home> | |||
<proguard.plugin.version>2.0.14</proguard.plugin.version> | <proguard.version>7.0.0</proguard.version> | |||
<slf4j.version>1.8.0-beta4</slf4j.version> | <proguard.plugin.version>2.3.1</proguard.plugin.version> | |||
<!-- This can't reference project.version as some subprojects version differ ently --> | <!-- This can't reference project.version as some subprojects version differ ently --> | |||
<zxing.version>3.4.0</zxing.version> | <zxing.version>3.4.1</zxing.version> | |||
<android.platform>22</android.platform> | <android.platform>22</android.platform> | |||
<maven.scm.version>1.9.5</maven.scm.version> | ||||
</properties> | </properties> | |||
<build> | <build> | |||
<plugins> | <plugins> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-javadoc-plugin</artifactId> | <artifactId>maven-javadoc-plugin</artifactId> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
skipping to change at line 135 | skipping to change at line 117 | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-checkstyle-plugin</artifactId> | <artifactId>maven-checkstyle-plugin</artifactId> | |||
</plugin> | </plugin> | |||
</plugins> | </plugins> | |||
<pluginManagement> | <pluginManagement> | |||
<plugins> | <plugins> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-enforcer-plugin</artifactId> | <artifactId>maven-enforcer-plugin</artifactId> | |||
<version>3.0.0-M2</version> | <version>3.0.0-M3</version> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<id>enforce</id> | <id>enforce</id> | |||
<configuration> | <configuration> | |||
<rules> | <rules> | |||
<requireModuleConvergence /> | <requireModuleConvergence /> | |||
<requireUpperBoundDeps /> | <requireUpperBoundDeps /> | |||
<dependencyConvergence /> | <dependencyConvergence /> | |||
<requireMavenVersion> | <requireMavenVersion> | |||
<version>3.2.5</version> | <version>3.3.9</version> | |||
</requireMavenVersion> | </requireMavenVersion> | |||
<requireJavaVersion> | <requireJavaVersion> | |||
<version>${java.version}</version> | <version>${java.version}</version> | |||
</requireJavaVersion> | </requireJavaVersion> | |||
</rules> | </rules> | |||
</configuration> | </configuration> | |||
<goals> | <goals> | |||
<goal>enforce</goal> | <goal>enforce</goal> | |||
</goals> | </goals> | |||
</execution> | </execution> | |||
skipping to change at line 174 | skipping to change at line 156 | |||
<target>${java.version}</target> | <target>${java.version}</target> | |||
<compilerArgs> | <compilerArgs> | |||
<arg>-Xlint:all</arg> | <arg>-Xlint:all</arg> | |||
<arg>-Xlint:-serial</arg> | <arg>-Xlint:-serial</arg> | |||
</compilerArgs> | </compilerArgs> | |||
</configuration> | </configuration> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-source-plugin</artifactId> | <artifactId>maven-source-plugin</artifactId> | |||
<version>3.0.1</version> | <version>3.2.1</version> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<id>attach-sources</id> | <id>attach-sources</id> | |||
<goals> | <goals> | |||
<goal>jar-no-fork</goal> | <goal>jar-no-fork</goal> | |||
</goals> | </goals> | |||
</execution> | </execution> | |||
</executions> | </executions> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-javadoc-plugin</artifactId> | <artifactId>maven-javadoc-plugin</artifactId> | |||
<version>3.1.0</version> | <version>3.2.0</version> | |||
<configuration> | <configuration> | |||
<javadocVersion>${java.version}</javadocVersion> | <javadocVersion>${java.version}</javadocVersion> | |||
<source>${java.version}</source> | ||||
<quiet>true</quiet> | <quiet>true</quiet> | |||
<notimestamp>true</notimestamp> | <notimestamp>true</notimestamp> | |||
<encoding>${project.build.sourceEncoding}</encoding> | <encoding>${project.build.sourceEncoding}</encoding> | |||
<docencoding>${project.reporting.outputEncoding}</docencoding> | <docencoding>${project.reporting.outputEncoding}</docencoding> | |||
<doclint>all</doclint> | <doclint>all</doclint> | |||
</configuration> | </configuration> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<id>attach-javadocs</id> | <id>attach-javadocs</id> | |||
<goals> | <goals> | |||
skipping to change at line 231 | skipping to change at line 214 | |||
</configuration> | </configuration> | |||
</plugin> | </plugin> | |||
<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>3.0.0-M1</version> | <version>3.0.0-M1</version> | |||
</plugin> | </plugin> | |||
<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.1.0</version> | <version>3.2.0</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jar-plugin</artifactId> | <artifactId>maven-jar-plugin</artifactId> | |||
<version>3.1.2</version> | <version>3.2.0</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-assembly-plugin</artifactId> | <artifactId>maven-assembly-plugin</artifactId> | |||
<version>3.1.1</version> | <version>3.3.0</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jarsigner-plugin</artifactId> | <artifactId>maven-jarsigner-plugin</artifactId> | |||
<version>3.0.0</version> | <version>3.0.0</version> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<id>signing</id> | <id>signing</id> | |||
<goals> | <goals> | |||
<goal>sign</goal> | <goal>sign</goal> | |||
skipping to change at line 273 | skipping to change at line 256 | |||
<argument>-digestalg</argument> | <argument>-digestalg</argument> | |||
<argument>SHA1</argument> | <argument>SHA1</argument> | |||
</arguments> | </arguments> | |||
</configuration> | </configuration> | |||
</execution> | </execution> | |||
</executions> | </executions> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-release-plugin</artifactId> | <artifactId>maven-release-plugin</artifactId> | |||
<version>2.5.3</version> | <version>3.0.0-M1</version> | |||
<dependencies> | ||||
<dependency> | ||||
<groupId>org.apache.maven.scm</groupId> | ||||
<artifactId>maven-scm-provider-gitexe</artifactId> | ||||
<version>${maven.scm.version}</version> <!-- can't go to 1.10 unti | ||||
l release plugin does --> | ||||
</dependency> | ||||
</dependencies> | ||||
<configuration> | <configuration> | |||
<mavenExecutorId>forked-path</mavenExecutorId> | <mavenExecutorId>forked-path</mavenExecutorId> | |||
<tagNameFormat>zxing-@{project.version}</tagNameFormat> | <tagNameFormat>zxing-@{project.version}</tagNameFormat> | |||
<releaseProfiles>release</releaseProfiles> | <releaseProfiles>release</releaseProfiles> | |||
<goals>deploy</goals> | <goals>deploy</goals> | |||
</configuration> | </configuration> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-scm-plugin</artifactId> | <artifactId>maven-scm-plugin</artifactId> | |||
<version>${maven.scm.version}</version> | <version>1.11.2</version> | |||
</plugin> | </plugin> | |||
<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>3.0.0-M1</version> | <version>3.0.0-M1</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-dependency-plugin</artifactId> | <artifactId>maven-dependency-plugin</artifactId> | |||
<version>3.1.1</version> | <version>3.1.2</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-project-info-reports-plugin</artifactId> | <artifactId>maven-project-info-reports-plugin</artifactId> | |||
<version>3.0.0</version> | <version>3.1.1</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-gpg-plugin</artifactId> | <artifactId>maven-gpg-plugin</artifactId> | |||
<version>1.6</version> | <version>1.6</version> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<id>sign-artifacts</id> | <id>sign-artifacts</id> | |||
<phase>verify</phase> | <phase>verify</phase> | |||
<goals> | <goals> | |||
skipping to change at line 328 | skipping to change at line 304 | |||
</goals> | </goals> | |||
</execution> | </execution> | |||
</executions> | </executions> | |||
<configuration> | <configuration> | |||
<keyname>Sean Owen (ZXing) <srowen@gmail.com></keyname> | <keyname>Sean Owen (ZXing) <srowen@gmail.com></keyname> | |||
</configuration> | </configuration> | |||
</plugin> | </plugin> | |||
<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>3.0.0-M3</version> | <version>3.0.0-M5</version> | |||
<configuration> | <configuration> | |||
<forkCount>0.5C</forkCount> | <forkCount>0.5C</forkCount> | |||
<systemPropertyVariables> | <systemPropertyVariables> | |||
<java.awt.headless>true</java.awt.headless> | <java.awt.headless>true</java.awt.headless> | |||
</systemPropertyVariables> | </systemPropertyVariables> | |||
</configuration> | </configuration> | |||
</plugin> | </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> | |||
<version>3.2.2</version> | <version>3.3.1</version> | |||
</plugin> | </plugin> | |||
<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.6.0</version> | <version>4.6.0</version> | |||
<extensions>true</extensions> | <extensions>true</extensions> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<id>android-zipalign</id> | <id>android-zipalign</id> | |||
<phase>package</phase> | <phase>package</phase> | |||
<goals> | <goals> | |||
<goal>zipalign</goal> | <goal>zipalign</goal> | |||
</goals> | </goals> | |||
</execution> | </execution> | |||
</executions> | </executions> | |||
<configuration> | <configuration> | |||
<sdk> | <sdk> | |||
<path>${env.ANDROID_HOME}</path> | <path>${android.home}</path> | |||
<platform>${android.platform}</platform> | <platform>${android.platform}</platform> | |||
</sdk> | </sdk> | |||
<artifactSet> | <artifactSet> | |||
<excludes> | <excludes> | |||
<!-- Make sure Android SDK jar isn't included --> | <!-- Make sure Android SDK jar isn't included --> | |||
<exclude>com.google.android:android</exclude> | <exclude>com.google.android:android</exclude> | |||
</excludes> | </excludes> | |||
</artifactSet> | </artifactSet> | |||
<proguard> | <proguard> | |||
<skip>true</skip> | <skip>true</skip> | |||
skipping to change at line 385 | skipping to change at line 361 | |||
<release>false</release> | <release>false</release> | |||
<apkDebug>true</apkDebug> | <apkDebug>true</apkDebug> | |||
<androidManifestFile>AndroidManifest.xml</androidManifestFile> | <androidManifestFile>AndroidManifest.xml</androidManifestFile> | |||
<resourceDirectory>res</resourceDirectory> | <resourceDirectory>res</resourceDirectory> | |||
<assetsDirectory>assets</assetsDirectory> | <assetsDirectory>assets</assetsDirectory> | |||
<nativeLibrariesDirectory>libs</nativeLibrariesDirectory> | <nativeLibrariesDirectory>libs</nativeLibrariesDirectory> | |||
<disableConflictingDependenciesWarning>true</disableConflictingDepen denciesWarning> | <disableConflictingDependenciesWarning>true</disableConflictingDepen denciesWarning> | |||
</configuration> | </configuration> | |||
<dependencies> | <dependencies> | |||
<dependency> | <dependency> | |||
<groupId>net.sf.proguard</groupId> | <groupId>com.guardsquare</groupId> | |||
<artifactId>proguard-base</artifactId> | <artifactId>proguard-base</artifactId> | |||
<version>${proguard.version}</version> | <version>${proguard.version}</version> | |||
</dependency> | </dependency> | |||
<dependency> | ||||
<groupId>com.guardsquare</groupId> | ||||
<artifactId>proguard-core</artifactId> | ||||
<version>${proguard.version}</version> | ||||
</dependency> | ||||
</dependencies> | </dependencies> | |||
</plugin> | </plugin> | |||
<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> | <version>${proguard.plugin.version}</version> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<phase>package</phase> | <phase>package</phase> | |||
<goals> | <goals> | |||
skipping to change at line 420 | skipping to change at line 401 | |||
<option>-keep class * { !private *; }</option> | <option>-keep class * { !private *; }</option> | |||
<option>-verbose</option> | <option>-verbose</option> | |||
<option>-optimizationpasses 3</option> | <option>-optimizationpasses 3</option> | |||
</options> | </options> | |||
<libs> | <libs> | |||
<lib>${java.home}/lib/rt.jar</lib> | <lib>${java.home}/lib/rt.jar</lib> | |||
</libs> | </libs> | |||
</configuration> | </configuration> | |||
<dependencies> | <dependencies> | |||
<dependency> | <dependency> | |||
<groupId>net.sf.proguard</groupId> | <groupId>com.guardsquare</groupId> | |||
<artifactId>proguard-base</artifactId> | <artifactId>proguard-base</artifactId> | |||
<version>${proguard.version}</version> | <version>${proguard.version}</version> | |||
<scope>runtime</scope> | <scope>runtime</scope> | |||
</dependency> | </dependency> | |||
<dependency> | ||||
<groupId>com.guardsquare</groupId> | ||||
<artifactId>proguard-core</artifactId> | ||||
<version>${proguard.version}</version> | ||||
<scope>runtime</scope> | ||||
</dependency> | ||||
</dependencies> | </dependencies> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-site-plugin</artifactId> | <artifactId>maven-site-plugin</artifactId> | |||
<version>3.7.1</version> | <version>3.9.1</version> | |||
<inherited>false</inherited> | <inherited>false</inherited> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | ||||
<artifactId>maven-antrun-plugin</artifactId> | ||||
<version>1.8</version> | ||||
</plugin> | ||||
<plugin> | ||||
<groupId>org.codehaus.mojo</groupId> | <groupId>org.codehaus.mojo</groupId> | |||
<artifactId>build-helper-maven-plugin</artifactId> | <artifactId>build-helper-maven-plugin</artifactId> | |||
<version>3.0.0</version> | <version>3.2.0</version> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-checkstyle-plugin</artifactId> | <artifactId>maven-checkstyle-plugin</artifactId> | |||
<version>3.0.0</version> | <version>3.1.1</version> | |||
<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,**/Manifest.java</excludes> | <excludes>**/R.java,**/BuildConfig.java,**/Manifest.java</excludes> | |||
<includeTestSourceDirectory>true</includeTestSourceDirectory> | <includeTestSourceDirectory>true</includeTestSourceDirectory> | |||
</configuration> | </configuration> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<id>validate</id> | <id>validate</id> | |||
<phase>validate</phase> | <phase>validate</phase> | |||
<goals> | <goals> | |||
<goal>check</goal> | <goal>check</goal> | |||
</goals> | </goals> | |||
</execution> | </execution> | |||
</executions> | </executions> | |||
<dependencies> | <dependencies> | |||
<dependency> | <dependency> | |||
<groupId>com.puppycrawl.tools</groupId> | <groupId>com.puppycrawl.tools</groupId> | |||
<artifactId>checkstyle</artifactId> | <artifactId>checkstyle</artifactId> | |||
<version>8.20</version> | <version>8.36.2</version> | |||
</dependency> | </dependency> | |||
</dependencies> | </dependencies> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.rat</groupId> | <groupId>org.apache.rat</groupId> | |||
<artifactId>apache-rat-plugin</artifactId> | <artifactId>apache-rat-plugin</artifactId> | |||
<version>0.13</version> | <version>0.13</version> | |||
<configuration> | <configuration> | |||
<consoleOutput>true</consoleOutput> | ||||
<ignoreErrors>true</ignoreErrors> | ||||
<excludes> | <excludes> | |||
<exclude>.reuse/*</exclude> | ||||
<exclude>**/.*</exclude> | <exclude>**/.*</exclude> | |||
<exclude>**/.settings/**</exclude> | <exclude>**/.settings/**</exclude> | |||
<exclude>**/*.iml</exclude> | <exclude>**/*.iml</exclude> | |||
<exclude>**/*.md</exclude> | <exclude>**/*.md</exclude> | |||
<exclude>**/*.textile</exclude> | <exclude>**/*.textile</exclude> | |||
<exclude>**/*.txt</exclude> | <exclude>**/*.txt</exclude> | |||
<exclude>**/*.html</exclude> | <exclude>**/*.html</exclude> | |||
<exclude>**/*.js</exclude> | <exclude>**/*.js</exclude> | |||
<exclude>**/*.css</exclude> | <exclude>**/*.css</exclude> | |||
<exclude>**/*.properties</exclude> | <exclude>**/*.properties</exclude> | |||
skipping to change at line 529 | skipping to change at line 514 | |||
</goals> | </goals> | |||
</execution> | </execution> | |||
</executions> | </executions> | |||
<configuration> | <configuration> | |||
<ignoredDifferencesFile>${project.parent.basedir}/src/clirr/ignored- differences.xml</ignoredDifferencesFile> | <ignoredDifferencesFile>${project.parent.basedir}/src/clirr/ignored- differences.xml</ignoredDifferencesFile> | |||
</configuration> | </configuration> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.jacoco</groupId> | <groupId>org.jacoco</groupId> | |||
<artifactId>jacoco-maven-plugin</artifactId> | <artifactId>jacoco-maven-plugin</artifactId> | |||
<version>0.8.4</version> | <version>0.8.6</version> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<goals> | <goals> | |||
<goal>prepare-agent</goal> | <goal>prepare-agent</goal> | |||
</goals> | </goals> | |||
</execution> | </execution> | |||
<execution> | <execution> | |||
<id>report</id> | <id>report</id> | |||
<phase>test</phase> | <phase>test</phase> | |||
<goals> | <goals> | |||
skipping to change at line 689 | skipping to change at line 674 | |||
</mailingList> | </mailingList> | |||
<mailingList> | <mailingList> | |||
<name>StackOverflow tag</name> | <name>StackOverflow tag</name> | |||
<archive>https://stackoverflow.com/questions/tagged/zxing</archive> | <archive>https://stackoverflow.com/questions/tagged/zxing</archive> | |||
</mailingList> | </mailingList> | |||
</mailingLists> | </mailingLists> | |||
<scm> | <scm> | |||
<connection>scm:git:https://github.com/zxing/zxing.git</connection> | <connection>scm:git:https://github.com/zxing/zxing.git</connection> | |||
<developerConnection>scm:git:https://github.com/zxing/zxing.git</developerCo nnection> | <developerConnection>scm:git:https://github.com/zxing/zxing.git</developerCo nnection> | |||
<url>https://github.com/zxing/zxing</url> | <url>https://github.com/zxing/zxing</url> | |||
<tag>zxing-3.4.0</tag> | <tag>zxing-3.4.1</tag> | |||
</scm> | </scm> | |||
<pluginRepositories> | ||||
<pluginRepository> | ||||
<snapshots> | ||||
<enabled>false</enabled> | ||||
</snapshots> | ||||
<id>bintray-guardsquare-proguard</id> | ||||
<name>bintray</name> | ||||
<url>https://dl.bintray.com/guardsquare/proguard</url> | ||||
</pluginRepository> | ||||
</pluginRepositories> | ||||
<distributionManagement> | <distributionManagement> | |||
<repository> | <repository> | |||
<id>sonatype-nexus-staging</id> | <id>sonatype-nexus-staging</id> | |||
<name>Nexus Release Repository</name> | <name>Nexus Release Repository</name> | |||
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> | <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> | |||
</repository> | </repository> | |||
<snapshotRepository> | <snapshotRepository> | |||
<id>sonatype-nexus-snapshots</id> | <id>sonatype-nexus-snapshots</id> | |||
<name>Sonatype Nexus Snapshots</name> | <name>Sonatype Nexus Snapshots</name> | |||
<url>https://oss.sonatype.org/content/repositories/snapshots/</url> | <url>https://oss.sonatype.org/content/repositories/snapshots/</url> | |||
skipping to change at line 732 | skipping to change at line 728 | |||
<module>android</module> | <module>android</module> | |||
</modules> | </modules> | |||
<dependencyManagement> | <dependencyManagement> | |||
<dependencies> | <dependencies> | |||
<dependency> | <dependency> | |||
<groupId>com.google.android</groupId> | <groupId>com.google.android</groupId> | |||
<artifactId>android</artifactId> | <artifactId>android</artifactId> | |||
<version>${android.platform}</version> | <version>${android.platform}</version> | |||
<scope>system</scope> | <scope>system</scope> | |||
<!-- ANDROID_HOME must be absolute, but redundant leading / may help Gradle Spring Boot plugin --> | <!-- ANDROID_HOME must be absolute, but redundant leading / may help Gradle Spring Boot plugin --> | |||
<systemPath>/${env.ANDROID_HOME}/platforms/android-${android.platfor m}/android.jar</systemPath> | <systemPath>/${android.home}/platforms/android-${android.platform}/a ndroid.jar</systemPath> | |||
</dependency> | </dependency> | |||
</dependencies> | </dependencies> | |||
</dependencyManagement> | </dependencyManagement> | |||
</profile> | </profile> | |||
<profile> | <profile> | |||
<id>release</id> | <id>release</id> | |||
<build> | <build> | |||
<plugins> | <plugins> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
skipping to change at line 767 | skipping to change at line 763 | |||
<groupId>com.simpligility.maven.plugins</groupId> | <groupId>com.simpligility.maven.plugins</groupId> | |||
<artifactId>android-maven-plugin</artifactId> | <artifactId>android-maven-plugin</artifactId> | |||
<configuration> | <configuration> | |||
<proguard> | <proguard> | |||
<skip>false</skip> | <skip>false</skip> | |||
<config>proguard.cfg</config> | <config>proguard.cfg</config> | |||
</proguard> | </proguard> | |||
<!-- repeat Android jar as library jar, as plugin ignores scope sy stem deps --> | <!-- repeat Android jar as library jar, as plugin ignores scope sy stem deps --> | |||
<proguardOptions> | <proguardOptions> | |||
<option>-libraryjars</option> | <option>-libraryjars</option> | |||
<option>${env.ANDROID_HOME}/platforms/android-${android.platform }/android.jar</option> | <option>${android.home}/platforms/android-${android.platform}/an droid.jar</option> | |||
</proguardOptions> | </proguardOptions> | |||
<sign> | <sign> | |||
<debug>false</debug> | <debug>false</debug> | |||
</sign> | </sign> | |||
<release>true</release> | <release>true</release> | |||
<apkDebug>false</apkDebug> | <apkDebug>false</apkDebug> | |||
</configuration> | </configuration> | |||
</plugin> | </plugin> | |||
</plugins> | </plugins> | |||
</build> | </build> | |||
skipping to change at line 814 | skipping to change at line 810 | |||
<forkCount>1</forkCount> | <forkCount>1</forkCount> | |||
</configuration> | </configuration> | |||
</plugin> | </plugin> | |||
<plugin> | <plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | <groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-source-plugin</artifactId> | <artifactId>maven-source-plugin</artifactId> | |||
<configuration> | <configuration> | |||
<skipSource>true</skipSource> | <skipSource>true</skipSource> | |||
</configuration> | </configuration> | |||
</plugin> | </plugin> | |||
<plugin> | ||||
<groupId>org.apache.maven.plugins</groupId> | ||||
<artifactId>maven-javadoc-plugin</artifactId> | ||||
<configuration> | ||||
<skip>true</skip> | ||||
</configuration> | ||||
</plugin> | ||||
</plugins> | </plugins> | |||
</build> | </build> | |||
</profile> | </profile> | |||
<profile> | <profile> | |||
<id>appspot</id> | <id>appspot</id> | |||
<activation> | <activation> | |||
<jdk>[,9)</jdk> <!-- Appspot won't work with JDK 9 --> | <jdk>[,9)</jdk> <!-- Appspot won't work with JDK 9 --> | |||
</activation> | </activation> | |||
<modules> | <modules> | |||
<module>zxing.appspot.com</module> | <module>zxing.appspot.com</module> | |||
End of changes. 38 change blocks. | ||||
68 lines changed or deleted | 56 lines changed or added |