From 19a82809a29e4ce93217018cfc3915568a760733 Mon Sep 17 00:00:00 2001 From: Fokko Date: Thu, 8 Aug 2024 15:08:50 +0200 Subject: [PATCH 1/5] Move to 1.13.0-SNAPSHOT --- lang/java/android/pom.xml | 2 +- lang/java/archetypes/avro-service-archetype/pom.xml | 2 +- lang/java/archetypes/pom.xml | 2 +- lang/java/avro/pom.xml | 2 +- lang/java/compiler/pom.xml | 2 +- lang/java/grpc/pom.xml | 2 +- lang/java/idl/pom.xml | 2 +- lang/java/integration-test/codegen-test/pom.xml | 2 +- lang/java/integration-test/pom.xml | 2 +- lang/java/integration-test/test-custom-conversions/pom.xml | 2 +- lang/java/interop-data-test/pom.xml | 2 +- lang/java/ipc-jetty/pom.xml | 2 +- lang/java/ipc-netty/pom.xml | 2 +- lang/java/ipc/pom.xml | 2 +- lang/java/mapred/pom.xml | 2 +- lang/java/maven-plugin/pom.xml | 2 +- .../test/resources/unit/idl/pom-incremental-compilation.xml | 2 +- .../test/resources/unit/idl/pom-injecting-velocity-tools.xml | 2 +- .../maven-plugin/src/test/resources/unit/idl/pom-javacc.xml | 2 +- lang/java/maven-plugin/src/test/resources/unit/idl/pom.xml | 2 +- .../resources/unit/protocol/pom-injecting-velocity-tools.xml | 2 +- .../maven-plugin/src/test/resources/unit/protocol/pom.xml | 2 +- .../src/test/resources/unit/schema/pom-multiple-schema.xml | 2 +- .../src/test/resources/unit/schema/pom-nonexistent-file.xml | 2 +- .../resources/unit/schema/pom-nonexistent-second-file.xml | 2 +- lang/java/maven-plugin/src/test/resources/unit/schema/pom.xml | 2 +- lang/java/perf/pom.xml | 2 +- lang/java/pom.xml | 2 +- lang/java/protobuf/pom.xml | 2 +- lang/java/thrift/pom.xml | 2 +- lang/java/tools/pom.xml | 2 +- lang/java/trevni/avro/pom.xml | 2 +- lang/java/trevni/core/pom.xml | 2 +- lang/java/trevni/doc/pom.xml | 2 +- lang/java/trevni/pom.xml | 2 +- lang/js/package.json | 2 +- pom.xml | 4 ++-- share/VERSION.txt | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lang/java/android/pom.xml b/lang/java/android/pom.xml index c56126efdb1..5a054dd536d 100644 --- a/lang/java/android/pom.xml +++ b/lang/java/android/pom.xml @@ -22,7 +22,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/archetypes/avro-service-archetype/pom.xml b/lang/java/archetypes/avro-service-archetype/pom.xml index 371c312bc14..83d59dd4470 100644 --- a/lang/java/archetypes/avro-service-archetype/pom.xml +++ b/lang/java/archetypes/avro-service-archetype/pom.xml @@ -23,7 +23,7 @@ avro-archetypes-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/archetypes/pom.xml b/lang/java/archetypes/pom.xml index d32cfd9f9b9..6d2d6641b72 100644 --- a/lang/java/archetypes/pom.xml +++ b/lang/java/archetypes/pom.xml @@ -22,7 +22,7 @@ org.apache.avro avro-parent - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/avro/pom.xml b/lang/java/avro/pom.xml index 9d5b40d6958..e776c665571 100644 --- a/lang/java/avro/pom.xml +++ b/lang/java/avro/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/compiler/pom.xml b/lang/java/compiler/pom.xml index 2019318ee97..be3163cac0a 100644 --- a/lang/java/compiler/pom.xml +++ b/lang/java/compiler/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/grpc/pom.xml b/lang/java/grpc/pom.xml index fe7f5c02287..12ef6e4158c 100644 --- a/lang/java/grpc/pom.xml +++ b/lang/java/grpc/pom.xml @@ -23,7 +23,7 @@ org.apache.avro avro-parent - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/idl/pom.xml b/lang/java/idl/pom.xml index 8319648c1bd..118dcd06b12 100644 --- a/lang/java/idl/pom.xml +++ b/lang/java/idl/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/integration-test/codegen-test/pom.xml b/lang/java/integration-test/codegen-test/pom.xml index 760bea934aa..ad588251ea2 100644 --- a/lang/java/integration-test/codegen-test/pom.xml +++ b/lang/java/integration-test/codegen-test/pom.xml @@ -23,7 +23,7 @@ avro-integration-test org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/integration-test/pom.xml b/lang/java/integration-test/pom.xml index bc27a788170..009cba008e8 100644 --- a/lang/java/integration-test/pom.xml +++ b/lang/java/integration-test/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/integration-test/test-custom-conversions/pom.xml b/lang/java/integration-test/test-custom-conversions/pom.xml index 9a5dc836982..8a0d5ece28d 100644 --- a/lang/java/integration-test/test-custom-conversions/pom.xml +++ b/lang/java/integration-test/test-custom-conversions/pom.xml @@ -23,7 +23,7 @@ avro-integration-test org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/interop-data-test/pom.xml b/lang/java/interop-data-test/pom.xml index 16b1c2022ea..e59907dd163 100644 --- a/lang/java/interop-data-test/pom.xml +++ b/lang/java/interop-data-test/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/ipc-jetty/pom.xml b/lang/java/ipc-jetty/pom.xml index 2ee6248d34f..fdc2a258bdc 100644 --- a/lang/java/ipc-jetty/pom.xml +++ b/lang/java/ipc-jetty/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/ipc-netty/pom.xml b/lang/java/ipc-netty/pom.xml index 6b316c4a9b3..be5ab63d850 100644 --- a/lang/java/ipc-netty/pom.xml +++ b/lang/java/ipc-netty/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/ipc/pom.xml b/lang/java/ipc/pom.xml index 5a86e1393f7..a12798488bd 100644 --- a/lang/java/ipc/pom.xml +++ b/lang/java/ipc/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/mapred/pom.xml b/lang/java/mapred/pom.xml index 58bd712a229..5c4d8733cf3 100644 --- a/lang/java/mapred/pom.xml +++ b/lang/java/mapred/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/maven-plugin/pom.xml b/lang/java/maven-plugin/pom.xml index 9f9ab3859c9..96d7289a7b4 100644 --- a/lang/java/maven-plugin/pom.xml +++ b/lang/java/maven-plugin/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-incremental-compilation.xml b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-incremental-compilation.xml index ddf8ff0bd08..8dabfa4c131 100644 --- a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-incremental-compilation.xml +++ b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-incremental-compilation.xml @@ -22,7 +22,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../../../../../../../../../pom.xml diff --git a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-injecting-velocity-tools.xml b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-injecting-velocity-tools.xml index 297dd6a1c21..0fe5430f642 100644 --- a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-injecting-velocity-tools.xml +++ b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-injecting-velocity-tools.xml @@ -22,7 +22,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../../../../../../../../../ diff --git a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-javacc.xml b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-javacc.xml index 4abd67f7bca..20700f5072f 100644 --- a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-javacc.xml +++ b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-javacc.xml @@ -22,7 +22,7 @@ avro-parent org.apache.avro - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../../../../../../../../../pom.xml diff --git a/lang/java/maven-plugin/src/test/resources/unit/idl/pom.xml b/lang/java/maven-plugin/src/test/resources/unit/idl/pom.xml index 725a6480e43..aae65a9792a 100644 --- a/lang/java/maven-plugin/src/test/resources/unit/idl/pom.xml +++ b/lang/java/maven-plugin/src/test/resources/unit/idl/pom.xml @@ -22,7 +22,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../../../../../../../../../pom.xml diff --git a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-injecting-velocity-tools.xml b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-injecting-velocity-tools.xml index eb1e6a87bbd..c58dfee7123 100644 --- a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-injecting-velocity-tools.xml +++ b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-injecting-velocity-tools.xml @@ -22,7 +22,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../../../../../../../../../ diff --git a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom.xml b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom.xml index 8391e33e0e4..60a503da804 100644 --- a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom.xml +++ b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom.xml @@ -22,7 +22,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../../../../../../../../../pom.xml diff --git a/lang/java/maven-plugin/src/test/resources/unit/schema/pom-multiple-schema.xml b/lang/java/maven-plugin/src/test/resources/unit/schema/pom-multiple-schema.xml index 10b0b3fae80..401b65d3a35 100644 --- a/lang/java/maven-plugin/src/test/resources/unit/schema/pom-multiple-schema.xml +++ b/lang/java/maven-plugin/src/test/resources/unit/schema/pom-multiple-schema.xml @@ -22,7 +22,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../../../../../../../../../pom.xml diff --git a/lang/java/maven-plugin/src/test/resources/unit/schema/pom-nonexistent-file.xml b/lang/java/maven-plugin/src/test/resources/unit/schema/pom-nonexistent-file.xml index 49965752d0d..0efde4e8dde 100644 --- a/lang/java/maven-plugin/src/test/resources/unit/schema/pom-nonexistent-file.xml +++ b/lang/java/maven-plugin/src/test/resources/unit/schema/pom-nonexistent-file.xml @@ -22,7 +22,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../../../../../../../../../pom.xml diff --git a/lang/java/maven-plugin/src/test/resources/unit/schema/pom-nonexistent-second-file.xml b/lang/java/maven-plugin/src/test/resources/unit/schema/pom-nonexistent-second-file.xml index f5b7134cd55..71ec6e10393 100644 --- a/lang/java/maven-plugin/src/test/resources/unit/schema/pom-nonexistent-second-file.xml +++ b/lang/java/maven-plugin/src/test/resources/unit/schema/pom-nonexistent-second-file.xml @@ -22,7 +22,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../../../../../../../../../pom.xml diff --git a/lang/java/maven-plugin/src/test/resources/unit/schema/pom.xml b/lang/java/maven-plugin/src/test/resources/unit/schema/pom.xml index dc93f578baf..fbc1b6e345a 100644 --- a/lang/java/maven-plugin/src/test/resources/unit/schema/pom.xml +++ b/lang/java/maven-plugin/src/test/resources/unit/schema/pom.xml @@ -22,7 +22,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../../../../../../../../../pom.xml diff --git a/lang/java/perf/pom.xml b/lang/java/perf/pom.xml index 479f9bd760c..f855406de1d 100644 --- a/lang/java/perf/pom.xml +++ b/lang/java/perf/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/pom.xml b/lang/java/pom.xml index d7b88a1d5fe..fc85cc48578 100644 --- a/lang/java/pom.xml +++ b/lang/java/pom.xml @@ -22,7 +22,7 @@ org.apache.avro avro-toplevel - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../../pom.xml diff --git a/lang/java/protobuf/pom.xml b/lang/java/protobuf/pom.xml index aa657b7a0ee..5ec2a27b265 100644 --- a/lang/java/protobuf/pom.xml +++ b/lang/java/protobuf/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/thrift/pom.xml b/lang/java/thrift/pom.xml index 1140f8ce699..2ba57eeb221 100644 --- a/lang/java/thrift/pom.xml +++ b/lang/java/thrift/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/tools/pom.xml b/lang/java/tools/pom.xml index e841c8d84fd..1342458dd5b 100644 --- a/lang/java/tools/pom.xml +++ b/lang/java/tools/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/trevni/avro/pom.xml b/lang/java/trevni/avro/pom.xml index a50cc028e5e..4cedaa075dd 100644 --- a/lang/java/trevni/avro/pom.xml +++ b/lang/java/trevni/avro/pom.xml @@ -22,7 +22,7 @@ trevni-java org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/trevni/core/pom.xml b/lang/java/trevni/core/pom.xml index 365cf6f50f7..195de18e2c2 100644 --- a/lang/java/trevni/core/pom.xml +++ b/lang/java/trevni/core/pom.xml @@ -22,7 +22,7 @@ trevni-java org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/java/trevni/doc/pom.xml b/lang/java/trevni/doc/pom.xml index e12420112e0..064fffd8769 100644 --- a/lang/java/trevni/doc/pom.xml +++ b/lang/java/trevni/doc/pom.xml @@ -22,7 +22,7 @@ trevni-java org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT .. diff --git a/lang/java/trevni/pom.xml b/lang/java/trevni/pom.xml index 464eee7b167..1a1e8581acb 100644 --- a/lang/java/trevni/pom.xml +++ b/lang/java/trevni/pom.xml @@ -23,7 +23,7 @@ avro-parent org.apache.avro - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT ../pom.xml diff --git a/lang/js/package.json b/lang/js/package.json index f71ba38c7d5..d4a64d516ad 100644 --- a/lang/js/package.json +++ b/lang/js/package.json @@ -1,6 +1,6 @@ { "name": "avro-js", - "version": "1.12.0-SNAPSHOT", + "version": "1.13.0-SNAPSHOT", "author": "Avro Developers ", "description": "JavaScript Avro implementation", "contributors": [ diff --git a/pom.xml b/pom.xml index 4f88c324ae1..be62e977fad 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.avro avro-toplevel - 1.12.0-SNAPSHOT + 1.13.0-SNAPSHOT pom Apache Avro Toplevel @@ -66,7 +66,7 @@ 3.3.1 - 10 + 1723122283 diff --git a/share/VERSION.txt b/share/VERSION.txt index e84fa45fa6e..e9172f4ccf5 100644 --- a/share/VERSION.txt +++ b/share/VERSION.txt @@ -1 +1 @@ -1.12.0-SNAPSHOT \ No newline at end of file +1.13.0-SNAPSHOT From 3a8b91f2bfde8810e9f8fd0f2b132d80a92978f3 Mon Sep 17 00:00:00 2001 From: Fokko Date: Thu, 8 Aug 2024 17:23:02 +0200 Subject: [PATCH 2/5] Add `mvn install` to publish the artifacts locally --- .github/workflows/test-lang-java.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml index bca1f0b7ae8..6686a6c8d78 100644 --- a/.github/workflows/test-lang-java.yml +++ b/.github/workflows/test-lang-java.yml @@ -63,15 +63,19 @@ jobs: with: maven-version: 3.9.6 + - name: 'Install Java Avro' + working-directory: . + run: mvn -B install -PskipQuality -DskipTests + - name: 'Java Lint' run: ./build.sh lint - name: 'Java Test' run: ./build.sh test - - name: 'Install Java Avro for reproducibility test' + - name: 'Install Java Avro' working-directory: . - run: mvn -B clean install -PskipQuality + run: mvn -B clean install -PskipQuality -DskipTests - name: 'Test Reproducible Build' working-directory: . From fccb2a700ad5de7fd6359f2a2640df8bd11f9413 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Fri, 9 Aug 2024 10:29:04 +0300 Subject: [PATCH 3/5] `mvn install` without tests Same as https://github.com/apache/avro/pull/3076/commits/3a8b91f2bfde8810e9f8fd0f2b132d80a92978f3 but for Java ARM workflow Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/test-lang-java-ARM.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-lang-java-ARM.yml b/.github/workflows/test-lang-java-ARM.yml index ba48cf194f5..a12aa93fd06 100644 --- a/.github/workflows/test-lang-java-ARM.yml +++ b/.github/workflows/test-lang-java-ARM.yml @@ -65,6 +65,9 @@ jobs: with: maven-version: 3.9.6 + - name: 'Install Java Avro' + run: mvn -B install -PskipQuality -DskipTests + - name: Build run: ./build.sh clean test # set -x From 3c516077bc7fa0a9512e7a7efd825375dac04e76 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Fri, 9 Aug 2024 11:12:04 +0200 Subject: [PATCH 4/5] Install from toplevel --- .github/workflows/test-lang-java.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml index 6686a6c8d78..96333670e3e 100644 --- a/.github/workflows/test-lang-java.yml +++ b/.github/workflows/test-lang-java.yml @@ -64,7 +64,7 @@ jobs: maven-version: 3.9.6 - name: 'Install Java Avro' - working-directory: . + working-directory: /runner/_work/avro/avro run: mvn -B install -PskipQuality -DskipTests - name: 'Java Lint' From c9a880741247872d8b8ab432e83d59302be906d4 Mon Sep 17 00:00:00 2001 From: Fokko Date: Wed, 14 Aug 2024 16:02:41 +0200 Subject: [PATCH 5/5] Test --- .github/workflows/test-lang-java-ARM.yml | 3 ++- .github/workflows/test-lang-java.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-lang-java-ARM.yml b/.github/workflows/test-lang-java-ARM.yml index a12aa93fd06..af3cd750454 100644 --- a/.github/workflows/test-lang-java-ARM.yml +++ b/.github/workflows/test-lang-java-ARM.yml @@ -65,7 +65,8 @@ jobs: with: maven-version: 3.9.6 - - name: 'Install Java Avro' + - name: 'Install Java Avro Toplevel' + working-directory: ./ run: mvn -B install -PskipQuality -DskipTests - name: Build diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml index 96333670e3e..168d8fc5a73 100644 --- a/.github/workflows/test-lang-java.yml +++ b/.github/workflows/test-lang-java.yml @@ -63,8 +63,8 @@ jobs: with: maven-version: 3.9.6 - - name: 'Install Java Avro' - working-directory: /runner/_work/avro/avro + - name: 'Install Java Avro Toplevel' + working-directory: ./ run: mvn -B install -PskipQuality -DskipTests - name: 'Java Lint'