pom.xml (zxing-zxing-3.4.1) | : | pom.xml (zxing-zxing-3.5.0) | ||
---|---|---|---|---|
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.1</version> | <version>3.5.0</version> | |||
<packaging>pom</packaging> | <packaging>pom</packaging> | |||
<dependencyManagement> | <dependencyManagement> | |||
<dependencies> | <dependencies> | |||
<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> | |||
skipping to change at line 50 | 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</version> | <version>4.13.2</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> | |||
<android.home>${env.ANDROID_HOME}</android.home> | <android.home>${env.ANDROID_HOME}</android.home> | |||
<proguard.version>7.0.0</proguard.version> | <proguard.plugin.version>2.5.3</proguard.plugin.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.1</zxing.version> | <zxing.version>3.5.0</zxing.version> | |||
<android.platform>22</android.platform> | <android.platform>22</android.platform> | |||
</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> | |||
skipping to change at line 117 | skipping to change at line 116 | |||
<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-M3</version> | <version>3.0.0</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.3.9</version> | <version>3.3.9</version> | |||
skipping to change at line 143 | skipping to change at line 142 | |||
</configuration> | </configuration> | |||
<goals> | <goals> | |||
<goal>enforce</goal> | <goal>enforce</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-compiler-plugin</artifactId> | <artifactId>maven-compiler-plugin</artifactId> | |||
<version>3.8.1</version> | <version>3.10.1</version> | |||
<configuration> | <configuration> | |||
<source>${java.version}</source> | <source>${java.version}</source> | |||
<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> | |||
skipping to change at line 169 | skipping to change at line 168 | |||
<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.2.0</version> | <version>3.4.0</version> | |||
<configuration> | <configuration> | |||
<javadocVersion>${java.version}</javadocVersion> | ||||
<source>${java.version}</source> | <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> | |||
<goal>jar</goal> | <goal>jar</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-clean-plugin</artifactId> | <artifactId>maven-clean-plugin</artifactId> | |||
<version>3.1.0</version> | <version>3.2.0</version> | |||
<configuration> | <configuration> | |||
<filesets> | <filesets> | |||
<fileset> | <fileset> | |||
<directory>.</directory> | <directory>.</directory> | |||
<includes> | <includes> | |||
<include>**/classes/**</include> | <include>**/classes/**</include> | |||
<include>**/gwt-unitCache/**</include> | <include>**/gwt-unitCache/**</include> | |||
<include>**/webapp/generator/**</include> | <include>**/webapp/generator/**</include> | |||
<include>**/WEB-INF/deploy/**</include> | <include>**/WEB-INF/deploy/**</include> | |||
</includes> | </includes> | |||
skipping to change at line 219 | skipping to change at line 217 | |||
<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.2.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.2.0</version> | <version>3.2.2</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.3.0</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> | |||
skipping to change at line 256 | skipping to change at line 254 | |||
<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>3.0.0-M1</version> | <version>3.0.0-M5</version> | |||
<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>1.11.2</version> | <version>1.12.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-M2</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.2</version> | <version>3.3.0</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.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-gpg-plugin</artifactId> | <artifactId>maven-gpg-plugin</artifactId> | |||
<version>1.6</version> | <version>3.0.1</version> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<id>sign-artifacts</id> | <id>sign-artifacts</id> | |||
<phase>verify</phase> | <phase>verify</phase> | |||
<goals> | <goals> | |||
<goal>sign</goal> | <goal>sign</goal> | |||
</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-M5</version> | <version>3.0.0-M6</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.3.1</version> | <version>3.3.2</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> | |||
skipping to change at line 359 | skipping to change at line 357 | |||
<skip>false</skip> | <skip>false</skip> | |||
</zipalign> | </zipalign> | |||
<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> | ||||
<dependency> | ||||
<groupId>com.guardsquare</groupId> | ||||
<artifactId>proguard-base</artifactId> | ||||
<version>${proguard.version}</version> | ||||
</dependency> | ||||
<dependency> | ||||
<groupId>com.guardsquare</groupId> | ||||
<artifactId>proguard-core</artifactId> | ||||
<version>${proguard.version}</version> | ||||
</dependency> | ||||
</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> | |||
<goal>proguard</goal> | <goal>proguard</goal> | |||
</goals> | </goals> | |||
</execution> | </execution> | |||
</executions> | </executions> | |||
<configuration> | <configuration> | |||
<proguardVersion>${proguard.version}</proguardVersion> | ||||
<addMavenDescriptor>true</addMavenDescriptor> | <addMavenDescriptor>true</addMavenDescriptor> | |||
<obfuscate>false</obfuscate> | <obfuscate>false</obfuscate> | |||
<options> | <options> | |||
<option>-target ${java.version}</option> | <option>-target ${java.version}</option> | |||
<option>-dontshrink</option> | <option>-dontshrink</option> | |||
<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> | ||||
<dependency> | ||||
<groupId>com.guardsquare</groupId> | ||||
<artifactId>proguard-base</artifactId> | ||||
<version>${proguard.version}</version> | ||||
<scope>runtime</scope> | ||||
</dependency> | ||||
<dependency> | ||||
<groupId>com.guardsquare</groupId> | ||||
<artifactId>proguard-core</artifactId> | ||||
<version>${proguard.version}</version> | ||||
<scope>runtime</scope> | ||||
</dependency> | ||||
</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.9.1</version> | <version>3.12.0</version> | |||
<inherited>false</inherited> | <inherited>false</inherited> | |||
</plugin> | </plugin> | |||
<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.2.0</version> | <version>3.3.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.1.1</version> | <version>3.1.2</version> | |||
<configuration> | <configuration> | |||
<configLocation>src/checkstyle/checkstyle.xml</configLocation> | <configLocation>src/checkstyle/checkstyle.xml</configLocation> | |||
<!-- Android generated files --> | ||||
<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.36.2</version> | <version>9.3</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> | <consoleOutput>true</consoleOutput> | |||
<ignoreErrors>true</ignoreErrors> | <ignoreErrors>true</ignoreErrors> | |||
skipping to change at line 473 | skipping to change at line 442 | |||
<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> | |||
<exclude>**/*.cfg</exclude> | <exclude>**/*.cfg</exclude> | |||
<exclude>**/*.config</exclude> | <exclude>**/*.config</exclude> | |||
<exclude>**/*.yml</exclude> | ||||
<exclude>**/*.yaml</exclude> | <exclude>**/*.yaml</exclude> | |||
<exclude>**/gen/**</exclude> | <exclude>**/gen/**</exclude> | |||
<exclude>**/resources/**</exclude> | <exclude>**/resources/**</exclude> | |||
<exclude>**/symbolMaps/**</exclude> | <exclude>**/symbolMaps/**</exclude> | |||
<exclude>**/target/**</exclude> | <exclude>**/target/**</exclude> | |||
<exclude>**/dependency-reduced-pom.xml</exclude> | <exclude>**/dependency-reduced-pom.xml</exclude> | |||
<exclude>docs/</exclude> | <exclude>docs/</exclude> | |||
<exclude>private/**</exclude> | <exclude>private/**</exclude> | |||
<exclude>CHANGES</exclude> | <exclude>CHANGES</exclude> | |||
<excludeSubProjects>false</excludeSubProjects> | <excludeSubProjects>false</excludeSubProjects> | |||
skipping to change at line 514 | skipping to change at line 484 | |||
</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.6</version> | <version>0.8.8</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 674 | skipping to change at line 644 | |||
</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.1</tag> | <tag>zxing-3.5.0</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> | |||
</snapshotRepository> | </snapshotRepository> | |||
<site> | <site> | |||
<id>zxing.website</id> | <id>zxing.website</id> | |||
<name>ZXing documentation</name> | <name>ZXing documentation</name> | |||
<url>file:docs/</url> | <url>file:docs/</url> | |||
</site> | </site> | |||
</distributionManagement> | </distributionManagement> | |||
<repositories> | ||||
<repository> | ||||
<id>google-maven-central</id> | ||||
<name>GCS Maven Central mirror</name> | ||||
<url>https://maven-central.storage-download.googleapis.com/maven2/</url> | ||||
</repository> | ||||
</repositories> | ||||
<pluginRepositories> | ||||
<pluginRepository> | ||||
<id>google-maven-central</id> | ||||
<name>GCS Maven Central mirror</name> | ||||
<url>https://maven-central.storage-download.googleapis.com/maven2/</url> | ||||
</pluginRepository> | ||||
</pluginRepositories> | ||||
<profiles> | <profiles> | |||
<profile> | <profile> | |||
<id>build-android</id> | <id>build-android</id> | |||
<activation> | <activation> | |||
<property> | <property> | |||
<name>env.ANDROID_HOME</name> | <name>env.ANDROID_HOME</name> | |||
</property> | </property> | |||
<jdk>[,9)</jdk> <!-- Android won't necessarily work with JDK 9 --> | <jdk>[,9)</jdk> <!-- Android won't necessarily work with JDK 9 --> | |||
</activation> | </activation> | |||
<modules> | <modules> | |||
skipping to change at line 787 | skipping to change at line 761 | |||
<build> | <build> | |||
<plugins> | <plugins> | |||
<plugin> | <plugin> | |||
<groupId>org.jacoco</groupId> | <groupId>org.jacoco</groupId> | |||
<artifactId>jacoco-maven-plugin</artifactId> | <artifactId>jacoco-maven-plugin</artifactId> | |||
</plugin> | </plugin> | |||
</plugins> | </plugins> | |||
</build> | </build> | |||
</profile> | </profile> | |||
<profile> | <profile> | |||
<id>travis</id> | ||||
<properties> | ||||
<!-- dummy to make @{argLine} evaluate when not set by jacoco --> | ||||
<argLine /> | ||||
</properties> | ||||
<build> | ||||
<plugins> | ||||
<plugin> | ||||
<groupId>org.apache.maven.plugins</groupId> | ||||
<artifactId>maven-surefire-plugin</artifactId> | ||||
<configuration> | ||||
<!-- Limit memory for unit tests in Travis --> | ||||
<argLine>@{argLine} -Xmx512m</argLine> | ||||
<forkCount>1</forkCount> | ||||
</configuration> | ||||
</plugin> | ||||
<plugin> | ||||
<groupId>org.apache.maven.plugins</groupId> | ||||
<artifactId>maven-source-plugin</artifactId> | ||||
<configuration> | ||||
<skipSource>true</skipSource> | ||||
</configuration> | ||||
</plugin> | ||||
</plugins> | ||||
</build> | ||||
</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> | |||
</modules> | </modules> | |||
</profile> | </profile> | |||
<profile> | <profile> | |||
<id>javadoc-9</id> | <id>javadoc-9</id> | |||
End of changes. 32 change blocks. | ||||
92 lines changed or deleted | 39 lines changed or added |