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

Jump to bottom

Append 2.12 suffix to artifactId for all modules #315

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Append 2.12 suffix to artifactId for all modules #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions avro-flink-serde/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-flink-serde</artifactId>
<artifactId>schema-registry-flink-serde_2.12</artifactId>
<version>1.1.17</version>
<name>AWS Glue Schema Registry Flink Avro Serialization Deserialization Schema</name>
<description>The AWS Glue Schema Registry Library for Apache Flink enables Java developers to easily integrate
Expand Down Expand Up @@ -65,7 +65,7 @@
<dependencies>
<dependency>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-serde</artifactId>
<artifactId>schema-registry-serde_2.12</artifactId>
<version>1.1.17</version>
</dependency>
<dependency>
Expand All @@ -77,7 +77,7 @@

<dependency>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-serde</artifactId>
<artifactId>schema-registry-serde_2.12</artifactId>
<version>1.0.2</version>
<classifier>tests</classifier>
<type>test-jar</type>
Expand Down
6 changes: 3 additions & 3 deletions avro-kafkaconnect-converter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-kafkaconnect-converter</artifactId>
<artifactId>schema-registry-kafkaconnect-converter_2.12</artifactId>
<version>${parent.version}</version>
<name>AWS Glue Schema Registry Kafka Connect AVRO Converter</name>
<description>The AWS Glue Schema Registry Kafka Connect Converter enables Java developers to easily integrate
Expand All @@ -31,7 +31,7 @@

