You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bh...@apache.org on 2019/04/15 19:58:14 UTC
[hadoop] branch trunk updated: HDDS-1396 : Recon start fails due to
changes in Aggregate Schema definition. (#700)
This is an automated email from the ASF dual-hosted git repository.
bharat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 62e38ea HDDS-1396 : Recon start fails due to changes in Aggregate Schema definition. (#700)
62e38ea is described below
commit 62e38ea911dab7bff8553a167a97858c3cfb58e3
Author: avijayanhwx <14...@users.noreply.github.com>
AuthorDate: Mon Apr 15 12:58:06 2019 -0700
HDDS-1396 : Recon start fails due to changes in Aggregate Schema definition. (#700)
---
hadoop-ozone/ozone-recon-codegen/pom.xml | 3 +--
hadoop-ozone/ozone-recon/pom.xml | 3 +--
.../hadoop/ozone/recon/persistence/JooqPersistenceModule.java | 1 -
.../hadoop/ozone/recon/persistence/AbstractSqlDatabaseTest.java | 8 +++++++-
hadoop-ozone/pom.xml | 1 +
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/hadoop-ozone/ozone-recon-codegen/pom.xml b/hadoop-ozone/ozone-recon-codegen/pom.xml
index 0854aac..4f86f32 100644
--- a/hadoop-ozone/ozone-recon-codegen/pom.xml
+++ b/hadoop-ozone/ozone-recon-codegen/pom.xml
@@ -21,11 +21,10 @@
<version>0.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>hadoop-ozone-recon-codegen</artifactId>
+ <artifactId>hadoop-ozone-reconcodegen</artifactId>
<name>Apache Hadoop Ozone Recon CodeGen</name>
<properties>
<jooq.version>3.11.10</jooq.version>
- <guice.version>4.1.0</guice.version>
</properties>
<dependencies>
<dependency>
diff --git a/hadoop-ozone/ozone-recon/pom.xml b/hadoop-ozone/ozone-recon/pom.xml
index 969db66..03a4c48 100644
--- a/hadoop-ozone/ozone-recon/pom.xml
+++ b/hadoop-ozone/ozone-recon/pom.xml
@@ -26,7 +26,6 @@
<properties>
<jooq.version>3.11.10</jooq.version>
<spring.version>5.1.3.RELEASE</spring.version>
- <guice.version>4.1.0</guice.version>
</properties>
<build>
<plugins>
@@ -124,7 +123,7 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-ozone-recon-codegen</artifactId>
+ <artifactId>hadoop-ozone-reconcodegen</artifactId>
<version>${version}</version>
</dependency>
<dependency>
diff --git a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/persistence/JooqPersistenceModule.java b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/persistence/JooqPersistenceModule.java
index c5c8310..2ba4cf7 100644
--- a/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/persistence/JooqPersistenceModule.java
+++ b/hadoop-ozone/ozone-recon/src/main/java/org/apache/hadoop/ozone/recon/persistence/JooqPersistenceModule.java
@@ -54,7 +54,6 @@ public class JooqPersistenceModule extends AbstractModule {
@Override
protected void configure() {
- bind(DataSourceConfiguration.class).toProvider(configurationProvider);
bind(DataSource.class).toProvider(DefaultDataSourceProvider.class)
.in(Singleton.class);
diff --git a/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractSqlDatabaseTest.java b/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractSqlDatabaseTest.java
index 2fab932..983f74a 100644
--- a/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractSqlDatabaseTest.java
+++ b/hadoop-ozone/ozone-recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractSqlDatabaseTest.java
@@ -31,6 +31,7 @@ import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.rules.TemporaryFolder;
+import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Provider;
@@ -56,7 +57,12 @@ public abstract class AbstractSqlDatabaseTest {
JooqPersistenceModule persistenceModule =
new JooqPersistenceModule(configurationProvider);
- injector = Guice.createInjector(persistenceModule);
+ injector = Guice.createInjector(persistenceModule, new AbstractModule() {
+ @Override
+ public void configure() {
+ bind(DataSourceConfiguration.class).toProvider(configurationProvider);
+ }
+ });
dslContext = DSL.using(new DefaultConfiguration().set(
injector.getInstance(DataSource.class)));
}
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index c24e511..44c738e 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -34,6 +34,7 @@
<ozone.release>Crater Lake</ozone.release>
<declared.ozone.version>${ozone.version}</declared.ozone.version>
<maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
+ <guice.version>4.0</guice.version>
</properties>
<modules>
<module>common</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org