Skip to content

Commit

Permalink
Merge pull request #27851: Remove Avro-related code from Java SDK "co…
Browse files Browse the repository at this point in the history
…re" module
  • Loading branch information
aromanenko-dev authored Oct 18, 2023
2 parents 695dd41 + 0850a6c commit 5fd1245
Show file tree
Hide file tree
Showing 47 changed files with 129 additions and 11,746 deletions.
10 changes: 8 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@

## Highlights

* New highly anticipated feature X added to Python SDK ([#X](https://github.com/apache/beam/issues/X)).
* New highly anticipated feature Y added to Java SDK ([#Y](https://github.com/apache/beam/issues/Y)).
* Previously deprecated Avro-dependent code (Beam Release 2.46.0) has been finally removed from Java SDK "core" package.
Please, use `beam-sdks-java-extensions-avro` instead. This will allow to easily update Avro version in user code without
potential breaking changes in Beam "core" since the Beam Avro extension already supports the latest Avro versions and
should handle this. ([#25252](https://github.com/apache/beam/issues/25252)).

## I/Os

Expand All @@ -71,6 +73,10 @@
## Breaking Changes

* X behavior was changed ([#X](https://github.com/apache/beam/issues/X)).
* `org.apache.beam.sdk.io.CountingSource.CounterMark` uses custom `CounterMarkCoder` as a default coder since all Avro-dependent
classes finally moved to `extensions/avro`. In case if it's still required to use `AvroCoder` for `CounterMark`, then,
as a workaround, a copy of "old" `CountingSource` class should be placed into a project code and used directly
([#25252](https://github.com/apache/beam/issues/25252)).

## Deprecations

Expand Down
6 changes: 2 additions & 4 deletions sdks/java/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ applyJavaNature(
relocate "org.antlr.v4", getJavaRelocatedPath("org.antlr.v4")
},
)
applyAvroNature()
applyAntlrNature()

generateGrammarSource {
Expand Down Expand Up @@ -89,7 +88,6 @@ dependencies {
shadow library.java.jackson_annotations
shadow library.java.jackson_databind
shadow library.java.slf4j_api
shadow library.java.avro
shadow library.java.snappy_java
shadow library.java.joda_time
implementation enforcedPlatform(library.java.google_cloud_platform_libraries_bom)
Expand All @@ -114,7 +112,6 @@ dependencies {
shadowTest "com.esotericsoftware.kryo:kryo:2.21"
shadowTest library.java.quickcheck_core
shadowTest library.java.quickcheck_generators
shadowTest library.java.avro_tests
shadowTest library.java.zstd_jni
shadowTest library.java.commons_logging
shadowTest library.java.log4j
Expand All @@ -124,5 +121,6 @@ dependencies {
}

project.tasks.compileTestJava {
options.compilerArgs += ['-Xlint:-rawtypes'] // generated avro uses rawtypes without suppression
// TODO: fix other places with warnings in tests and delete this option
options.compilerArgs += ['-Xlint:-rawtypes']
}
Loading

0 comments on commit 5fd1245

Please sign in to comment.