<parent>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-parent</artifactId>
<artifactId>schema-registry-parent_2.12</artifactId>
<version>1.1.17</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down Expand Up @@ -62,7 +62,7 @@
<dependencies>
<dependency>
<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-serde</artifactId>
<artifactId>schema-registry-serde_2.12</artifactId>
<version>${parent.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions build-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

<parent>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-parent</artifactId>
<artifactId>schema-registry-parent_2.12</artifactId>
<version>1.1.17</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-build-tools</artifactId>
<artifactId>schema-registry-build-tools_2.12</artifactId>
<version>${parent.version}</version>
<name>AWS Glue Schema Registry Build Tools</name>
<description>The AWS Glue Schema Registry build tools helps run code coverage for AWS Glue Schema Registry Library
Expand Down
59 changes: 59 additions & 0 deletions change-scala-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/usr/bin/env bash

#
# Copyright 2020 Amazon.com, Inc. or its affiliates.
# Licensed 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
#
# http://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.
#

set -e

VALID_VERSIONS=( 2.12 2.13 )

usage() {
echo "Usage: $(basename $0) [-h|--help] <version>
where :
-h| --help Display this help text
valid version values : ${VALID_VERSIONS[*]}
" 1>&2
exit 1
}

if [[ ($# -ne 1) || ( $1 == "--help") || $1 == "-h" ]]; then
usage
fi

TO_VERSION=$1

check_scala_version() {
for i in ${VALID_VERSIONS[*]}; do [ $i = "$1" ] && return 0; done
echo "Invalid Scala version: $1. Valid versions: ${VALID_VERSIONS[*]}" 1>&2
exit 1
}

check_scala_version "$TO_VERSION"

if [ $TO_VERSION = "2.13" ]; then
FROM_VERSION="2.12"
else
FROM_VERSION="2.13"
fi

sed_i() {
sed -e "$1" "$2" > "$2.tmp" && mv "$2.tmp" "$2"
}

BASEDIR=$(dirname $0)
for f in $(find "$BASEDIR" -name 'pom.xml' -not -path '*target*'); do
echo $f
sed_i 's/\(artifactId.*\)_'$FROM_VERSION'/\1_'$TO_VERSION'/g' $f
done
6 changes: 3 additions & 3 deletions common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

<parent>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-parent</artifactId>
<artifactId>schema-registry-parent_2.12</artifactId>
<version>1.1.17</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-common</artifactId>
<artifactId>schema-registry-common_2.12</artifactId>
<version>${parent.version}</version>
<name>AWS Glue Schema Registry common</name>
<description>The AWS Glue Schema Common is the common package used by AWS Glue Schema Registry Library and has
Expand Down Expand Up @@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-build-tools</artifactId>
<artifactId>schema-registry-build-tools_2.12</artifactId>
<version>${parent.version}</version>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-examples</artifactId>
<artifactId>schema-registry-examples_2.12</artifactId>
<version>${parent.version}</version>
<name>AWS Glue Schema Registry examples</name>
<description>The AWS Glue Schema examples has sample code for using Schema Registry with different applications.
Expand All @@ -30,7 +30,7 @@

<parent>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-parent</artifactId>
<artifactId>schema-registry-parent_2.12</artifactId>
<version>1.1.17</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down Expand Up @@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-serde</artifactId>
<artifactId>schema-registry-serde_2.12</artifactId>
<version>${parent.version}</version>
</dependency>
<dependency>
Expand Down
12 changes: 6 additions & 6 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-integration-tests</artifactId>
<artifactId>schema-registry-integration-tests_2.12</artifactId>
<version>${parent.version}</version>
<name>AWS Glue Schema Registry Integration Tests</name>
<description>The AWS Glue Schema Registry tests would do a sanity check for the schema registry library.
Expand All @@ -30,7 +30,7 @@

<parent>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-parent</artifactId>
<artifactId>schema-registry-parent_2.12</artifactId>
<version>1.1.17</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down Expand Up @@ -63,12 +63,12 @@
<dependencies>
<dependency>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-serde</artifactId>
<artifactId>schema-registry-serde_2.12</artifactId>
<version>${parent.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-kafkastreams-serde</artifactId>
<artifactId>schema-registry-kafkastreams-serde_2.12</artifactId>
<version>${parent.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -102,7 +102,7 @@
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_${kafka.scala.version}</artifactId>
<artifactId>kafka_${scala.binary.version}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
Expand Down Expand Up @@ -184,7 +184,7 @@
<!-- Dependency on test jar for test data -->
<dependency>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-serde</artifactId>
<artifactId>schema-registry-serde_2.12</artifactId>
<version>${parent.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
6 changes: 3 additions & 3 deletions jsonschema-kafkaconnect-converter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>${parent.groupId}</groupId>
<artifactId>jsonschema-kafkaconnect-converter</artifactId>
<artifactId>jsonschema-kafkaconnect-converter_2.12</artifactId>
<version>${parent.version}</version>
<name>AWS Glue Schema Registry Kafka Connect JSONSchema Converter</name>
<description>The AWS Glue Schema Registry Kafka Connect Converter enables Java developers to easily integrate
Expand All @@ -31,7 +31,7 @@

<parent>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-parent</artifactId>
<artifactId>schema-registry-parent_2.12</artifactId>
<version>1.1.17</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down Expand Up @@ -62,7 +62,7 @@
<dependencies>
<dependency>
<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-serde</artifactId>
<artifactId>schema-registry-serde_2.12</artifactId>
<version>${parent.version}</version>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions kafkastreams-serde/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-kafkastreams-serde</artifactId>
<artifactId>schema-registry-kafkastreams-serde_2.12</artifactId>
<version>${parent.version}</version>
<name>AWS Glue Schema Registry Kafka Streams SerDe</name>
<description>The AWS Glue Schema Registry Kafka Streams SerDe library enables Java developers to easily integrate
Expand All @@ -31,7 +31,7 @@

<parent>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-parent</artifactId>
<artifactId>schema-registry-parent_2.12</artifactId>
<version>1.1.17</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down Expand Up @@ -62,7 +62,7 @@
<dependencies>
<dependency>
<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-serde</artifactId>
<artifactId>schema-registry-serde_2.12</artifactId>
<version>${parent.version}</version>
</dependency>
<dependency>
Expand Down
20 changes: 16 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-parent</artifactId>
<artifactId>schema-registry-parent_2.12</artifactId>
<version>1.1.17</version>
<packaging>pom</packaging>
<name>AWS Glue Schema Registry Library</name>
Expand Down Expand Up @@ -82,7 +82,7 @@
<glue.schema.registry.groupId>software.amazon.glue</glue.schema.registry.groupId>
<aws.sdk.v2.version>2.18.4</aws.sdk.v2.version>
<aws.sdk.v1.version>1.12.151</aws.sdk.v1.version>
<kafka.scala.version>2.12</kafka.scala.version>
<scala.binary.version>2.12</scala.binary.version>
<kafka.version>3.6.0</kafka.version>
<avro.version>1.11.3</avro.version>
<mbknor.jsonschema.converter.version>1.0.39</mbknor.jsonschema.converter.version>
Expand Down Expand Up @@ -141,7 +141,7 @@
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_${kafka.scala.version}</artifactId>
<artifactId>kafka_${scala.binary.version}</artifactId>
<version>${kafka.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -238,7 +238,7 @@
</dependency>
<dependency>
<groupId>com.kjetland</groupId>
<artifactId>mbknor-jackson-jsonschema_${kafka.scala.version}</artifactId>
<artifactId>mbknor-jackson-jsonschema_${scala.binary.version}</artifactId>
<version>${mbknor.jsonschema.converter.version}</version>
</dependency>
<!-- Temporarily adding dependency on a transitive dependency to fix security bug in underlying library. Remove when dependency is upgraded. -->
Expand Down Expand Up @@ -499,6 +499,18 @@
</plugins>
</build>
<profiles>
<profile>
<id>scala-2.12</id>
<properties>
<scala.binary.version>2.12</scala.binary.version>
</properties>
</profile>
<profile>
<id>scala-2.13</id>
<properties>
<scala.binary.version>2.13</scala.binary.version>
</properties>
</profile>
<profile>
<id>publishing</id>
<build>
Expand Down
6 changes: 3 additions & 3 deletions protobuf-kafkaconnect-converter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

<parent>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-parent</artifactId>
<artifactId>schema-registry-parent_2.12</artifactId>
<version>1.1.17</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>${parent.groupId}</groupId>
<artifactId>protobuf-kafkaconnect-converter</artifactId>
<artifactId>protobuf-kafkaconnect-converter_2.12</artifactId>
<version>${parent.version}</version>
<name>AWS Glue Schema Registry Kafka Connect Converter for Protobuf</name>
<description>The AWS Glue Schema Registry Kafka Connect Converter enables Java developers to easily integrate
Expand Down Expand Up @@ -63,7 +63,7 @@
<dependencies>
<dependency>
<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-serde</artifactId>
<artifactId>schema-registry-serde_2.12</artifactId>
<version>${parent.version}</version>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions serializer-deserializer-msk-iam/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-serde-msk-iam</artifactId>
<artifactId>schema-registry-serde-msk-iam_2.12</artifactId>
<name>AWS Glue Schema Registry Serializer Deserializer with MSK IAM Authentication client</name>
<description>The AWS Glue Schema Registry Serializer/Deserializer enables Java developers to easily integrate
their Apache Kafka and AWS Kinesis applications with AWS Glue Schema Registry. MSK IAM Authentication client allows
Expand All @@ -32,7 +32,7 @@

<parent>
<groupId>software.amazon.glue</groupId>
<artifactId>schema-registry-parent</artifactId>
<artifactId>schema-registry-parent_2.12</artifactId>
<version>1.1.17</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down Expand Up @@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>${parent.groupId}</groupId>
<artifactId>schema-registry-serde</artifactId>
<artifactId>schema-registry-serde_2.12</artifactId>
<version>${parent.version}</version>
</dependency>
</dependencies>
Expand Down
Loading