Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions .github/workflows/codeql-java-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,14 @@ jobs:
with:
distribution: 'temurin'
java-version: |
8
11
17
21

- name: 'Setup Maven 3.9.11'
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: 'Setup Maven 3.9.15'
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ jobs:
${{ runner.os }}-maven-

- name: 'Setup Maven'
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.9
maven-version: 3.9.15

- name: Setup Temurin JDK
uses: actions/setup-java@v5
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/java-publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,14 @@ jobs:
with:
distribution: 'temurin'
java-version: |
8
11
17
21

- name: 'Setup Maven'
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.8
maven-version: 3.9.15

- name: 'Deploy Maven snapshots'
env:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/maven4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,14 @@ jobs:
with:
distribution: 'temurin'
java-version: |
8
11
17
21

- name: Setup Maven 4
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
uses: stCarolas/setup-maven@v5
with:
maven-version: 4.0.0-alpha-10
maven-version: 4.0.0-rc-5

- name: Test
run: mvn clean verify
7 changes: 3 additions & 4 deletions .github/workflows/rat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,14 @@ jobs:
with:
distribution: 'temurin'
java-version: |
8
11
17
21

- name: 'Setup Maven 3.9.11'
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: 'Setup Maven 3.9.15'
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

- name: Run Rat
run: mvn test -Dmaven.main.skip=true -Dmaven.test.skip=true -DskipTests=true -Dinvoker.skip=true -P rat -pl :avro-toplevel
7 changes: 3 additions & 4 deletions .github/workflows/spotless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,14 @@ jobs:
with:
distribution: 'temurin'
java-version: |
8
11
17
21

- name: 'Setup Maven 3.9.11'
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: 'Setup Maven 3.9.15'
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

- name: Run Spotless Check
run: mvn spotless:check
14 changes: 6 additions & 8 deletions .github/workflows/test-lang-c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,14 @@ jobs:
with:
distribution: 'temurin'
java-version: |
8
11
17
21

- name: 'Setup Maven 3.9.11'
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: 'Setup Maven 3.9.15'
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

- name: Install Java Avro for Interop Test
working-directory: .
Expand Down Expand Up @@ -133,15 +132,14 @@ jobs:
with:
distribution: 'temurin'
java-version: |
8
11
17
21

- name: 'Setup Maven 3.9.11'
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: 'Setup Maven 3.9.15'
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

- name: Install Java Avro for Interop Test
working-directory: .
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/test-lang-csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,14 @@ jobs:
with:
distribution: 'temurin'
java-version: |
8
11
17
21

- name: 'Setup Maven 3.9.11'
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: 'Setup Maven 3.9.15'
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

- name: Install Java Avro for Interop Test
working-directory: .
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test-lang-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ jobs:
17
21

- name: "Setup Maven 3.9.11"
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: "Setup Maven 3.9.15"
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

- name: "Install Java Avro Toplevel"
working-directory: ./
Expand Down Expand Up @@ -115,10 +115,10 @@ jobs:
17
21

- name: "Setup Maven 3.9.11"
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: "Setup Maven 3.9.15"
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

- name: "Setup Python for Generating Input Data"
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/test-lang-perl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,14 @@ jobs:
with:
distribution: 'temurin'
java-version: |
8
11
17
21

- name: 'Setup Maven 3.9.11'
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: 'Setup Maven 3.9.15'
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

- name: Install Java Avro for Interop Test
working-directory: .
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/test-lang-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,14 @@ jobs:
with:
distribution: 'temurin'
java-version: |
8
11
17
21

- name: 'Setup Maven 3.9.11'
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: 'Setup Maven 3.9.15'
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

- name: Install Java Avro for Interop Test
working-directory: .
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/test-lang-py.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,14 @@ jobs:
with:
distribution: "temurin"
java-version: |
8
11
17
21

- name: "Setup Maven 3.9.11"
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: "Setup Maven 3.9.15"
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

- name: Install Java Avro for Interop Test
working-directory: .
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/test-lang-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,14 @@ jobs:
with:
distribution: 'temurin'
java-version: |
8
11
17
21

- name: 'Setup Maven 3.9.11'
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
- name: 'Setup Maven 3.9.15'
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.11
maven-version: 3.9.15

- name: Install Java Avro for Interop Test
working-directory: .
Expand Down
75 changes: 75 additions & 0 deletions .mvn/build-cache-config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?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.
-->
<cache xmlns="http://maven.apache.org/BUILD-CACHE-CONFIG/1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-CONFIG/1.2.0 https://maven.apache.org/xsd/build-cache-config-1.2.0.xsd">
<configuration>
<enabled>true</enabled>
<hashAlgorithm>SHA-256</hashAlgorithm>
<validateXml>true</validateXml>
<local>
<maxBuildsCached>3</maxBuildsCached>
</local>
<projectVersioning adjustMetaInf="true"/>
</configuration>
<input>
<global>
<glob>
{*.java,*.groovy,*.yaml,*.svcd,*.proto,*assembly.xml,assembly*.xml,*logback.xml,*.vm,*.ini,*.jks,*.properties,*.sh,*.bat}
</glob>
<includes>
<include>src/</include>
</includes>
<excludes>
<exclude>pom.xml</exclude>
</excludes>
</global>
</input>
<executionControl>
<runAlways>
<goalsLists>
<goalsList artifactId="maven-install-plugin">
<goals>
<goal>install</goal>
</goals>
</goalsList>
<goalsList artifactId="maven-deploy-plugin">
<goals>
<goal>deploy</goal>
</goals>
</goalsList>
</goalsLists>
</runAlways>
<reconcile logAllProperties="true">
<plugins>
<plugin artifactId="maven-compiler-plugin" goal="compile">
<reconciles>
<reconcile propertyName="source"/>
<reconcile propertyName="target"/>
<reconcile propertyName="debug"/>
<reconcile propertyName="debuglevel"/>
</reconciles>
</plugin>
<plugin artifactId="maven-enforcer-plugin" goal="enforce">
<reconciles>
<reconcile propertyName="skip" skipValue="true"/>
</reconciles>
</plugin>
</plugins>
</reconcile>
</executionControl>
</cache>
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<extension>
<groupId>org.apache.maven.extensions</groupId>
<artifactId>maven-build-cache-extension</artifactId>
<version>1.0.1</version>
<version>1.2.2</version>
</extension>
</extensions>
2 changes: 1 addition & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

The following packages must be installed before Avro can be built:

- Java: 11, 17 and 21 with the appropriate toolchain config, Maven 3.9.6 or better, protobuf-compile
- Java: 11, 17 and 21 with the appropriate toolchain config, Maven 3.9.15 or better, protobuf-compile
- PHP: php8, phpunit, php8-gmp
- Python 3: 3.10 or greater, tox (tox will install other dependencies as needed)
- C: gcc, cmake, asciidoc, source-highlight, Jansson, pkg-config
Expand Down
3 changes: 0 additions & 3 deletions lang/java/avro/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<parallel>none</parallel>
</configuration>
<executions>
<execution>
<id>test-with-custom-coders</id>
Expand Down
4 changes: 0 additions & 4 deletions lang/java/compiler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- some tests hang if not run in a separate JVM -->
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<parallel>none</parallel>
<systemPropertyVariables>
<test.idl.dir>${project.basedir}/src/test/idl</test.idl.dir>
</systemPropertyVariables>
Expand Down
2 changes: 0 additions & 2 deletions lang/java/ipc-jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- some tests hang if not run in a separate JVM -->
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<parallel>none</parallel>
</configuration>
</plugin>
<plugin>
Expand Down
Loading
Loading