This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new a83168f Move DI annotations up a level
a83168f is described below
commit a83168f0db030bb9e199b207c74cb73c3a07898a
Author: Matt Sicker <[email protected]>
AuthorDate: Thu Feb 3 21:56:58 2022 -0600
Move DI annotations up a level
This is to help the cleaned up DI branch have a more accurate history by
moving some common refactorings back to the main branch.
Signed-off-by: Matt Sicker <[email protected]>
---
.../logging/log4j/core/config/plugins/PluginAttribute.java | 2 +-
.../log4j/core/config/plugins/PluginBuilderAttribute.java | 2 +-
.../log4j/core/config/plugins/PluginBuilderFactory.java | 2 +-
.../log4j/core/config/plugins/PluginConfiguration.java | 2 +-
.../logging/log4j/core/config/plugins/PluginElement.java | 2 +-
.../logging/log4j/core/config/plugins/PluginFactory.java | 2 +-
.../apache/logging/log4j/core/config/plugins/PluginNode.java | 2 +-
.../logging/log4j/core/config/plugins/PluginValue.java | 2 +-
.../apache/logging/log4j/plugin/processor/BeanProcessor.java | 8 ++++----
.../logging/log4j/plugins/test/validation/ExampleBean.java | 2 +-
.../logging/log4j/plugins/test/validation/ImplicitBean.java | 2 +-
.../log4j/plugins/test/validation/ImplicitMethodBean.java | 2 +-
.../log4j/plugins/test/validation/ProductionBean.java | 6 +++---
.../apache/logging/log4j/plugins/spi/BeanManagerTest.java | 12 ++++++------
.../apache/logging/log4j/plugins/spi/InjectionPointTest.java | 8 +++-----
.../logging/log4j/plugins/spi/InjectionTargetTest.java | 8 ++++----
.../logging/log4j/plugins/{di => }/DependentScoped.java | 2 +-
.../org/apache/logging/log4j/plugins/{di => }/Disposes.java | 2 +-
.../org/apache/logging/log4j/plugins/{di => }/Inject.java | 4 +++-
.../org/apache/logging/log4j/plugins/{di => }/Named.java | 2 +-
.../apache/logging/log4j/plugins/{di => }/NamedAliases.java | 2 +-
.../java/org/apache/logging/log4j/plugins/PluginAliases.java | 1 -
.../org/apache/logging/log4j/plugins/PluginAttribute.java | 1 -
.../apache/logging/log4j/plugins/PluginBuilderAttribute.java | 1 -
.../java/org/apache/logging/log4j/plugins/PluginElement.java | 1 -
.../java/org/apache/logging/log4j/plugins/PluginFactory.java | 2 --
.../java/org/apache/logging/log4j/plugins/PluginNode.java | 1 -
.../java/org/apache/logging/log4j/plugins/PluginValue.java | 1 -
.../apache/logging/log4j/plugins/{di => }/PostConstruct.java | 2 +-
.../apache/logging/log4j/plugins/{di => }/PreDestroy.java | 2 +-
.../org/apache/logging/log4j/plugins/{di => }/Producer.java | 2 +-
.../org/apache/logging/log4j/plugins/{di => }/Produces.java | 2 +-
.../org/apache/logging/log4j/plugins/{di => }/Qualifier.java | 2 +-
.../org/apache/logging/log4j/plugins/{di => }/ScopeType.java | 2 +-
.../logging/log4j/plugins/{di => }/SingletonScoped.java | 2 +-
.../logging/log4j/plugins/name/NamedAliasesProvider.java | 4 ++--
.../log4j/plugins/name/NamedQualifierNameProvider.java | 2 +-
.../main/java/org/apache/logging/log4j/plugins/spi/Bean.java | 8 +++++---
.../org/apache/logging/log4j/plugins/spi/BeanManager.java | 6 +++---
.../apache/logging/log4j/plugins/spi/InjectionTarget.java | 6 +++---
.../logging/log4j/plugins/spi/LoggerContextScoped.java | 2 +-
.../java/org/apache/logging/log4j/plugins/spi/Producer.java | 6 +++---
.../org/apache/logging/log4j/plugins/spi/ScopeContext.java | 2 +-
.../logging/log4j/plugins/spi/impl/DefaultBeanManager.java | 10 +++++-----
.../log4j/plugins/spi/impl/DefaultInjectionTarget.java | 6 +++---
.../plugins/spi/impl/DefaultInjectionTargetFactory.java | 6 +++---
.../log4j/plugins/spi/impl/DependentScopeContext.java | 2 +-
.../org/apache/logging/log4j/plugins/spi/impl/Injector.java | 2 +-
.../apache/logging/log4j/plugins/spi/impl/OptionalBean.java | 2 +-
49 files changed, 78 insertions(+), 84 deletions(-)
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java
index 843564f..fd0a678 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.core.config.plugins;
import
org.apache.logging.log4j.core.config.plugins.util.PluginAttributeNameProvider;
import
org.apache.logging.log4j.core.config.plugins.visitors.PluginAttributeVisitor;
-import org.apache.logging.log4j.plugins.di.Qualifier;
+import org.apache.logging.log4j.plugins.Qualifier;
import org.apache.logging.log4j.plugins.inject.InjectorStrategy;
import org.apache.logging.log4j.plugins.name.NameProvider;
import org.apache.logging.log4j.util.Strings;
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderAttribute.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderAttribute.java
index 97b4f1b..763af1d 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderAttribute.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderAttribute.java
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.config.plugins;
import
org.apache.logging.log4j.core.config.plugins.util.PluginBuilderAttributeNameProvider;
import
org.apache.logging.log4j.core.config.plugins.visitors.PluginBuilderAttributeVisitor;
-import org.apache.logging.log4j.plugins.di.Qualifier;
+import org.apache.logging.log4j.plugins.Qualifier;
import org.apache.logging.log4j.plugins.inject.InjectorStrategy;
import org.apache.logging.log4j.plugins.name.NameProvider;
import org.apache.logging.log4j.util.Strings;
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
index 9661b8f..5be83cc 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.plugins;
-import org.apache.logging.log4j.plugins.di.Producer;
+import org.apache.logging.log4j.plugins.Producer;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginConfiguration.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginConfiguration.java
index e9bc4c5..a6b2f75 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginConfiguration.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginConfiguration.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.plugins;
import
org.apache.logging.log4j.core.config.plugins.inject.PluginConfigurationInjector;
-import org.apache.logging.log4j.plugins.di.Qualifier;
+import org.apache.logging.log4j.plugins.Qualifier;
import org.apache.logging.log4j.plugins.inject.InjectorStrategy;
import java.lang.annotation.Documented;
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginElement.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginElement.java
index 70b2d9e..fa63ded 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginElement.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginElement.java
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.core.config.plugins;
import
org.apache.logging.log4j.core.config.plugins.util.PluginElementNameProvider;
import
org.apache.logging.log4j.core.config.plugins.visitors.PluginElementVisitor;
-import org.apache.logging.log4j.plugins.di.Qualifier;
+import org.apache.logging.log4j.plugins.Qualifier;
import org.apache.logging.log4j.plugins.inject.InjectorStrategy;
import org.apache.logging.log4j.plugins.name.NameProvider;
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginFactory.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginFactory.java
index a263fe8..79718b1 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginFactory.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.logging.log4j.core.config.plugins;
-import org.apache.logging.log4j.plugins.di.Producer;
+import org.apache.logging.log4j.plugins.Producer;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginNode.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginNode.java
index 7765a4b..6090a30 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginNode.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginNode.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.plugins;
import org.apache.logging.log4j.core.config.plugins.visitors.PluginNodeVisitor;
-import org.apache.logging.log4j.plugins.di.Qualifier;
+import org.apache.logging.log4j.plugins.Qualifier;
import org.apache.logging.log4j.plugins.inject.InjectorStrategy;
import java.lang.annotation.Documented;
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginValue.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginValue.java
index 0e925d0..422ba77 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginValue.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginValue.java
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.core.config.plugins;
import
org.apache.logging.log4j.core.config.plugins.util.PluginValueNameProvider;
import
org.apache.logging.log4j.core.config.plugins.visitors.PluginValueVisitor;
-import org.apache.logging.log4j.plugins.di.Qualifier;
+import org.apache.logging.log4j.plugins.Qualifier;
import org.apache.logging.log4j.plugins.inject.InjectorStrategy;
import org.apache.logging.log4j.plugins.name.NameProvider;
diff --git
a/log4j-plugin-processor/src/main/java/org/apache/logging/log4j/plugin/processor/BeanProcessor.java
b/log4j-plugin-processor/src/main/java/org/apache/logging/log4j/plugin/processor/BeanProcessor.java
index 74d3c44..214330b 100644
---
a/log4j-plugin-processor/src/main/java/org/apache/logging/log4j/plugin/processor/BeanProcessor.java
+++
b/log4j-plugin-processor/src/main/java/org/apache/logging/log4j/plugin/processor/BeanProcessor.java
@@ -17,10 +17,10 @@
package org.apache.logging.log4j.plugin.processor;
-import org.apache.logging.log4j.plugins.di.Disposes;
-import org.apache.logging.log4j.plugins.di.Inject;
-import org.apache.logging.log4j.plugins.di.Producer;
-import org.apache.logging.log4j.plugins.di.Qualifier;
+import org.apache.logging.log4j.plugins.Disposes;
+import org.apache.logging.log4j.plugins.Inject;
+import org.apache.logging.log4j.plugins.Producer;
+import org.apache.logging.log4j.plugins.Qualifier;
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.RoundEnvironment;
diff --git
a/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ExampleBean.java
b/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ExampleBean.java
index 5a89264..908cd26 100644
---
a/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ExampleBean.java
+++
b/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ExampleBean.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.plugins.test.validation;
import java.util.Map;
-import org.apache.logging.log4j.plugins.di.Inject;
+import org.apache.logging.log4j.plugins.Inject;
public class ExampleBean {
private final String alpha;
diff --git
a/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ImplicitBean.java
b/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ImplicitBean.java
index fd75e5f..cab90b3 100644
---
a/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ImplicitBean.java
+++
b/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ImplicitBean.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.plugins.test.validation;
import java.util.Map;
-import org.apache.logging.log4j.plugins.di.Named;
+import org.apache.logging.log4j.plugins.Named;
public class ImplicitBean {
private final String alpha;
diff --git
a/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ImplicitMethodBean.java
b/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ImplicitMethodBean.java
index c36b0ef..e3e1738 100644
---
a/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ImplicitMethodBean.java
+++
b/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ImplicitMethodBean.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.plugins.test.validation;
import java.util.Map;
-import org.apache.logging.log4j.plugins.di.Named;
+import org.apache.logging.log4j.plugins.Named;
public class ImplicitMethodBean {
private String alpha;
diff --git
a/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ProductionBean.java
b/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ProductionBean.java
index 51cd722..bdb4e43 100644
---
a/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ProductionBean.java
+++
b/log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/ProductionBean.java
@@ -16,9 +16,9 @@
*/
package org.apache.logging.log4j.plugins.test.validation;
-import org.apache.logging.log4j.plugins.di.Disposes;
-import org.apache.logging.log4j.plugins.di.Inject;
-import org.apache.logging.log4j.plugins.di.Produces;
+import org.apache.logging.log4j.plugins.Disposes;
+import org.apache.logging.log4j.plugins.Inject;
+import org.apache.logging.log4j.plugins.Produces;
import org.apache.logging.log4j.plugins.di.Provider;
public class ProductionBean {
diff --git
a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/BeanManagerTest.java
b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/BeanManagerTest.java
index 6310ddd..ea850e2 100644
---
a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/BeanManagerTest.java
+++
b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/BeanManagerTest.java
@@ -17,13 +17,13 @@
package org.apache.logging.log4j.plugins.spi;
-import org.apache.logging.log4j.plugins.di.Inject;
-import org.apache.logging.log4j.plugins.di.Named;
-import org.apache.logging.log4j.plugins.di.PostConstruct;
-import org.apache.logging.log4j.plugins.di.PreDestroy;
-import org.apache.logging.log4j.plugins.di.Produces;
+import org.apache.logging.log4j.plugins.Inject;
+import org.apache.logging.log4j.plugins.Named;
+import org.apache.logging.log4j.plugins.PostConstruct;
+import org.apache.logging.log4j.plugins.PreDestroy;
+import org.apache.logging.log4j.plugins.Produces;
import org.apache.logging.log4j.plugins.di.Provider;
-import org.apache.logging.log4j.plugins.di.SingletonScoped;
+import org.apache.logging.log4j.plugins.SingletonScoped;
import org.apache.logging.log4j.plugins.spi.impl.DefaultBeanManager;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
diff --git
a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/InjectionPointTest.java
b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/InjectionPointTest.java
index 1b2d12f..fa87f9a 100644
---
a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/InjectionPointTest.java
+++
b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/InjectionPointTest.java
@@ -17,12 +17,10 @@
package org.apache.logging.log4j.plugins.spi;
-import org.apache.logging.log4j.plugins.spi.BeanManager;
-import org.apache.logging.log4j.plugins.spi.InjectionPoint;
import org.apache.logging.log4j.plugins.spi.impl.DefaultBeanManager;
-import org.apache.logging.log4j.plugins.di.Inject;
-import org.apache.logging.log4j.plugins.di.Named;
-import org.apache.logging.log4j.plugins.di.SingletonScoped;
+import org.apache.logging.log4j.plugins.Inject;
+import org.apache.logging.log4j.plugins.Named;
+import org.apache.logging.log4j.plugins.SingletonScoped;
import org.apache.logging.log4j.util.Strings;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
diff --git
a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/InjectionTargetTest.java
b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/InjectionTargetTest.java
index 7b39145..e9989f4 100644
---
a/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/InjectionTargetTest.java
+++
b/log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/spi/InjectionTargetTest.java
@@ -17,10 +17,10 @@
package org.apache.logging.log4j.plugins.spi;
-import org.apache.logging.log4j.plugins.di.Inject;
-import org.apache.logging.log4j.plugins.di.Named;
-import org.apache.logging.log4j.plugins.di.Produces;
-import org.apache.logging.log4j.plugins.di.SingletonScoped;
+import org.apache.logging.log4j.plugins.Inject;
+import org.apache.logging.log4j.plugins.Named;
+import org.apache.logging.log4j.plugins.Produces;
+import org.apache.logging.log4j.plugins.SingletonScoped;
import org.apache.logging.log4j.plugins.spi.impl.DefaultBeanManager;
import org.junit.jupiter.api.Test;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DependentScoped.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/DependentScoped.java
similarity index 97%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DependentScoped.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/DependentScoped.java
index 45ffeaf..6758fe4 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DependentScoped.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/DependentScoped.java
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Disposes.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Disposes.java
similarity index 97%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Disposes.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Disposes.java
index 220775b..ee3855e 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Disposes.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Disposes.java
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Inject.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Inject.java
similarity index 95%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Inject.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Inject.java
index 6266b12..83eb16f 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Inject.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Inject.java
@@ -15,7 +15,9 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
+
+import org.apache.logging.log4j.plugins.di.Provider;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Named.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Named.java
similarity index 96%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Named.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Named.java
index b8b48d4..994d99a 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Named.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Named.java
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
import org.apache.logging.log4j.plugins.name.NameProvider;
import org.apache.logging.log4j.plugins.name.NamedQualifierNameProvider;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/NamedAliases.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/NamedAliases.java
similarity index 97%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/NamedAliases.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/NamedAliases.java
index 94adf0c..bc89329 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/NamedAliases.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/NamedAliases.java
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
import org.apache.logging.log4j.plugins.name.AliasesProvider;
import org.apache.logging.log4j.plugins.name.NameProvider;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginAliases.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginAliases.java
index e3f41c8..c40ac20 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginAliases.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginAliases.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.plugins;
-import org.apache.logging.log4j.plugins.di.Qualifier;
import org.apache.logging.log4j.plugins.name.AliasesProvider;
import org.apache.logging.log4j.plugins.name.PluginAliasesProvider;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginAttribute.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginAttribute.java
index 4b5c9f0..bdaafe7 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginAttribute.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginAttribute.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.plugins;
-import org.apache.logging.log4j.plugins.di.Qualifier;
import org.apache.logging.log4j.plugins.inject.InjectorStrategy;
import org.apache.logging.log4j.plugins.inject.PluginAttributeInjector;
import org.apache.logging.log4j.plugins.name.NameProvider;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginBuilderAttribute.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginBuilderAttribute.java
index 2eebabe..3b3f69c 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginBuilderAttribute.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginBuilderAttribute.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.plugins;
-import org.apache.logging.log4j.plugins.di.Qualifier;
import org.apache.logging.log4j.plugins.inject.InjectorStrategy;
import org.apache.logging.log4j.plugins.inject.PluginBuilderAttributeInjector;
import org.apache.logging.log4j.plugins.name.NameProvider;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginElement.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginElement.java
index 6951de1..c6cfb6b 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginElement.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginElement.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.plugins;
-import org.apache.logging.log4j.plugins.di.Qualifier;
import org.apache.logging.log4j.plugins.inject.InjectorStrategy;
import org.apache.logging.log4j.plugins.inject.PluginElementInjector;
import org.apache.logging.log4j.plugins.name.NameProvider;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginFactory.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginFactory.java
index f32bc38..2f88848 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginFactory.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginFactory.java
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.plugins;
-import org.apache.logging.log4j.plugins.di.Producer;
-
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginNode.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginNode.java
index eec9d8f..6671143 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginNode.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginNode.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.plugins;
-import org.apache.logging.log4j.plugins.di.Qualifier;
import org.apache.logging.log4j.plugins.inject.InjectorStrategy;
import org.apache.logging.log4j.plugins.inject.PluginNodeInjector;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginValue.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginValue.java
index b320306..c75a65b 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginValue.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PluginValue.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.plugins;
-import org.apache.logging.log4j.plugins.di.Qualifier;
import org.apache.logging.log4j.plugins.inject.InjectorStrategy;
import org.apache.logging.log4j.plugins.inject.PluginValueInjector;
import org.apache.logging.log4j.plugins.name.NameProvider;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/PostConstruct.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PostConstruct.java
similarity index 96%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/PostConstruct.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PostConstruct.java
index 56059a7..edccc9d 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/PostConstruct.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PostConstruct.java
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/PreDestroy.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PreDestroy.java
similarity index 96%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/PreDestroy.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PreDestroy.java
index 530f22a..9d3d19a 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/PreDestroy.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/PreDestroy.java
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Producer.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Producer.java
similarity index 96%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Producer.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Producer.java
index 286723f..d046b7f 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Producer.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Producer.java
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Produces.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Produces.java
similarity index 98%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Produces.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Produces.java
index ea73b6c..171e020 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Produces.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Produces.java
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Qualifier.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Qualifier.java
similarity index 96%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Qualifier.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Qualifier.java
index 85bbbb0..4efb003 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Qualifier.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Qualifier.java
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/ScopeType.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/ScopeType.java
similarity index 97%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/ScopeType.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/ScopeType.java
index 2afcad7..6758d31 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/ScopeType.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/ScopeType.java
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/SingletonScoped.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/SingletonScoped.java
similarity index 96%
rename from
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/SingletonScoped.java
rename to
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/SingletonScoped.java
index 53fafe0..db81166 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/SingletonScoped.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/SingletonScoped.java
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-package org.apache.logging.log4j.plugins.di;
+package org.apache.logging.log4j.plugins;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedAliasesProvider.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedAliasesProvider.java
index 9471784..0fc6f18 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedAliasesProvider.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedAliasesProvider.java
@@ -17,8 +17,8 @@
package org.apache.logging.log4j.plugins.name;
-import org.apache.logging.log4j.plugins.di.Named;
-import org.apache.logging.log4j.plugins.di.NamedAliases;
+import org.apache.logging.log4j.plugins.Named;
+import org.apache.logging.log4j.plugins.NamedAliases;
import org.apache.logging.log4j.util.Strings;
import java.util.ArrayList;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedQualifierNameProvider.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedQualifierNameProvider.java
index 803263d..082d8fd 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedQualifierNameProvider.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedQualifierNameProvider.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.plugins.name;
-import org.apache.logging.log4j.plugins.di.Named;
+import org.apache.logging.log4j.plugins.Named;
import org.apache.logging.log4j.util.Strings;
import java.util.Optional;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/Bean.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/Bean.java
index 550e780..c8d511c 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/Bean.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/Bean.java
@@ -17,7 +17,9 @@
package org.apache.logging.log4j.plugins.spi;
-import org.apache.logging.log4j.plugins.di.DependentScoped;
+import org.apache.logging.log4j.plugins.DependentScoped;
+import org.apache.logging.log4j.plugins.Inject;
+import org.apache.logging.log4j.plugins.Produces;
import org.apache.logging.log4j.plugins.util.TypeUtil;
import java.lang.annotation.Annotation;
@@ -26,8 +28,8 @@ import java.util.Collection;
/**
* Provides lifecycle and dependency injection functionality to managed
classes. A bean represents an injectable class
- * via {@link org.apache.logging.log4j.plugins.di.Inject} or a producer field
or method via
- * {@link org.apache.logging.log4j.plugins.di.Produces} along with their
annotation aliases. A bean has a
+ * via {@link Inject} or a producer field or method via
+ * {@link Produces} along with their annotation aliases. A bean has a
* {@linkplain #getName() name} which can be the empty string to indicate a
default bean. Beans provide a
* {@linkplain #getTypes() type closure} of matching generic types to allow
for injecting more complex types. The
* {@linkplain #getScopeType() scope} of a bean controls the lifecycle of
instances
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/BeanManager.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/BeanManager.java
index 6945403..c3c6798 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/BeanManager.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/BeanManager.java
@@ -17,9 +17,9 @@
package org.apache.logging.log4j.plugins.spi;
-import org.apache.logging.log4j.plugins.di.Inject;
-import org.apache.logging.log4j.plugins.di.Producer;
-import org.apache.logging.log4j.plugins.di.Qualifier;
+import org.apache.logging.log4j.plugins.Inject;
+import org.apache.logging.log4j.plugins.Producer;
+import org.apache.logging.log4j.plugins.Qualifier;
import org.apache.logging.log4j.plugins.di.model.PluginSource;
import org.apache.logging.log4j.plugins.name.AnnotatedElementNameProvider;
import org.apache.logging.log4j.plugins.util.AnnotationUtil;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/InjectionTarget.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/InjectionTarget.java
index 9066b29..bd2c82f 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/InjectionTarget.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/InjectionTarget.java
@@ -17,9 +17,9 @@
package org.apache.logging.log4j.plugins.spi;
-import org.apache.logging.log4j.plugins.di.Inject;
-import org.apache.logging.log4j.plugins.di.PostConstruct;
-import org.apache.logging.log4j.plugins.di.PreDestroy;
+import org.apache.logging.log4j.plugins.Inject;
+import org.apache.logging.log4j.plugins.PostConstruct;
+import org.apache.logging.log4j.plugins.PreDestroy;
/**
* Provides lifecycle and dependency injection operations for instances of a
specified type.
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/LoggerContextScoped.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/LoggerContextScoped.java
index b93cf7e..fb2f35b 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/LoggerContextScoped.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/LoggerContextScoped.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.plugins.spi;
-import org.apache.logging.log4j.plugins.di.ScopeType;
+import org.apache.logging.log4j.plugins.ScopeType;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/Producer.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/Producer.java
index 879df74..fa7986f 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/Producer.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/Producer.java
@@ -17,9 +17,9 @@
package org.apache.logging.log4j.plugins.spi;
-import org.apache.logging.log4j.plugins.di.Disposes;
-import org.apache.logging.log4j.plugins.di.Inject;
-import org.apache.logging.log4j.plugins.di.Produces;
+import org.apache.logging.log4j.plugins.Disposes;
+import org.apache.logging.log4j.plugins.Inject;
+import org.apache.logging.log4j.plugins.Produces;
import java.util.Collection;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/ScopeContext.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/ScopeContext.java
index 40c66da..29b23e9 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/ScopeContext.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/ScopeContext.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.plugins.spi;
-import org.apache.logging.log4j.plugins.di.ScopeType;
+import org.apache.logging.log4j.plugins.ScopeType;
import java.lang.annotation.Annotation;
import java.util.Optional;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultBeanManager.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultBeanManager.java
index 90b3e0d..6420817 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultBeanManager.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultBeanManager.java
@@ -17,12 +17,12 @@
package org.apache.logging.log4j.plugins.spi.impl;
-import org.apache.logging.log4j.plugins.di.DependentScoped;
-import org.apache.logging.log4j.plugins.di.Disposes;
-import org.apache.logging.log4j.plugins.di.Producer;
+import org.apache.logging.log4j.plugins.DependentScoped;
+import org.apache.logging.log4j.plugins.Disposes;
+import org.apache.logging.log4j.plugins.Producer;
import org.apache.logging.log4j.plugins.di.Provider;
-import org.apache.logging.log4j.plugins.di.ScopeType;
-import org.apache.logging.log4j.plugins.di.SingletonScoped;
+import org.apache.logging.log4j.plugins.ScopeType;
+import org.apache.logging.log4j.plugins.SingletonScoped;
import org.apache.logging.log4j.plugins.di.model.PluginSource;
import org.apache.logging.log4j.plugins.name.AnnotatedElementAliasesProvider;
import org.apache.logging.log4j.plugins.name.AnnotatedElementNameProvider;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultInjectionTarget.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultInjectionTarget.java
index bf097ad..90303da 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultInjectionTarget.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultInjectionTarget.java
@@ -21,9 +21,9 @@ import
org.apache.logging.log4j.plugins.spi.InitializationContext;
import org.apache.logging.log4j.plugins.spi.InitializationException;
import org.apache.logging.log4j.plugins.spi.InjectionPoint;
import org.apache.logging.log4j.plugins.spi.InjectionTarget;
-import org.apache.logging.log4j.plugins.di.Disposes;
-import org.apache.logging.log4j.plugins.di.Inject;
-import org.apache.logging.log4j.plugins.di.Producer;
+import org.apache.logging.log4j.plugins.Disposes;
+import org.apache.logging.log4j.plugins.Inject;
+import org.apache.logging.log4j.plugins.Producer;
import org.apache.logging.log4j.plugins.util.AnnotationUtil;
import org.apache.logging.log4j.plugins.util.TypeUtil;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultInjectionTargetFactory.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultInjectionTargetFactory.java
index 5da29be..33d0425 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultInjectionTargetFactory.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DefaultInjectionTargetFactory.java
@@ -23,9 +23,9 @@ import
org.apache.logging.log4j.plugins.spi.DefinitionException;
import org.apache.logging.log4j.plugins.spi.InjectionPoint;
import org.apache.logging.log4j.plugins.spi.InjectionTarget;
import org.apache.logging.log4j.plugins.spi.InjectionTargetFactory;
-import org.apache.logging.log4j.plugins.di.Inject;
-import org.apache.logging.log4j.plugins.di.PostConstruct;
-import org.apache.logging.log4j.plugins.di.PreDestroy;
+import org.apache.logging.log4j.plugins.Inject;
+import org.apache.logging.log4j.plugins.PostConstruct;
+import org.apache.logging.log4j.plugins.PreDestroy;
import org.apache.logging.log4j.plugins.name.AnnotatedElementNameProvider;
import org.apache.logging.log4j.plugins.util.TypeUtil;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DependentScopeContext.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DependentScopeContext.java
index 70cec5d..a42b3dc 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DependentScopeContext.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/DependentScopeContext.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.plugins.spi.impl;
import org.apache.logging.log4j.plugins.spi.Bean;
import org.apache.logging.log4j.plugins.spi.InitializationContext;
import org.apache.logging.log4j.plugins.spi.ScopeContext;
-import org.apache.logging.log4j.plugins.di.DependentScoped;
+import org.apache.logging.log4j.plugins.DependentScoped;
import java.lang.annotation.Annotation;
import java.util.Optional;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/Injector.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/Injector.java
index f0d964f..9e7d1d1 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/Injector.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/Injector.java
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.plugins.spi.BeanManager;
import org.apache.logging.log4j.plugins.spi.InitializationContext;
import org.apache.logging.log4j.plugins.spi.InitializationException;
import org.apache.logging.log4j.plugins.spi.InjectionPoint;
-import org.apache.logging.log4j.plugins.di.Disposes;
+import org.apache.logging.log4j.plugins.Disposes;
import org.apache.logging.log4j.plugins.util.TypeUtil;
import java.lang.reflect.Constructor;
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/OptionalBean.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/OptionalBean.java
index 96e5343..76998a4 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/OptionalBean.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/impl/OptionalBean.java
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.plugins.spi.impl;
import org.apache.logging.log4j.plugins.spi.Bean;
import org.apache.logging.log4j.plugins.spi.InitializationContext;
import org.apache.logging.log4j.plugins.spi.InjectionPoint;
-import org.apache.logging.log4j.plugins.di.DependentScoped;
+import org.apache.logging.log4j.plugins.DependentScoped;
import org.apache.logging.log4j.plugins.util.TypeUtil;
import org.apache.logging.log4j.plugins.util.Value;
