Skip to content

Bump Maven plugin versions and maven version for the docker based build #1983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iemejia merged 2 commits into from
Nov 25, 2022
Merged

Bump Maven plugin versions and maven version for the docker based build #1983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
460d8d5
Bump plugin versions and maven version for the docker based build
iemejia Nov 25, 2022
cb6cc70
Setup Maven 4 cache extension
iemejia Nov 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extension>
<groupId>org.apache.maven.extensions</groupId>
<artifactId>maven-build-cache-extension</artifactId>
<version>1.0.0</version>
</extension>
</extensions>
2 changes: 1 addition & 1 deletion lang/java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<includes>
<!-- Avro naming convention for JUnit tests -->
Expand Down
20 changes: 11 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>27</version>
<version>28</version>
</parent>

<groupId>org.apache.avro</groupId>
Expand All @@ -47,20 +47,20 @@
<avro.docDir>build/avro-doc-${project.version}/api</avro.docDir>

<!-- plugin versions -->
<apache-rat-plugin.version>0.14</apache-rat-plugin.version>
<checkstyle-plugin.version>3.1.2</checkstyle-plugin.version>
<apache-rat-plugin.version>0.15</apache-rat-plugin.version>
<checkstyle-plugin.version>3.2.0</checkstyle-plugin.version>
<checkstyle.version>9.3</checkstyle.version>
<enforcer-plugin.version>3.1.0</enforcer-plugin.version>
<extra-enforcer-rules.version>1.6.1</extra-enforcer-rules.version>
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
<maven-plugin-plugin.version>3.6.4</maven-plugin-plugin.version>
<maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
<maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<plugin-tools-javadoc.version>3.5</plugin-tools-javadoc.version>
<spotless-maven-plugin.version>2.23.0</spotless-maven-plugin.version>
<surefire.version>3.0.0-M5</surefire.version>
<plugin-tools-javadoc.version>3.7.0</plugin-tools-javadoc.version>
<spotless-maven-plugin.version>2.27.2</spotless-maven-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>

<!-- Pin output timestamp to make the Java build reproducible -->
<project.build.outputTimestamp>10</project.build.outputTimestamp>
Expand Down Expand Up @@ -359,11 +359,13 @@
<exclude>**/.gitattributes</exclude>
<exclude>**/.gitignore</exclude>
<exclude>**/.gitmodules</exclude>
<!-- Docsy -->
<!-- Hugo / Docsy -->
<exclude>doc/build/**</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>
<!-- build or test files (some are generated files that we commit as-is for testing purposes) -->
<exclude>**/*.log</exclude>
<exclude>**/*.rej</exclude>
Expand Down
2 changes: 1 addition & 1 deletion share/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ RUN apt-get -qqy install --no-install-recommends libzstd-dev \

# Install a maven release -------------------------------------------
# Inspired from https://github.com/apache/accumulo-docker/blob/master/Dockerfile#L53
ENV MAVEN_VERSION 3.8.4
ENV MAVEN_VERSION 3.8.6
ENV APACHE_DIST_URLS \
https://www.apache.org/dyn/closer.cgi?action=download&filename= \
# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/
Expand Down