Skip to content

Commit

Permalink
Consolidate current state of version 0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Csaba Galyo committed Nov 12, 2020
1 parent 399bfb5 commit 15d9cd9
Show file tree
Hide file tree
Showing 24 changed files with 392 additions and 15,498 deletions.
2 changes: 1 addition & 1 deletion atlas-integration/atlas-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>atlas-integration</artifactId>
<groupId>com.hortonworks.registries</groupId>
<version>0.10.0.7.2.7.0-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>atlas-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion atlas-integration/atlas-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>atlas-integration</artifactId>
<groupId>com.hortonworks.registries</groupId>
<version>0.10.0.7.2.7.0-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>atlas-module</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion atlas-integration/atlas-shim/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>atlas-integration</artifactId>
<groupId>com.hortonworks.registries</groupId>
<version>0.10.0.7.2.7.0-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>atlas-shim</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion atlas-integration/atlas-translate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>atlas-integration</artifactId>
<groupId>com.hortonworks.registries</groupId>
<version>0.10.0.7.2.7.0-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>atlas-translate</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion atlas-integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>registries</artifactId>
<groupId>com.hortonworks.registries</groupId>
<version>0.10.0.7.2.7.0-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>atlas-integration</artifactId>
Expand Down
129 changes: 0 additions & 129 deletions cache/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand Down Expand Up @@ -137,131 +136,3 @@
</reporting>

</project>
=======
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>registries</artifactId>
<groupId>com.hortonworks.registries</groupId>
<version>0.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>cache</artifactId>

<properties>
<!--currently using lettuce version 3 because version 4 depends on jdk8. Upgrade to version 4 when upgrading to jdk8 -->
<redis.lettuce.version>3.5.0.Final</redis.lettuce.version>
<io.netty.version>4.1.46.Final</io.netty.version>
</properties>
<dependencies>
<dependency>
<groupId>com.hortonworks.registries</groupId>
<artifactId>registry-common</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-azure</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-azure-datalake</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-cloud-storage</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>biz.paluch.redis</groupId>
<artifactId>lettuce</artifactId>
<version>${redis.lettuce.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>${io.netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${io.netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${io.netty.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<!-- Test plugins -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
<report>report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
</plugin>
</plugins>
</reporting>

</project>
>>>>>>> 4ad4c4a6... CDPD-11593 Update Netty for Schema Registry (CVE-2019-20445, CVE-2019-20444)
142 changes: 0 additions & 142 deletions cache/pom.xml.orig
View file

This file was deleted.

19 changes: 0 additions & 19 deletions ci/docker/schema-registry/Dockerfile.orig
View file

This file was deleted.

4 changes: 2 additions & 2 deletions common-auth/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<artifactId>registries</artifactId>
<groupId>com.hortonworks.registries</groupId>
<version>0.8.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>common-auth</artifactId>
<version>0.8.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion common-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>registries</artifactId>
<groupId>com.hortonworks.registries</groupId>
<version>0.8.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
16 changes: 15 additions & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.hortonworks.registries</groupId>
<artifactId>registries</artifactId>
<version>0.8.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -143,6 +143,20 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-azure</artifactId>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
Expand Down
Loading

0 comments on commit 15d9cd9

Please sign in to comment.