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 2019/01/15 16:30:16 UTC
svn commit: r1851396 - in /aries/trunk/cdi: cdi-bom/pom.xml
cdi-executable/executable.bndrun cdi-executable/pom.xml
cdi-executable/src/main/java/org/apache/aries/cdi/executable/EmbeddedActivator.java
cdi-itests/itest.bndrun cdi-itests/pom.xml pom.xml
Author: rotty3000
Date: Tue Jan 15 16:30:16 2019
New Revision: 1851396
URL: http://svn.apache.org/viewvc?rev=1851396&view=rev
Log:
[CDI] improve BOM and cleanup deps
Signed-off-by: Raymond Auge <ro...@apache.org>
Removed:
aries/trunk/cdi/cdi-executable/src/main/java/org/apache/aries/cdi/executable/EmbeddedActivator.java
Modified:
aries/trunk/cdi/cdi-bom/pom.xml
aries/trunk/cdi/cdi-executable/executable.bndrun
aries/trunk/cdi/cdi-executable/pom.xml
aries/trunk/cdi/cdi-itests/itest.bndrun
aries/trunk/cdi/cdi-itests/pom.xml
aries/trunk/cdi/pom.xml
Modified: aries/trunk/cdi/cdi-bom/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-bom/pom.xml?rev=1851396&r1=1851395&r2=1851396&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-bom/pom.xml (original)
+++ aries/trunk/cdi/cdi-bom/pom.xml Tue Jan 15 16:30:16 2019
@@ -75,6 +75,36 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.9.10</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>4.0.6</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.logback</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.13.200</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.3.2.Final</version>
Modified: aries/trunk/cdi/cdi-executable/executable.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/executable.bndrun?rev=1851396&r1=1851395&r2=1851396&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-executable/executable.bndrun (original)
+++ aries/trunk/cdi/cdi-executable/executable.bndrun Tue Jan 15 16:30:16 2019
@@ -20,16 +20,13 @@
osgi.identity;filter:='(osgi.identity=javax.transaction-api)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.extension.http)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.extra)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)'
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
-runpath: \
- org.apache.aries.cdi.executable,\
ch.qos.logback.classic,\
ch.qos.logback.core,\
org.apache.felix.logback,\
- slf4j.api,\
- jul.to.slf4j
+ slf4j.api
-runsystempackages: \
org.slf4j;version=1.7.25,\
@@ -45,10 +42,10 @@
org.apache.aries.cdi.extension.http;version='[0.0.2,0.0.3)',\
org.apache.aries.cdi.extra;version='[0.0.2,0.0.3)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.0,1.2.1)',\
- org.apache.felix.configadmin;version='[1.9.0,1.9.1)',\
- org.apache.felix.gogo.command;version='[1.0.2,1.0.3)',\
- org.apache.felix.gogo.runtime;version='[1.1.0,1.1.1)',\
- org.apache.felix.gogo.shell;version='[1.1.0,1.1.1)',\
+ org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
+ org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
+ org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
org.apache.felix.http.jetty;version='[4.0.6,4.0.7)',\
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)',\
@@ -70,5 +67,4 @@
eclipse.log.enabled=false,\
logback.configurationFile=file:${.}/logback.xml,\
org.osgi.service.http.port=8080,\
- osgi.console.enable.builtin=false, \
osgi.console=
Modified: aries/trunk/cdi/cdi-executable/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/pom.xml?rev=1851396&r1=1851395&r2=1851396&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-executable/pom.xml (original)
+++ aries/trunk/cdi/cdi-executable/pom.xml Tue Jan 15 16:30:16 2019
@@ -43,21 +43,6 @@
</properties>
<dependencies>
- <!-- Needed to compile the JUL fix -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- </dependency>
-
<!-- Provided by the Aries CDI BOM -->
<dependency>
<groupId>javax.ejb</groupId>
@@ -97,60 +82,30 @@
<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>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>1.1.0</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.shell</artifactId>
- <version>1.1.0</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>4.0.6</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback</artifactId>
- <version>1.0.0</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.13.100</version>
- <scope>runtime</scope>
</dependency>
</dependencies>
@@ -163,6 +118,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.bom</artifactId>
+ <version>1.0.2</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: aries/trunk/cdi/cdi-itests/itest.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/itest.bndrun?rev=1851396&r1=1851395&r2=1851396&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/itest.bndrun (original)
+++ aries/trunk/cdi/cdi-itests/itest.bndrun Tue Jan 15 16:30:16 2019
@@ -21,15 +21,13 @@
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.extra)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.itests)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.jndi.core)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
- osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)'
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
-runpath: \
- 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)',\
- jul.to.slf4j;version='[1.7.25,1.7.26)'
+ ch.qos.logback.classic,\
+ ch.qos.logback.core,\
+ org.apache.felix.logback,\
+ slf4j.api
-runsystempackages: \
org.slf4j;version=1.7.25,\
@@ -45,17 +43,18 @@
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.cdi.extension.jndi;version='[0.0.2,0.0.3)',\
+ org.apache.aries.cdi.extra;version='[0.0.2,0.0.3)',\
org.apache.aries.cdi.itests;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)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.0,1.2.1)',\
org.apache.aries.util;version='[1.0.0,1.0.1)',\
org.apache.commons.logging;version='[1.2.0,1.2.1)',\
- org.apache.felix.configadmin;version='[1.9.0,1.9.1)',\
- org.apache.felix.gogo.command;version='[1.0.2,1.0.3)',\
- org.apache.felix.gogo.runtime;version='[1.0.2,1.0.3)',\
- org.apache.felix.gogo.shell;version='[1.0.0,1.0.1)',\
- org.apache.felix.http.jetty;version='[4.0.4,4.0.5)',\
+ org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
+ org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
+ org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
+ org.apache.felix.http.jetty;version='[4.0.6,4.0.7)',\
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)',\
@@ -69,17 +68,13 @@
org.jboss.weld.osgi-bundle;version='[3.0.5,3.0.6)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
- org.osgi.util.promise;version='[1.1.0,1.1.1)',\
- org.apache.aries.cdi.extra;version='[0.0.2,0.0.3)'
+ org.osgi.util.promise;version='[1.1.0,1.1.1)'
-resolve.effective: resolve, active
-runee: JavaSE-1.8
--runsystemcapabilities: ${native_capability}
--runfw: org.eclipse.osgi;version=3.13.0
+-runfw: org.eclipse.osgi
-runproperties: \
eclipse.log.enabled=false,\
- java.util.logging.config.file=${.}/jul-logging.properties,\
logback.configurationFile=file:${.}/logback.xml,\
org.osgi.service.http.port=0,\
- osgi.console.enable.builtin=false, \
osgi.console=
Modified: aries/trunk/cdi/cdi-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/pom.xml?rev=1851396&r1=1851395&r2=1851396&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/pom.xml (original)
+++ aries/trunk/cdi/cdi-itests/pom.xml Tue Jan 15 16:30:16 2019
@@ -56,7 +56,6 @@
<dependency>
<groupId>org.apache.aries.cdi</groupId>
<artifactId>org.apache.aries.cdi.extra</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -110,34 +109,20 @@
<!-- RUNTIME -->
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>javax.ejb</groupId>
<artifactId>javax.ejb-api</artifactId>
- <version>3.2</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.cdi</groupId>
<artifactId>org.apache.aries.cdi.extender</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.cdi</groupId>
<artifactId>org.apache.aries.cdi.extension.http</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.cdi</groupId>
<artifactId>org.apache.aries.cdi.extension.jndi</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -158,65 +143,30 @@
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
- <version>1.0.14</version>
- <scope>runtime</scope>
</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>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.jline</artifactId>
- <version>1.0.2</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>1.0.2</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.shell</artifactId>
- <version>1.0.0</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>4.0.4</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback</artifactId>
- <version>1.0.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -234,34 +184,40 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>3.3.2.Final</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.13.0</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.cdi</groupId>
+ <artifactId>org.apache.aries.cdi.bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.bom</artifactId>
+ <version>1.0.2</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/cdi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1851396&r1=1851395&r2=1851396&view=diff
==============================================================================
--- aries/trunk/cdi/pom.xml (original)
+++ aries/trunk/cdi/pom.xml Tue Jan 15 16:30:16 2019
@@ -54,8 +54,8 @@
<module>cdi-extension-el-jsp</module>
<module>cdi-extension-http</module>
<module>cdi-extension-jndi</module>
- <module>cdi-itests</module>
<module>cdi-bom</module>
+ <module>cdi-itests</module>
<module>cdi-executable</module>
</modules>
@@ -408,9 +408,20 @@
<repositories>
<repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>https://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <repository>
<id>osgi-releases-and-snapshots</id>
<url>https://oss.sonatype.org/content/groups/osgi/</url>
<layout>default</layout>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</repository>
</repositories>