You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2018/09/04 14:10:09 UTC

svn commit: r1840046 - in /aries/trunk/cdi: ./ cdi-extender/ cdi-extension-http/ cdi-extension-jndi/ cdi-extra/ cdi-itests/ javax.annotation-api/ javax.cdi-api/ javax.el-api/ javax.interceptor-api/

Author: rotty3000
Date: Tue Sep  4 14:10:09 2018
New Revision: 1840046

URL: http://svn.apache.org/viewvc?rev=1840046&view=rev
Log:
[CDI] use geronimo specs

Signed-off-by: Raymond Auge <ro...@apache.org>

Added:
    aries/trunk/cdi/cdi-itests/jul-logging.properties
      - copied, changed from r1838931, aries/trunk/cdi/javax.el-api/bnd.bnd
Removed:
    aries/trunk/cdi/javax.annotation-api/README
    aries/trunk/cdi/javax.annotation-api/bnd.bnd
    aries/trunk/cdi/javax.annotation-api/pom.xml
    aries/trunk/cdi/javax.cdi-api/README
    aries/trunk/cdi/javax.cdi-api/bnd.bnd
    aries/trunk/cdi/javax.cdi-api/pom.xml
    aries/trunk/cdi/javax.el-api/README
    aries/trunk/cdi/javax.el-api/bnd.bnd
    aries/trunk/cdi/javax.el-api/pom.xml
    aries/trunk/cdi/javax.interceptor-api/README
    aries/trunk/cdi/javax.interceptor-api/bnd.bnd
    aries/trunk/cdi/javax.interceptor-api/pom.xml
Modified:
    aries/trunk/cdi/cdi-extender/pom.xml
    aries/trunk/cdi/cdi-extension-http/pom.xml
    aries/trunk/cdi/cdi-extension-jndi/pom.xml
    aries/trunk/cdi/cdi-extra/pom.xml
    aries/trunk/cdi/cdi-itests/cdi-executable.bndrun
    aries/trunk/cdi/cdi-itests/itest.bndrun
    aries/trunk/cdi/cdi-itests/pom.xml
    aries/trunk/cdi/pom.xml

Modified: aries/trunk/cdi/cdi-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/pom.xml?rev=1840046&r1=1840045&r2=1840046&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/pom.xml (original)
+++ aries/trunk/cdi/cdi-extender/pom.xml Tue Sep  4 14:10:09 2018
@@ -41,14 +41,24 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.aries.spec</groupId>
-			<artifactId>org.apache.aries.javax.annotation-api</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-annotation_1.3_spec</artifactId>
+			<version>1.1</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.aries.spec</groupId>
-			<artifactId>org.apache.aries.javax.cdi-api</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-atinject_1.0_spec</artifactId>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-el_2.2_spec</artifactId>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
+			<version>1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
@@ -92,6 +102,10 @@
 					<artifactId>jboss-ejb-api_3.2_spec</artifactId>
 				</exclusion>
 				<exclusion>
+					<groupId>org.jboss.spec.javax.el</groupId>
+					<artifactId>jboss-el-api_3.0_spec</artifactId>
+				</exclusion>
+				<exclusion>
 					<groupId>org.jboss.spec.javax.interceptor</groupId>
 					<artifactId>jboss-interceptors-api_1.2_spec</artifactId>
 				</exclusion>
@@ -170,18 +184,18 @@
 		</dependency>
 
 		<dependency>
-			<groupId>javax.ejb</groupId>
-			<artifactId>javax.ejb-api</artifactId>
-			<version>3.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
 			<version>1.2.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
+			<groupId>javax.ejb</groupId>
+			<artifactId>javax.ejb-api</artifactId>
+			<version>3.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
@@ -194,6 +208,12 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-interceptor_1.2_spec</artifactId>
+			<version>1.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>log4j-over-slf4j</artifactId>
 			<version>1.7.25</version>

Modified: aries/trunk/cdi/cdi-extension-http/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-http/pom.xml?rev=1840046&r1=1840045&r2=1840046&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-http/pom.xml (original)
+++ aries/trunk/cdi/cdi-extension-http/pom.xml Tue Sep  4 14:10:09 2018
@@ -44,9 +44,19 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.aries.spec</groupId>
-			<artifactId>org.apache.aries.javax.cdi-api</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-annotation_1.3_spec</artifactId>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-atinject_1.0_spec</artifactId>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
+			<version>1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>

Modified: aries/trunk/cdi/cdi-extension-jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/pom.xml?rev=1840046&r1=1840045&r2=1840046&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-jndi/pom.xml (original)
+++ aries/trunk/cdi/cdi-extension-jndi/pom.xml Tue Sep  4 14:10:09 2018
@@ -41,9 +41,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.aries.spec</groupId>
-			<artifactId>org.apache.aries.javax.cdi-api</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
+			<version>1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.aries.jndi</groupId>

