mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-09 20:44:03 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to 3.5.0-SNAPSHOT for next release; deps updates

Browse source
This commit is contained in:
Sean Owen 2022-02-17 14:10:00 -06:00
parent 13465b3f1c
commit f3f73b47d3
8 changed files with 29 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android-core/pom.xml
View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>android-core</artifactId> <artifactId>android-core</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -43,7 +43,7 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
</parent> </parent>
<name>ZXing Android Core</name> <name>ZXing Android Core</name>

4
android-integration/pom.xml
View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>android-integration</artifactId> <artifactId>android-integration</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -43,7 +43,7 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
</parent> </parent>
<name>ZXing Android Integration lib</name> <name>ZXing Android Integration lib</name>

2
android/pom.xml
View file

@ -40,7 +40,7 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>

6
core/pom.xml
View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -32,7 +32,7 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
</parent> </parent>
<name>ZXing Core</name> <name>ZXing Core</name>
@ -63,7 +63,7 @@
<plugin> <plugin>
<groupId>biz.aQute.bnd</groupId> <groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId> <artifactId>bnd-maven-plugin</artifactId>
<version>6.0.0</version> <version>6.1.0</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>

6
javase/pom.xml
View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>javase</artifactId> <artifactId>javase</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>com.beust</groupId> <groupId>com.beust</groupId>
<artifactId>jcommander</artifactId> <artifactId>jcommander</artifactId>
<version>1.81</version> <version>1.82</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.jai-imageio</groupId> <groupId>com.github.jai-imageio</groupId>
@ -47,7 +47,7 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
</parent> </parent>
<build> <build>

54
pom.xml
View file

@ -19,7 +19,7 @@
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<dependencyManagement> <dependencyManagement>
@ -66,10 +66,9 @@
<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.1.1</proguard.version> <proguard.plugin.version>2.5.3</proguard.plugin.version>
<proguard.plugin.version>2.4.0</proguard.plugin.version>
<!-- This can't reference project.version as some subprojects version differently --> <!-- This can't reference project.version as some subprojects version differently -->
<zxing.version>3.4.2-SNAPSHOT</zxing.version> <zxing.version>3.5.0-SNAPSHOT</zxing.version>
<android.platform>22</android.platform> <android.platform>22</android.platform>
</properties> </properties>
@ -140,7 +139,7 @@
<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.0</version>
<configuration> <configuration>
<source>${java.version}</source> <source>${java.version}</source>
<target>${java.version}</target> <target>${java.version}</target>
@ -166,7 +165,7 @@
<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.3.1</version> <version>3.3.2</version>
<configuration> <configuration>
<source>${java.version}</source> <source>${java.version}</source>
<quiet>true</quiet> <quiet>true</quiet>
@ -215,7 +214,7 @@
<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>
@ -252,7 +251,7 @@
<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-M4</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>
@ -263,12 +262,12 @@
<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.12.0</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>
@ -278,7 +277,7 @@
<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.2</version> <version>3.2.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -355,18 +354,6 @@
<nativeLibrariesDirectory>libs</nativeLibrariesDirectory> <nativeLibrariesDirectory>libs</nativeLibrariesDirectory>
<disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning> <disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
</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>
@ -381,7 +368,6 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<proguardVersion>${proguard.version}</proguardVersion>
<addMavenDescriptor>true</addMavenDescriptor> <addMavenDescriptor>true</addMavenDescriptor>
<obfuscate>false</obfuscate> <obfuscate>false</obfuscate>
<options> <options>
@ -395,31 +381,17 @@
<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.11.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>
@ -442,7 +414,7 @@
<dependency> <dependency>
<groupId>com.puppycrawl.tools</groupId> <groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId> <artifactId>checkstyle</artifactId>
<version>9.0.1</version> <version>9.3</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>

4
zxing.appspot.com/pom.xml
View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>zxing.appspot.com</artifactId> <artifactId>zxing.appspot.com</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<dependencies> <dependencies>
@ -33,7 +33,7 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

6
zxingorg/pom.xml
View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>zxingorg</artifactId> <artifactId>zxingorg</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<dependencies> <dependencies>
@ -69,11 +69,11 @@
<parent> <parent>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId> <artifactId>zxing-parent</artifactId>
<version>3.4.2-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<spring.version>5.3.10</spring.version> <spring.version>5.3.16</spring.version>
</properties> </properties>
<build> <build>