From 5a6366e99482172ddb7f6ce5f13da51075463b83 Mon Sep 17 00:00:00 2001 From: Marios Andreopoulos Date: Thu, 27 Dec 2018 21:25:12 +0200 Subject: [PATCH] Fix kafka-connect-hive path, fix kafka-connect-hive project, fix gradle version and more Signed-off-by: Marios Andreopoulos --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- kafka-connect-hive/build.gradle | 43 +++++++ kafka-connect-hive/connector/build.gradle | 114 ------------------ kafka-connect-hive/it/build.gradle | 83 +++---------- kafka-connect-hive/it/docker-compose.yml | 2 +- .../src/main/resources/hive-sink-ascii.txt | 0 .../src/main/resources/log4j2.xml | 0 .../connect/hive/HdfsUtils.scala | 0 .../connect/hive/HiveSchemas.scala | 0 .../connect/hive/StructMapper.scala | 0 .../connect/hive/StructUtils.scala | 0 .../streamreactor/connect/hive/domain.scala | 0 .../connect/hive/exceptions.scala | 0 .../connect/hive/formats/HiveFormat.scala | 0 .../connect/hive/formats/OrcHiveFormat.scala | 0 .../hive/formats/ParquetHiveFormat.scala | 0 .../connect/hive/orc/OrcSchemas.scala | 0 .../connect/hive/orc/OrcSink.scala | 0 .../connect/hive/orc/OrcSource.scala | 0 .../connect/hive/orc/package.scala | 0 .../hive/orc/vectors/BytesVectorReader.scala | 0 .../hive/orc/vectors/BytesVectorWriter.scala | 0 .../orc/vectors/DecimalVectorReader.scala | 0 .../orc/vectors/DecimalVectorWriter.scala | 0 .../hive/orc/vectors/DoubleVectorReader.scala | 0 .../hive/orc/vectors/DoubleVectorWriter.scala | 0 .../hive/orc/vectors/ListVectorReader.scala | 0 .../hive/orc/vectors/ListVectorWriter.scala | 0 .../hive/orc/vectors/LongVectorReader.scala | 0 .../hive/orc/vectors/LongVectorWriter.scala | 0 .../hive/orc/vectors/OrcVectorReader.scala | 0 .../hive/orc/vectors/OrcVectorWriter.scala | 0 .../hive/orc/vectors/StructVectorReader.scala | 0 .../hive/orc/vectors/StructVectorWriter.scala | 0 .../orc/vectors/TimestampVectorReader.scala | 0 .../orc/vectors/TimestampVectorWriter.scala | 0 .../streamreactor/connect/hive/package.scala | 0 .../parquet/AppendingPrimitiveConverter.scala | 0 .../connect/hive/parquet/Converters.scala | 0 .../hive/parquet/DeferredParquetWriter.scala | 0 .../DictionaryStringPrimitiveConverter.scala | 0 .../hive/parquet/DictionarySupport.scala | 0 .../hive/parquet/NestedGroupConverter.scala | 0 .../connect/hive/parquet/ParquetSchemas.scala | 0 .../hive/parquet/RootGroupConverter.scala | 0 .../hive/parquet/StructMaterializer.scala | 0 .../parquet/StructParquetWriterBuilder.scala | 0 .../hive/parquet/StructReadSupport.scala | 0 .../hive/parquet/StructWriteSupport.scala | 0 .../parquet/TimestampPrimitiveConverter.scala | 0 .../connect/hive/parquet/config.scala | 0 .../connect/hive/parquet/package.scala | 0 .../connect/hive/sink/HiveSink.scala | 0 .../connect/hive/sink/HiveSinkConnector.scala | 0 .../connect/hive/sink/HiveSinkTask.scala | 0 .../connect/hive/sink/HiveWriterManager.scala | 0 .../connect/hive/sink/ValueConverter.scala | 0 .../hive/sink/config/HiveSinkConfig.scala | 0 .../sink/config/HiveSinkConfigConstants.scala | 0 .../hive/sink/config/HiveSinkConfigDef.scala | 0 .../sink/evolution/AddEvolutionPolicy.scala | 0 .../hive/sink/evolution/EvolutionPolicy.scala | 0 .../evolution/IgnoreEvolutionPolicy.scala | 0 .../sink/evolution/NoopEvolutionPolicy.scala | 0 .../evolution/StrictEvolutionPolicy.scala | 0 .../mapper/DropPartitionValuesMapper.scala | 0 .../mapper/MetastoreSchemaAlignMapper.scala | 0 .../hive/sink/mapper/ProjectionMapper.scala | 0 .../partitioning/CachedPartitionHandler.scala | 0 .../DynamicPartitionHandler.scala | 0 .../sink/partitioning/PartitionHandler.scala | 0 .../partitioning/PartitionPathPolicy.scala | 0 .../partitioning/StrictPartitionHandler.scala | 0 .../hive/sink/staging/CommitPolicy.scala | 0 .../hive/sink/staging/OffsetSeeker.scala | 0 .../hive/sink/staging/StageManager.scala | 0 .../connect/hive/sink/staging/filenames.scala | 0 .../connect/hive/source/HiveSource.scala | 0 .../hive/source/HiveSourceConnector.scala | 0 .../connect/hive/source/HiveSourceTask.scala | 0 .../hive/source/TableFileScanner.scala | 0 .../hive/source/config/HiveSourceConfig.scala | 0 .../config/HiveSourceConfigConstants.scala | 0 .../source/config/HiveSourceConfigDef.scala | 0 .../source/mapper/PartitionValueMapper.scala | 0 .../hive/source/mapper/ProjectionMapper.scala | 0 .../HiveSourceOffsetStorageReader.scala | 0 .../offset/MockOffsetStorageReader.scala | 0 .../connect/hive/source/package.scala | 0 .../src/test/resources/log4j2.xml | 0 .../src/test/resources/userdata.parquet | Bin .../kcql/ProjectionMapperTest.scala | 0 .../hive/DefaultPartitionLocationTest.scala | 0 .../connect/hive/HiveSchemasTest.scala | 0 .../streamreactor/connect/hive/HiveTest.scala | 0 .../connect/hive/HiveTestConfig.scala | 0 .../connect/hive/JacksonSupport.scala | 0 .../connect/hive/KafkaTestConfig.scala | 0 .../connect/hive/orc/OrcTest.scala | 0 .../hive/parquet/ParquetReaderTest.scala | 0 .../hive/parquet/ParquetSchemasTest.scala | 0 .../hive/parquet/ParquetWriterTest.scala | 0 .../connect/hive/sink/HiveOrcSinkTest.scala | 0 .../hive/sink/HiveParquetSinkTest.scala | 0 .../hive/sink/HiveSinkConfigTest.scala | 0 .../connect/hive/sink/HiveSinkTaskTest.scala | 0 .../DropPartitionValuesMapperTest.scala | 0 .../MetastoreSchemaAlignMapperTest.scala | 0 .../staging/DefaultCommitPolicyTest.scala | 0 .../hive/sink/staging/StageManagerTest.scala | 0 .../hive/source/HiveSourceConfigTest.scala | 0 .../connect/hive/source/HiveSourceTest.scala | 0 settings.gradle | 2 +- 114 files changed, 65 insertions(+), 183 deletions(-) create mode 100644 kafka-connect-hive/build.gradle delete mode 100644 kafka-connect-hive/connector/build.gradle rename kafka-connect-hive/{connector => }/src/main/resources/hive-sink-ascii.txt (100%) rename kafka-connect-hive/{connector => }/src/main/resources/log4j2.xml (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/HdfsUtils.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/HiveSchemas.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/StructMapper.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/StructUtils.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/domain.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/exceptions.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/formats/HiveFormat.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/formats/OrcHiveFormat.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/formats/ParquetHiveFormat.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSchemas.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSink.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSource.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/package.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/BytesVectorReader.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/BytesVectorWriter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DecimalVectorReader.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DecimalVectorWriter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DoubleVectorReader.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DoubleVectorWriter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/ListVectorReader.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/ListVectorWriter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/LongVectorReader.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/LongVectorWriter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/OrcVectorReader.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/OrcVectorWriter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/StructVectorReader.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/StructVectorWriter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/TimestampVectorReader.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/TimestampVectorWriter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/package.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/AppendingPrimitiveConverter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/Converters.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DeferredParquetWriter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DictionaryStringPrimitiveConverter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DictionarySupport.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/NestedGroupConverter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetSchemas.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/RootGroupConverter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructMaterializer.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructParquetWriterBuilder.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructReadSupport.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructWriteSupport.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/TimestampPrimitiveConverter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/config.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/package.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSink.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkConnector.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkTask.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveWriterManager.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/ValueConverter.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfig.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfigConstants.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfigDef.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/AddEvolutionPolicy.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/EvolutionPolicy.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/IgnoreEvolutionPolicy.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/NoopEvolutionPolicy.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/StrictEvolutionPolicy.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/DropPartitionValuesMapper.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/MetastoreSchemaAlignMapper.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/ProjectionMapper.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/CachedPartitionHandler.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/DynamicPartitionHandler.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/PartitionHandler.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/PartitionPathPolicy.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/StrictPartitionHandler.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/CommitPolicy.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/OffsetSeeker.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/StageManager.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/filenames.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSource.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceConnector.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceTask.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/TableFileScanner.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfig.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfigConstants.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfigDef.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/mapper/PartitionValueMapper.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/mapper/ProjectionMapper.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/offset/HiveSourceOffsetStorageReader.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/offset/MockOffsetStorageReader.scala (100%) rename kafka-connect-hive/{connector => }/src/main/scala/com/landoop/streamreactor/connect/hive/source/package.scala (100%) rename kafka-connect-hive/{connector => }/src/test/resources/log4j2.xml (100%) rename kafka-connect-hive/{connector => }/src/test/resources/userdata.parquet (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/datamountaineer/kcql/ProjectionMapperTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/DefaultPartitionLocationTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/HiveSchemasTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/HiveTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/HiveTestConfig.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/JacksonSupport.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/KafkaTestConfig.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/orc/OrcTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetReaderTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetSchemasTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetWriterTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveOrcSinkTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveParquetSinkTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkConfigTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkTaskTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/sink/mapper/DropPartitionValuesMapperTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/sink/mapper/MetastoreSchemaAlignMapperTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/sink/staging/DefaultCommitPolicyTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/sink/staging/StageManagerTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceConfigTest.scala (100%) rename kafka-connect-hive/{connector => }/src/test/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceTest.scala (100%) diff --git a/gradle.properties b/gradle.properties index 0f340b897..360bff2f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ # # Always set the version to -SNAPSHOT after a release -version=1.3.0-SNAPSHOT +version=1.2.0-SNAPSHOT ossrhUsername=you ossrhPassword=me diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ff66f9e15..e578d583c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip diff --git a/kafka-connect-hive/build.gradle b/kafka-connect-hive/build.gradle new file mode 100644 index 000000000..946bcc8f8 --- /dev/null +++ b/kafka-connect-hive/build.gradle @@ -0,0 +1,43 @@ +/* + * Copyright 2018 Datamountaineer. + * + * 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. + */ + +project(":kafka-connect-hive") { + + ext { + parquetVersion = "1.8.3" + hiveVersion = "2.1.1" + joddVersion = "4.1.4" + hadoopVersion = "2.6.5" + catsVersion = "1.2.0" + } + + dependencies { + compile("org.apache.parquet:parquet-column:$parquetVersion") + compile("org.apache.parquet:parquet-encoding:$parquetVersion") + compile("org.apache.parquet:parquet-hadoop:$parquetVersion") + compile("org.jodd:jodd-core:$joddVersion") + compile("org.apache.hive:hive-jdbc:$hiveVersion") + compile("org.apache.hive:hive-exec:$hiveVersion") + compile("org.apache.hadoop:hadoop-common:$hadoopVersion") + compile("org.apache.hadoop:hadoop-hdfs:$hadoopVersion") + compile("org.apache.hadoop:hadoop-mapreduce:$hadoopVersion") + compile("org.apache.hadoop:hadoop-mapreduce-client:$hadoopVersion") + compile("org.apache.hadoop:hadoop-mapreduce-client-core:$hadoopVersion") + compile("org.typelevel:cats-core_2.11:$catsVersion") + + //testCompile 'org.apache.logging.log4j:log4j:2.11.0' + } +} \ No newline at end of file diff --git a/kafka-connect-hive/connector/build.gradle b/kafka-connect-hive/connector/build.gradle deleted file mode 100644 index d475c9d77..000000000 --- a/kafka-connect-hive/connector/build.gradle +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright 2018 Datamountaineer. - * - * 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. - */ -buildscript { - - repositories { - jcenter() - maven { - url 'https://plugins.gradle.org/m2/' - } - } - - dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1' - } -} - -ext { - scalaMajorVersion = '2.11' - scala = '2.11.12' - scalaCheck = '1.13.4' - scalaTest = '3.0.4' - scalaLoggingVersion = '2.1.2' - junit = '4.11' - parquetVersion = "1.8.3" - hiveVersion = "2.1.1" - joddVersion = "4.1.4" - hadoopVersion = "2.6.5" - catsVersion = "1.2.0" - - // The following 4 need to align to compile against a particular version - confluentVersion = '4.1.0' - kafkaVersion = '1.1.0' - dataMountaineerCommonVersion = "1.1.5" - link4jVersion = "1.8.0" -} - -group = 'com.datamountaineer' -version = project.version -description = "stream-reactor" - -apply plugin: 'java' -apply plugin: 'scala' -apply plugin: 'maven' -apply plugin: 'maven-publish' -apply plugin: 'signing' -apply plugin: 'com.github.johnrengelman.shadow' - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -repositories { - mavenLocal() - mavenCentral() - maven { url "http://packages.confluent.io/maven/" } - maven { url "http://repo.typesafe.com/typesafe/releases/" } -} - -configurations.all { - exclude group: 'org.pentaho' -} - -shadowJar { - baseName = 'kafka-connect-hive' - classifier = null - version = project.version -} - - -dependencies { - - compile "org.scala-lang:scala-library:$scala" - compile "org.scala-lang:scala-compiler:$scala" - - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajorVersion:$scalaLoggingVersion" - - compile ("org.apache.kafka:connect-json:$kafkaVersion") - compile "io.confluent:kafka-connect-avro-converter:$confluentVersion" - compile "io.confluent:kafka-schema-registry:$confluentVersion" - - compile("org.apache.parquet:parquet-column:$parquetVersion") - compile("org.apache.parquet:parquet-encoding:$parquetVersion") - compile("org.apache.parquet:parquet-hadoop:$parquetVersion") - compile("org.jodd:jodd-core:$joddVersion") - compile("org.apache.hive:hive-jdbc:$hiveVersion") - compile("org.apache.hive:hive-exec:$hiveVersion") - compile("org.apache.hadoop:hadoop-common:$hadoopVersion") - compile("org.apache.hadoop:hadoop-hdfs:$hadoopVersion") - compile("org.apache.hadoop:hadoop-mapreduce:$hadoopVersion") - compile("org.apache.hadoop:hadoop-mapreduce-client:$hadoopVersion") - compile("org.apache.hadoop:hadoop-mapreduce-client-core:$hadoopVersion") - compile("org.typelevel:cats-core_2.11:$catsVersion") - - compile("com.datamountaineer:kafka-connect-common:$dataMountaineerCommonVersion") - compile "org.apache.calcite:calcite-linq4j:$link4jVersion" - - testCompile "org.scalacheck:scalacheck_$scalaMajorVersion:$scalaCheck" - testCompile "org.scalatest:scalatest_$scalaMajorVersion:$scalaTest" - testCompile "junit:junit:$junit" - testCompile 'org.apache.logging.log4j:log4j:2.11.0' - testRuntime 'org.pegdown:pegdown:1.1.0' -} diff --git a/kafka-connect-hive/it/build.gradle b/kafka-connect-hive/it/build.gradle index 6e0b350a9..b0ed1b6d0 100644 --- a/kafka-connect-hive/it/build.gradle +++ b/kafka-connect-hive/it/build.gradle @@ -13,75 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -buildscript { - repositories { - jcenter() - maven { - url 'https://plugins.gradle.org/m2/' - } - } -} - -ext { - scalaMajorVersion = '2.11' - scala = '2.11.12' - scalaCheck = '1.13.4' - scalaTest = '3.0.4' - scalaLoggingVersion = '2.1.2' - junit = '4.11' - parquetVersion = "1.8.3" - hiveVersion = "2.1.1" - joddVersion = "4.1.4" - hadoopVersion = "2.6.5" - catsVersion = "1.1.0" - - // The following 4 need to align to compile against a particular version - confluentVersion = '4.1.0' - kafkaVersion = '1.1.0' - dataMountaineerCommonVersion = "1.1.5" - link4jVersion = "1.8.0" -} - -group = 'com.datamountaineer' -version = project.version -description = "stream-reactor" - -apply plugin: 'java' -apply plugin: 'scala' - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -repositories { - mavenLocal() - mavenCentral() - maven { url "http://packages.confluent.io/maven/" } -} +project(":kafka-connect-hive:it") { -dependencies { - - testCompile "org.scala-lang:scala-library:$scala" - testCompile "org.scala-lang:scala-compiler:$scala" - testCompile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajorVersion:$scalaLoggingVersion" - - testCompile ("org.apache.kafka:connect-json:$kafkaVersion") - testCompile "io.confluent:kafka-connect-avro-converter:$confluentVersion" - testCompile "io.confluent:kafka-schema-registry:$confluentVersion" - - testCompile 'org.asynchttpclient:async-http-client:2.5.2' - testCompile "org.scalatest:scalatest_$scalaMajorVersion:$scalaTest" - testCompile 'org.apache.logging.log4j:log4j:2.11.0' - - testCompile("org.apache.hive:hive-jdbc:$hiveVersion") - testCompile project(":kafka-connect-hive:connector") + ext { + parquetVersion = "1.8.3" + hiveVersion = "2.1.1" + joddVersion = "4.1.4" + hadoopVersion = "2.6.5" + catsVersion = "1.1.0" + } - testRuntime 'org.pegdown:pegdown:1.1.0' -} + dependencies { + testCompile 'org.asynchttpclient:async-http-client:2.5.2' + testCompile 'org.apache.logging.log4j:log4j:2.11.0' + testCompile("org.apache.hive:hive-jdbc:$hiveVersion") + testCompile project(":kafka-connect-hive") + } -test { - onlyIf { - project.hasProperty("integration-tests") + test { + onlyIf { + project.hasProperty("integration-tests") + } } } \ No newline at end of file diff --git a/kafka-connect-hive/it/docker-compose.yml b/kafka-connect-hive/it/docker-compose.yml index 2f37961d9..f9b0c8aad 100644 --- a/kafka-connect-hive/it/docker-compose.yml +++ b/kafka-connect-hive/it/docker-compose.yml @@ -13,7 +13,7 @@ services: CONNECTORS: "redis" ADV_HOST: "127.0.0.1" volumes: - - ../connector/build/libs/:/connectors/hive + - ../build/libs/:/connectors/hive namenode: image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8 diff --git a/kafka-connect-hive/connector/src/main/resources/hive-sink-ascii.txt b/kafka-connect-hive/src/main/resources/hive-sink-ascii.txt similarity index 100% rename from kafka-connect-hive/connector/src/main/resources/hive-sink-ascii.txt rename to kafka-connect-hive/src/main/resources/hive-sink-ascii.txt diff --git a/kafka-connect-hive/connector/src/main/resources/log4j2.xml b/kafka-connect-hive/src/main/resources/log4j2.xml similarity index 100% rename from kafka-connect-hive/connector/src/main/resources/log4j2.xml rename to kafka-connect-hive/src/main/resources/log4j2.xml diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/HdfsUtils.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/HdfsUtils.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/HdfsUtils.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/HdfsUtils.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/HiveSchemas.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/HiveSchemas.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/HiveSchemas.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/HiveSchemas.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/StructMapper.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/StructMapper.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/StructMapper.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/StructMapper.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/StructUtils.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/StructUtils.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/StructUtils.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/StructUtils.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/domain.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/domain.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/domain.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/domain.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/exceptions.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/exceptions.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/exceptions.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/exceptions.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/formats/HiveFormat.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/formats/HiveFormat.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/formats/HiveFormat.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/formats/HiveFormat.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/formats/OrcHiveFormat.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/formats/OrcHiveFormat.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/formats/OrcHiveFormat.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/formats/OrcHiveFormat.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/formats/ParquetHiveFormat.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/formats/ParquetHiveFormat.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/formats/ParquetHiveFormat.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/formats/ParquetHiveFormat.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSchemas.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSchemas.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSchemas.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSchemas.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSink.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSink.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSink.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSink.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSource.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSource.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSource.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/OrcSource.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/package.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/package.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/package.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/package.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/BytesVectorReader.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/BytesVectorReader.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/BytesVectorReader.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/BytesVectorReader.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/BytesVectorWriter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/BytesVectorWriter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/BytesVectorWriter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/BytesVectorWriter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DecimalVectorReader.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DecimalVectorReader.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DecimalVectorReader.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DecimalVectorReader.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DecimalVectorWriter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DecimalVectorWriter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DecimalVectorWriter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DecimalVectorWriter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DoubleVectorReader.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DoubleVectorReader.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DoubleVectorReader.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DoubleVectorReader.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DoubleVectorWriter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DoubleVectorWriter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DoubleVectorWriter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/DoubleVectorWriter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/ListVectorReader.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/ListVectorReader.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/ListVectorReader.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/ListVectorReader.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/ListVectorWriter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/ListVectorWriter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/ListVectorWriter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/ListVectorWriter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/LongVectorReader.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/LongVectorReader.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/LongVectorReader.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/LongVectorReader.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/LongVectorWriter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/LongVectorWriter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/LongVectorWriter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/LongVectorWriter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/OrcVectorReader.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/OrcVectorReader.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/OrcVectorReader.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/OrcVectorReader.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/OrcVectorWriter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/OrcVectorWriter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/OrcVectorWriter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/OrcVectorWriter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/StructVectorReader.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/StructVectorReader.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/StructVectorReader.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/StructVectorReader.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/StructVectorWriter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/StructVectorWriter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/StructVectorWriter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/StructVectorWriter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/TimestampVectorReader.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/TimestampVectorReader.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/TimestampVectorReader.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/TimestampVectorReader.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/TimestampVectorWriter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/TimestampVectorWriter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/TimestampVectorWriter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/orc/vectors/TimestampVectorWriter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/package.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/package.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/package.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/package.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/AppendingPrimitiveConverter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/AppendingPrimitiveConverter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/AppendingPrimitiveConverter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/AppendingPrimitiveConverter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/Converters.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/Converters.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/Converters.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/Converters.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DeferredParquetWriter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DeferredParquetWriter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DeferredParquetWriter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DeferredParquetWriter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DictionaryStringPrimitiveConverter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DictionaryStringPrimitiveConverter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DictionaryStringPrimitiveConverter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DictionaryStringPrimitiveConverter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DictionarySupport.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DictionarySupport.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DictionarySupport.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/DictionarySupport.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/NestedGroupConverter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/NestedGroupConverter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/NestedGroupConverter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/NestedGroupConverter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetSchemas.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetSchemas.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetSchemas.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetSchemas.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/RootGroupConverter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/RootGroupConverter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/RootGroupConverter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/RootGroupConverter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructMaterializer.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructMaterializer.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructMaterializer.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructMaterializer.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructParquetWriterBuilder.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructParquetWriterBuilder.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructParquetWriterBuilder.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructParquetWriterBuilder.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructReadSupport.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructReadSupport.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructReadSupport.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructReadSupport.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructWriteSupport.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructWriteSupport.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructWriteSupport.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/StructWriteSupport.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/TimestampPrimitiveConverter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/TimestampPrimitiveConverter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/TimestampPrimitiveConverter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/TimestampPrimitiveConverter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/config.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/config.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/config.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/config.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/package.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/package.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/package.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/parquet/package.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSink.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSink.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSink.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSink.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkConnector.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkConnector.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkConnector.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkConnector.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkTask.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkTask.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkTask.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkTask.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveWriterManager.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveWriterManager.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveWriterManager.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/HiveWriterManager.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/ValueConverter.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/ValueConverter.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/ValueConverter.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/ValueConverter.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfig.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfig.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfig.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfig.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfigConstants.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfigConstants.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfigConstants.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfigConstants.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfigDef.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfigDef.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfigDef.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/config/HiveSinkConfigDef.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/AddEvolutionPolicy.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/AddEvolutionPolicy.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/AddEvolutionPolicy.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/AddEvolutionPolicy.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/EvolutionPolicy.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/EvolutionPolicy.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/EvolutionPolicy.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/EvolutionPolicy.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/IgnoreEvolutionPolicy.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/IgnoreEvolutionPolicy.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/IgnoreEvolutionPolicy.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/IgnoreEvolutionPolicy.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/NoopEvolutionPolicy.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/NoopEvolutionPolicy.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/NoopEvolutionPolicy.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/NoopEvolutionPolicy.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/StrictEvolutionPolicy.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/StrictEvolutionPolicy.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/StrictEvolutionPolicy.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/evolution/StrictEvolutionPolicy.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/DropPartitionValuesMapper.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/DropPartitionValuesMapper.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/DropPartitionValuesMapper.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/DropPartitionValuesMapper.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/MetastoreSchemaAlignMapper.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/MetastoreSchemaAlignMapper.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/MetastoreSchemaAlignMapper.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/MetastoreSchemaAlignMapper.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/ProjectionMapper.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/ProjectionMapper.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/ProjectionMapper.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/mapper/ProjectionMapper.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/CachedPartitionHandler.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/CachedPartitionHandler.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/CachedPartitionHandler.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/CachedPartitionHandler.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/DynamicPartitionHandler.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/DynamicPartitionHandler.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/DynamicPartitionHandler.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/DynamicPartitionHandler.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/PartitionHandler.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/PartitionHandler.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/PartitionHandler.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/PartitionHandler.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/PartitionPathPolicy.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/PartitionPathPolicy.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/PartitionPathPolicy.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/PartitionPathPolicy.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/StrictPartitionHandler.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/StrictPartitionHandler.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/StrictPartitionHandler.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/partitioning/StrictPartitionHandler.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/CommitPolicy.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/CommitPolicy.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/CommitPolicy.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/CommitPolicy.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/OffsetSeeker.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/OffsetSeeker.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/OffsetSeeker.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/OffsetSeeker.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/StageManager.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/StageManager.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/StageManager.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/StageManager.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/filenames.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/filenames.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/filenames.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/sink/staging/filenames.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSource.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSource.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSource.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSource.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceConnector.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceConnector.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceConnector.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceConnector.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceTask.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceTask.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceTask.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceTask.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/TableFileScanner.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/TableFileScanner.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/TableFileScanner.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/TableFileScanner.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfig.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfig.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfig.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfig.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfigConstants.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfigConstants.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfigConstants.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfigConstants.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfigDef.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfigDef.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfigDef.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/config/HiveSourceConfigDef.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/mapper/PartitionValueMapper.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/mapper/PartitionValueMapper.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/mapper/PartitionValueMapper.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/mapper/PartitionValueMapper.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/mapper/ProjectionMapper.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/mapper/ProjectionMapper.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/mapper/ProjectionMapper.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/mapper/ProjectionMapper.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/offset/HiveSourceOffsetStorageReader.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/offset/HiveSourceOffsetStorageReader.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/offset/HiveSourceOffsetStorageReader.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/offset/HiveSourceOffsetStorageReader.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/offset/MockOffsetStorageReader.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/offset/MockOffsetStorageReader.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/offset/MockOffsetStorageReader.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/offset/MockOffsetStorageReader.scala diff --git a/kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/package.scala b/kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/package.scala similarity index 100% rename from kafka-connect-hive/connector/src/main/scala/com/landoop/streamreactor/connect/hive/source/package.scala rename to kafka-connect-hive/src/main/scala/com/landoop/streamreactor/connect/hive/source/package.scala diff --git a/kafka-connect-hive/connector/src/test/resources/log4j2.xml b/kafka-connect-hive/src/test/resources/log4j2.xml similarity index 100% rename from kafka-connect-hive/connector/src/test/resources/log4j2.xml rename to kafka-connect-hive/src/test/resources/log4j2.xml diff --git a/kafka-connect-hive/connector/src/test/resources/userdata.parquet b/kafka-connect-hive/src/test/resources/userdata.parquet similarity index 100% rename from kafka-connect-hive/connector/src/test/resources/userdata.parquet rename to kafka-connect-hive/src/test/resources/userdata.parquet diff --git a/kafka-connect-hive/connector/src/test/scala/com/datamountaineer/kcql/ProjectionMapperTest.scala b/kafka-connect-hive/src/test/scala/com/datamountaineer/kcql/ProjectionMapperTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/datamountaineer/kcql/ProjectionMapperTest.scala rename to kafka-connect-hive/src/test/scala/com/datamountaineer/kcql/ProjectionMapperTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/DefaultPartitionLocationTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/DefaultPartitionLocationTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/DefaultPartitionLocationTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/DefaultPartitionLocationTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/HiveSchemasTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/HiveSchemasTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/HiveSchemasTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/HiveSchemasTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/HiveTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/HiveTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/HiveTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/HiveTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/HiveTestConfig.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/HiveTestConfig.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/HiveTestConfig.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/HiveTestConfig.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/JacksonSupport.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/JacksonSupport.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/JacksonSupport.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/JacksonSupport.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/KafkaTestConfig.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/KafkaTestConfig.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/KafkaTestConfig.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/KafkaTestConfig.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/orc/OrcTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/orc/OrcTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/orc/OrcTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/orc/OrcTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetReaderTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetReaderTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetReaderTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetReaderTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetSchemasTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetSchemasTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetSchemasTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetSchemasTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetWriterTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetWriterTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetWriterTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/parquet/ParquetWriterTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveOrcSinkTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveOrcSinkTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveOrcSinkTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveOrcSinkTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveParquetSinkTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveParquetSinkTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveParquetSinkTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveParquetSinkTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkConfigTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkConfigTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkConfigTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkConfigTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkTaskTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkTaskTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkTaskTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/HiveSinkTaskTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/mapper/DropPartitionValuesMapperTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/mapper/DropPartitionValuesMapperTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/mapper/DropPartitionValuesMapperTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/mapper/DropPartitionValuesMapperTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/mapper/MetastoreSchemaAlignMapperTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/mapper/MetastoreSchemaAlignMapperTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/mapper/MetastoreSchemaAlignMapperTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/mapper/MetastoreSchemaAlignMapperTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/staging/DefaultCommitPolicyTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/staging/DefaultCommitPolicyTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/staging/DefaultCommitPolicyTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/staging/DefaultCommitPolicyTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/staging/StageManagerTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/staging/StageManagerTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/sink/staging/StageManagerTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/sink/staging/StageManagerTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceConfigTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceConfigTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceConfigTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceConfigTest.scala diff --git a/kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceTest.scala b/kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceTest.scala similarity index 100% rename from kafka-connect-hive/connector/src/test/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceTest.scala rename to kafka-connect-hive/src/test/scala/com/landoop/streamreactor/connect/hive/source/HiveSourceTest.scala diff --git a/settings.gradle b/settings.gradle index 307d79395..10e508210 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,7 +25,7 @@ include 'kafka-connect-bloomberg', 'kafka-connect-hbase', 'kafka-connect-redis', 'kafka-connect-hazelcast', - 'kafka-connect-hive:connector', + 'kafka-connect-hive', 'kafka-connect-hive:it', 'kafka-connect-rethink', 'kafka-connect-jms',