Adapted the maven-pluto-plugin to install the annotation detector. With
this commit, portlet method annotation recognition is now independent of
the CDI implementation. Most importantly, this means that it is no longer
necessary for the CDI implementation to be initialized before the portlet
container.
diff --git a/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java b/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
index 8aec848..1b6ea6a 100644
--- a/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
+++ b/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
@@ -54,6 +54,10 @@
new InstallationDependency("org.jboss.weld.servlet", "weld-servlet",
VERSION_PROPERTIES.getProperty("cdi.version"));
+ public static final InstallationDependency ANNOTATION_DETECTOR =
+ new InstallationDependency("eu.infomas", "annotation-detector",
+ VERSION_PROPERTIES.getProperty("annotation-detector.version"));
+
public static final InstallationDependency SLF4J_API =
new InstallationDependency("org.slf4j", "slf4j-api",
VERSION_PROPERTIES.getProperty("slf4j.version"));
@@ -150,6 +154,7 @@
SHARED.add(TAGLIB);
SHARED.add(CCPP_API);
SHARED.add(CDI_IMPL);
+ SHARED.add(ANNOTATION_DETECTOR);
SHARED.add(SLF4J_API);
SHARED.add(SLF4J_IMPL);
}
diff --git a/maven-pluto-plugin/src/main/resources/versions.properties b/maven-pluto-plugin/src/main/resources/versions.properties
index 7175c33..c45a5c0 100644
--- a/maven-pluto-plugin/src/main/resources/versions.properties
+++ b/maven-pluto-plugin/src/main/resources/versions.properties
@@ -23,6 +23,7 @@
servlet-api.version=${servlet-api.version}
jsp-api.version=${jsp-api.version}
cdi.version=${cdi.version}
+annotation-detector.version=${annotation-detector.version}
slf4j.version=${slf4j.version}
jstl.version=${jstl.version}
taglibs.standard.version=${taglibs.standard.version}
diff --git a/pluto-container/pom.xml b/pluto-container/pom.xml
index c5c9a50..d74fb2f 100644
--- a/pluto-container/pom.xml
+++ b/pluto-container/pom.xml
@@ -44,7 +44,6 @@
<dependency>
<groupId>eu.infomas</groupId>
<artifactId>annotation-detector</artifactId>
- <version>3.0.5</version>
</dependency>
<!-- Specification Libraries =========================================== -->
diff --git a/pom.xml b/pom.xml
index a88776f..18b068f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -280,6 +280,7 @@
<jmock.version>1.2.0</jmock.version>
<xmlunit.version>1.1</xmlunit.version>
<cdi.version>2.3.1.Final</cdi.version>
+ <annotation-detector.version>3.0.5</annotation-detector.version>
<!-- The following properties are not directly used as maven
dependencies, they're used by the maven pluto plugin for
@@ -369,6 +370,13 @@
<version>${cdi.version}</version>
</dependency>
+ <!-- For method annotation scanning ==================================== -->
+ <dependency>
+ <groupId>eu.infomas</groupId>
+ <artifactId>annotation-detector</artifactId>
+ <version>${annotation-detector.version}</version>
+ </dependency>
+
<!-- CCPP Libraries -->
<dependency>
<groupId>javax.ccpp</groupId>
