diff --git a/hadoop-ozone/ozone-recon-codegen/pom.xml b/hadoop-ozone/ozone-recon-codegen/pom.xml index 0854aace5587b..4f86f3247887f 100644 --- a/hadoop-ozone/ozone-recon-codegen/pom.xml +++ b/hadoop-ozone/ozone-recon-codegen/pom.xml @@ -21,11 +21,10 @@ 0.5.0-SNAPSHOT 4.0.0 - hadoop-ozone-recon-codegen + hadoop-ozone-reconcodegen Apache Hadoop Ozone Recon CodeGen 3.11.10 - 4.1.0 diff --git a/hadoop-ozone/ozone-recon/pom.xml b/hadoop-ozone/ozone-recon/pom.xml index 969db6679fb52..03a4c48cc7f73 100644 --- a/hadoop-ozone/ozone-recon/pom.xml +++ b/hadoop-ozone/ozone-recon/pom.xml @@ -26,7 +26,6 @@ 3.11.10 5.1.3.RELEASE - 4.1.0 @@ -124,7 +123,7 @@ org.apache.hadoop - hadoop-ozone-recon-codegen + hadoop-ozone-reconcodegen ${version} 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 c5c83105f1b6b..2ba4cf7f93923 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 JooqPersistenceModule( @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 2fab93219eddd..983f74a3c1834 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.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 static void setup() throws IOException { 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 c24e51146d86f..44c738e7fb57d 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -34,6 +34,7 @@ Crater Lake ${ozone.version} 3.0.0-M1 + 4.0 common