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/06/01 18:54:55 UTC

svn commit: r1832712 - in /aries/trunk/cdi/cdi-itests: cdi-executable.bndrun pom.xml

Author: rotty3000
Date: Fri Jun  1 18:54:54 2018
New Revision: 1832712

URL: http://svn.apache.org/viewvc?rev=1832712&view=rev
Log:
[CDI] cleanup dependencies

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

Modified:
    aries/trunk/cdi/cdi-itests/cdi-executable.bndrun
    aries/trunk/cdi/cdi-itests/pom.xml

Modified: aries/trunk/cdi/cdi-itests/cdi-executable.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/cdi-executable.bndrun?rev=1832712&r1=1832711&r2=1832712&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/cdi-executable.bndrun (original)
+++ aries/trunk/cdi/cdi-itests/cdi-executable.bndrun Fri Jun  1 18:54:54 2018
@@ -62,9 +62,8 @@
 -runfw: org.eclipse.osgi;version='[3.13.0,4.0.0)'
 -runproperties: \
 	eclipse.log.enabled=false,\
+	logback.configurationFile=file:${.}/logback.xml,\
 	org.jboss.logging.provider=slf4j,\
 	org.osgi.service.http.port=8080,\
 	osgi.console.enable.builtin=false, \
 	osgi.console=
-
-#	logback.configurationFile=file:${.}/logback.xml,\
\ 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=1832712&r1=1832711&r2=1832712&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/pom.xml (original)
+++ aries/trunk/cdi/cdi-itests/pom.xml Fri Jun  1 18:54:54 2018
@@ -190,6 +190,12 @@
 			<artifactId>org.apache.felix.http.jetty</artifactId>
 			<version>3.4.2</version>
 			<scope>runtime</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.servlet</groupId>
+					<artifactId>javax.servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>