Skip to content
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

chore(deps): bump avro.version from 1.11.3 to 1.12.0 (#91) #93

Merged
merged 3 commits into from
Aug 6, 2024
Merged

chore(deps): bump avro.version from 1.11.3 to 1.12.0 (#91) #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea93b1c
chore(deps): bump avro.version from 1.11.3 to 1.12.0 (#91)
dependabot[bot] Aug 6, 2024
e47b6af
use 1.12, fix tests
jangalinski Aug 6, 2024
fa4cf1b
use parent 2024.8.1 & clean up
jangalinski Aug 6, 2024
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
2 changes: 1 addition & 1 deletion _examples/java-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-examples-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
</parent>

<groupId>io.toolisticon.kotlin.avro.examples</groupId>
Expand Down
2 changes: 1 addition & 1 deletion _examples/kotlin-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-examples-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
</parent>

<groupId>io.toolisticon.kotlin.avro.examples</groupId>
Expand Down
2 changes: 1 addition & 1 deletion _examples/logical-type-customer-id/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-examples-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
</parent>

<groupId>io.toolisticon.kotlin.avro.examples</groupId>
Expand Down
2 changes: 1 addition & 1 deletion _examples/logical-type-money/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-examples-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
</parent>

<groupId>io.toolisticon.kotlin.avro.examples</groupId>
Expand Down
2 changes: 1 addition & 1 deletion _examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
</parent>

<artifactId>avro-kotlin-examples-root</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion _mvn/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion _mvn/coverage-aggregator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion _mvn/parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion _test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-parent</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
<relativePath>../_mvn/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion avro-kotlin-serialization/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-parent</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
<relativePath>../_mvn/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion avro-kotlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-parent</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
<relativePath>../_mvn/parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion avro-kotlin/src/test/kotlin/ktx/ResourceKtxTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ internal class ResourceKtxTest {
val resources = ResourceKtx.findAvroResources()
assertThat(resources.keys).containsExactlyInAnyOrder(AvroSpecification.PROTOCOL, AvroSpecification.SCHEMA)
assertThat(resources[AvroSpecification.SCHEMA]).hasSize(56)
assertThat(resources[AvroSpecification.PROTOCOL]).hasSize(26)
assertThat(resources[AvroSpecification.PROTOCOL]).hasSize(25)
}
}
7 changes: 4 additions & 3 deletions avro-kotlin/src/test/kotlin/model/BytesTypeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.toolisticon.kotlin.avro.model

import io.toolisticon.kotlin.avro.builder.AvroBuilder.primitiveSchema
import io.toolisticon.kotlin.avro.model.SchemaType.STRING
import io.toolisticon.kotlin.avro.model.SchemaType.BYTES
import io.toolisticon.kotlin.avro.value.ObjectProperties
import org.apache.avro.LogicalTypes
Expand All @@ -12,13 +13,13 @@ internal class BytesTypeTest {
@Test
fun `verify to string`() {
val schema = primitiveSchema(
type = BYTES,
type = STRING,
logicalType = LogicalTypes.uuid(),
properties = ObjectProperties("foo" to 5)
)
val type = BytesType(schema)
val type = StringType(schema)

assertThat(type).hasToString("BytesType(logicalType='uuid', properties={foo=5})")
assertThat(type).hasToString("StringType(logicalType='uuid', properties={foo=5})")
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion avro-kotlin/src/test/kotlin/value/ObjectPropertiesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ internal class ObjectPropertiesTest {
@Test
fun `with properties and logicalType`() {
val schema = primitiveSchema(
type = BYTES,
type = STRING,
properties = ObjectProperties("xxx" to "value"),
logicalType = LogicalTypes.uuid()
)
Expand Down
91 changes: 0 additions & 91 deletions avro-kotlin/src/test/resources/org.apache.avro/protocol/order-service.avpr
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion lib/avro-compiler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-lib-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
</parent>

<groupId>io.toolisticon.kotlin.avro.lib</groupId>
Expand Down
38 changes: 1 addition & 37 deletions lib/avro-ipc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,14 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-lib-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
</parent>

<groupId>io.toolisticon.kotlin.avro.lib</groupId>
<artifactId>avro-ipc</artifactId>
<name>lib: ${project.artifactId}</name>
<description>Replace outdated dependencies of org.apache.avro/avro-ipc.</description>

<!-- <dependencyManagement>-->
<!-- <dependencies>-->

<!-- -->


<!-- &lt;!&ndash; commons-compress: replaces transitive dependency of org.apache.avro:avro &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.apache.commons</groupId>-->
<!-- <artifactId>commons-compress</artifactId>-->
<!-- <version>${commons-compress.version}</version>-->
<!-- </dependency>-->

<!-- &lt;!&ndash; AVRO4K(${avro4k.version}) &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.github.avro-kotlin.avro4k</groupId>-->
<!-- <artifactId>avro4k-core</artifactId>-->
<!-- <version>${avro4k.version}</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.apache.avro</groupId>-->
<!-- <artifactId>avro</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.xerial.snappy</groupId>-->
<!-- <artifactId>snappy-java</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </dependencyManagement>-->

<dependencies>

<!-- AVRO-IPC(${avro.version}) - without snappy -->
Expand Down Expand Up @@ -87,10 +55,6 @@
</dependencies>

<build>
<!-- configure to be an ordinary Java Project -->
<!-- <sourceDirectory>src/main/java</sourceDirectory>-->
<!-- <testSourceDirectory>src/test/java</testSourceDirectory>-->

<plugins>
<plugin>
<!-- skip kotlin compiler -->
Expand Down
2 changes: 1 addition & 1 deletion lib/avro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-lib-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
</parent>

<groupId>io.toolisticon.kotlin.avro.lib</groupId>
Expand Down
2 changes: 1 addition & 1 deletion lib/avro4k-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-lib-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
</parent>

<groupId>io.toolisticon.kotlin.avro.lib</groupId>
Expand Down
4 changes: 2 additions & 2 deletions lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>
</parent>

<artifactId>avro-lib-root</artifactId>
Expand All @@ -14,7 +14,7 @@
<name>pom: ${project.artifactId}</name>

<properties>
<avro.version>1.11.3</avro.version>
<avro.version>1.12.0</avro.version>
<avro4k.version>2.0.0</avro4k.version>
<commons-compress.version>1.26.2</commons-compress.version>
<commons-lang3.version>3.15.0</commons-lang3.version>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>io.toolisticon.maven.parent</groupId>
<artifactId>maven-parent-kotlin-base</artifactId>
<version>2024.7.1</version>
<version>2024.8.1</version>
<relativePath/>
</parent>

<groupId>io.toolisticon.kotlin.avro._</groupId>
<artifactId>avro-kotlin-root</artifactId>
<version>1.11.5.1-SNAPSHOT</version>
<version>1.12.0.0-SNAPSHOT</version>

<name>pom: ${project.artifactId}</name>
<description>Root of opinionated extension functions and helpers for using Apache Avro with Kotlin.</description>
Expand Down