This is an automated email from the ASF dual-hosted git repository. opwvhk pushed a commit to branch branch-1.12 in repository https://gitbox.apache.org/repos/asf/avro.git
commit 2b205426c74df7261b5683d3fee8ba4112b6b9bb Author: Oscar Westra van Holthe - Kind <[email protected]> AuthorDate: Fri Jun 13 09:29:08 2025 +0200 Bump various versions to match main --- lang/java/idl/pom.xml | 2 +- pom.xml | 23 +++++++++++++---------- share/docker/Dockerfile | 8 -------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/lang/java/idl/pom.xml b/lang/java/idl/pom.xml index 9d90ff5519..a4c9a05d8e 100644 --- a/lang/java/idl/pom.xml +++ b/lang/java/idl/pom.xml @@ -43,7 +43,7 @@ * </osgi.import> <osgi.export>org.apache.avro.idl*;version="${project.version}"</osgi.export> - <antlr.version>4.13.1</antlr.version> + <antlr.version>4.13.2</antlr.version> </properties> <build> diff --git a/pom.xml b/pom.xml index b7bb1a8a2a..da71733a07 100644 --- a/pom.xml +++ b/pom.xml @@ -48,22 +48,22 @@ <!-- plugin versions --> <apache-rat-plugin.version>0.16.1</apache-rat-plugin.version> - <checkstyle-plugin.version>3.4.0</checkstyle-plugin.version> - <checkstyle.version>10.17.0</checkstyle.version> + <checkstyle-plugin.version>3.6.0</checkstyle-plugin.version> + <checkstyle.version>10.25.0</checkstyle.version> <enforcer-plugin.version>3.5.0</enforcer-plugin.version> - <extra-enforcer-rules.version>1.8.0</extra-enforcer-rules.version> + <extra-enforcer-rules.version>1.10.0</extra-enforcer-rules.version> <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version> - <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version> - <maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version> - <maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version> - <maven-plugin-plugin.version>3.13.1</maven-plugin-plugin.version> - <maven-remote-resources-plugin.version>3.2.0</maven-remote-resources-plugin.version> + <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version> + <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version> + <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version> + <maven-plugin-plugin.version>3.15.1</maven-plugin-plugin.version> + <maven-remote-resources-plugin.version>3.3.0</maven-remote-resources-plugin.version> <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version> <maven-source-plugin.version>3.3.1</maven-source-plugin.version> <maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version> <plugin-tools-javadoc.version>3.5.2</plugin-tools-javadoc.version> - <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version> - <maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version> + <spotless-maven-plugin.version>2.44.5</spotless-maven-plugin.version> + <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version> <!-- Pin output timestamp to make the Java build reproducible --> <project.build.outputTimestamp>1721935492</project.build.outputTimestamp> @@ -423,11 +423,13 @@ <exclude>**/.gitmodules</exclude> <!-- Hugo / Docsy --> <exclude>doc/build/**</exclude> + <exclude>doc/content/**</exclude> <exclude>doc/themes/docsy/**</exclude> <exclude>doc/examples/java-example/target/**</exclude> <exclude>doc/examples/mr-example/target/**</exclude> <exclude>doc/node_modules/**</exclude> <exclude>**/.hugo_build.lock</exclude> + <exclude>doc/go.sum</exclude> <!-- build or test files (some are generated files that we commit as-is for testing purposes) --> <exclude>**/*.log</exclude> <exclude>**/*.rej</exclude> @@ -455,6 +457,7 @@ <exclude>lang/rust/Cargo.lock</exclude> <exclude>lang/rust/README.tpl</exclude> <exclude>lang/rust/.requirements-precommit.txt</exclude> + <exclude>lang/rust/README.md</exclude> <exclude>lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithLogicalTypes.java</exclude> <exclude>lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithoutLogicalTypes.java</exclude> <exclude>lang/java/avro/src/test/java/org/apache/avro/specific/int$.java</exclude> diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile index 1b6deaa6ca..6a8771042d 100644 --- a/share/docker/Dockerfile +++ b/share/docker/Dockerfile @@ -94,14 +94,6 @@ RUN apt-get -qqy install --no-install-recommends libzstd-dev \ php-mbstring \ php-dev -# Required for Dotnet -RUN export ARCH="$(dpkg --print-architecture)"; \ - export LIBSSL_DEB="libssl1.1_1.1.1f-1ubuntu2.22_$ARCH.deb"; \ - wget -q "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/$LIBSSL_DEB"; || \ - wget -q "http://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/$LIBSSL_DEB";; \ - dpkg -i "$LIBSSL_DEB"; \ - rm "$LIBSSL_DEB" - # Install a maven release ------------------------------------------- # Inspired from https://github.com/apache/accumulo-docker/blob/bbb9892e165d40fb35fa19f38929effc5d0c709b/Dockerfile#L30 ENV MAVEN_VERSION 3.9.6