Modified: aries/trunk/cdi/cdi-extra/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/pom.xml?rev=1840046&r1=1840045&r2=1840046&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/pom.xml (original)
+++ aries/trunk/cdi/cdi-extra/pom.xml Tue Sep  4 14:10:09 2018
@@ -43,18 +43,18 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.aries.spec</groupId>
-			<artifactId>org.apache.aries.javax.jax.rs-api</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.http.servlet-api</artifactId>
 			<version>1.1.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jaxrs_2.1_spec</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>osgi.annotation</artifactId>
 			<version>7.0.0</version>

Modified: aries/trunk/cdi/cdi-itests/cdi-executable.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/cdi-executable.bndrun?rev=1840046&r1=1840045&r2=1840046&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/cdi-executable.bndrun (original)
+++ aries/trunk/cdi/cdi-itests/cdi-executable.bndrun Tue Sep  4 14:10:09 2018
@@ -24,7 +24,8 @@
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	org.apache.felix.logback;version='[1.0.0,1.0.1)',\
-	slf4j.api;version='[1.7.25,1.7.26)'
+	slf4j.api;version='[1.7.25,1.7.26)',\
+	jul.to.slf4j;version='[1.7.25,1.7.26)'
 
 -runsystempackages: \
 	org.slf4j;version=1.7.25,\
@@ -37,10 +38,6 @@
 	jboss-classfilewriter;version='[1.1.2,1.1.3)',\
 	org.apache.aries.cdi.extender;version='[0.0.2,0.0.3)',\
 	org.apache.aries.cdi.extension.http;version='[0.0.2,0.0.3)',\
-	org.apache.aries.javax.annotation-api;version='[0.0.2,0.0.3)',\
-	org.apache.aries.javax.cdi-api;version='[0.0.2,0.0.3)',\
-	org.apache.aries.javax.el-api;version='[0.0.2,0.0.3)',\
-	org.apache.aries.javax.interceptor-api;version='[0.0.2,0.0.3)',\
 	org.apache.aries.spifly.dynamic.framework.extension;version='[1.0.14,1.0.15)',\
 	org.apache.felix.configadmin;version='[1.9.0,1.9.1)',\
 	org.apache.felix.gogo.command;version='[1.0.2,1.0.3)',\
@@ -48,8 +45,12 @@
 	org.apache.felix.gogo.runtime;version='[1.0.2,1.0.3)',\
 	org.apache.felix.http.jetty;version='[3.4.2,3.4.3)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+	org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
+	org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
+	org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
+	org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
+	org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
 	org.apache.logging.log4j.api;version='[2.7.0,2.7.1)',\
-	org.apache.servicemix.bundles.javax-inject;version='[1.0.0,1.0.1)',\
 	org.jboss.logging.jboss-logging;version='[3.2.1,3.2.2)',\
 	org.jboss.weld.osgi-bundle;version='[3.0.2,3.0.3)',\
 	org.jline;version='[3.0.0,3.0.1)',\
@@ -64,6 +65,7 @@
 -runfw: org.eclipse.osgi;version='[3.13.0,4.0.0)'
 -runproperties: \
 	eclipse.log.enabled=false,\
+	java.util.logging.config.file=${.}/jul-logging.properties,\
 	logback.configurationFile=file:${.}/logback.xml,\
 	org.jboss.logging.provider=slf4j,\
 	org.osgi.service.http.port=8080,\

Modified: aries/trunk/cdi/cdi-itests/itest.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/itest.bndrun?rev=1840046&r1=1840045&r2=1840046&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/itest.bndrun (original)
+++ aries/trunk/cdi/cdi-itests/itest.bndrun Tue Sep  4 14:10:09 2018
@@ -25,7 +25,8 @@
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	org.apache.felix.logback;version='[1.0.0,1.0.1)',\
-	slf4j.api;version='[1.7.25,1.7.26)'
+	slf4j.api;version='[1.7.25,1.7.26)',\
+	jul.to.slf4j;version='[1.7.25,1.7.26)'
 
 -runsystempackages: \
 	org.slf4j;version=1.7.25,\
@@ -40,10 +41,6 @@
 	org.apache.aries.cdi.extension.http;version='[0.0.2,0.0.3)',\
 	org.apache.aries.cdi.extension.jndi;version='[0.0.2,0.0.3)',\
 	org.apache.aries.cdi.itests;version='[0.0.2,0.0.3)',\
-	org.apache.aries.javax.annotation-api;version='[0.0.2,0.0.3)',\
-	org.apache.aries.javax.cdi-api;version='[0.0.2,0.0.3)',\
-	org.apache.aries.javax.el-api;version='[0.0.2,0.0.3)',\
-	org.apache.aries.javax.interceptor-api;version='[0.0.2,0.0.3)',\
 	org.apache.aries.jndi.api;version='[1.1.0,1.1.1)',\
 	org.apache.aries.jndi.core;version='[1.0.2,1.0.3)',\
 	org.apache.aries.spifly.dynamic.framework.extension;version='[1.0.14,1.0.15)',\
@@ -56,10 +53,14 @@
 	org.apache.felix.http.jetty;version='[3.4.2,3.4.3)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.scr;version='[2.1.0,2.1.1)',\
+	org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
+	org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
+	org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
+	org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
+	org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
 	org.apache.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\
 	org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
 	org.apache.logging.log4j.api;version='[2.7.0,2.7.1)',\
-	org.apache.servicemix.bundles.javax-inject;version='[1.0.0,1.0.1)',\
 	org.jboss.logging.jboss-logging;version='[3.2.1,3.2.2)',\
 	org.jboss.weld.osgi-bundle;version='[3.0.2,3.0.3)',\
 	org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
@@ -75,6 +76,7 @@
 -runfw: org.eclipse.osgi;version=3.13.0
 -runproperties: \
 	eclipse.log.enabled=false,\
+	java.util.logging.config.file=${.}/jul-logging.properties,\
 	logback.configurationFile=file:${.}/logback.xml,\
 	org.jboss.logging.provider=slf4j,\
 	org.osgi.service.http.port=0,\

Copied: aries/trunk/cdi/cdi-itests/jul-logging.properties (from r1838931, aries/trunk/cdi/javax.el-api/bnd.bnd)
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/jul-logging.properties?p2=aries/trunk/cdi/cdi-itests/jul-logging.properties&p1=aries/trunk/cdi/javax.el-api/bnd.bnd&r1=1838931&r2=1840046&rev=1840046&view=diff
==============================================================================
--- aries/trunk/cdi/javax.el-api/bnd.bnd (original)
+++ aries/trunk/cdi/cdi-itests/jul-logging.properties Tue Sep  4 14:10:09 2018
@@ -10,14 +10,4 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-Bundle-License: CDDL-1.1;link="https://spdx.org/licenses/CDDL-1.1.html"
-Provide-Capability: \
-	osgi.contract; \
-		osgi.contract=JavaEL; \
-		uses:="${packages}"; \
-		version:List<Version>='3.0,2.2,2.1'
-
--exportcontents: javax.el.*;version='3.0'
-
--includeresource: META-INF/README=README
--removeheaders: Archiver-Version, Created-By, Built-By, Build-Jdk
+handlers = org.slf4j.bridge.SLF4JBridgeHandler
\ No newline at end of file

Modified: aries/trunk/cdi/cdi-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/pom.xml?rev=1840046&r1=1840045&r2=1840046&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/pom.xml (original)
+++ aries/trunk/cdi/cdi-itests/pom.xml Tue Sep  4 14:10:09 2018
@@ -126,15 +126,21 @@
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.aries.jndi</groupId>
-			<artifactId>org.apache.aries.jndi.core</artifactId>
-			<version>1.0.2</version>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-el_2.2_spec</artifactId>
+			<version>1.1</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.configadmin</artifactId>
-			<version>1.9.0</version>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-interceptor_1.2_spec</artifactId>
+			<version>1.1</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.aries.jndi</groupId>
+			<artifactId>org.apache.aries.jndi.core</artifactId>
+			<version>1.0.2</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -145,6 +151,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.configadmin</artifactId>
+			<version>1.9.0</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.gogo.command</artifactId>
 			<version>1.0.2</version>
 			<scope>runtime</scope>
@@ -298,6 +310,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
+			<artifactId>jul-to-slf4j</artifactId>
+			<version>1.7.25</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
 			<artifactId>log4j-over-slf4j</artifactId>
 			<version>1.7.25</version>
 			<scope>runtime</scope>

Modified: aries/trunk/cdi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1840046&r1=1840045&r2=1840046&view=diff
==============================================================================
--- aries/trunk/cdi/pom.xml (original)
+++ aries/trunk/cdi/pom.xml Tue Sep  4 14:10:09 2018
@@ -46,10 +46,6 @@
 	</licenses>
 
 	<modules>
-		<module>javax.annotation-api</module>
-		<module>javax.el-api</module>
-		<module>javax.interceptor-api</module>
-		<module>javax.cdi-api</module>
 		<module>cdi-extra</module>
 		<module>cdi-extender</module>
 		<module>cdi-extension-http</module>