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/12/24 23:51:04 UTC
svn commit: r1849707 - in /aries/trunk/cdi: cdi-bom/ cdi-bom/pom.xml
cdi-executable/executable.bndrun cdi-executable/logback.xml
cdi-executable/pom.xml cdi-extender/pom.xml cdi-itests/pom.xml pom.xml
Author: rotty3000
Date: Mon Dec 24 23:51:03 2018
New Revision: 1849707
URL: http://svn.apache.org/viewvc?rev=1849707&view=rev
Log:
[CDI] provide a CDI bom
Signed-off-by: Raymond Auge <ro...@apache.org>
Added:
aries/trunk/cdi/cdi-bom/
aries/trunk/cdi/cdi-bom/pom.xml
Modified:
aries/trunk/cdi/cdi-executable/executable.bndrun
aries/trunk/cdi/cdi-executable/logback.xml
aries/trunk/cdi/cdi-executable/pom.xml
aries/trunk/cdi/cdi-extender/pom.xml
aries/trunk/cdi/cdi-itests/pom.xml
aries/trunk/cdi/pom.xml
Added: aries/trunk/cdi/cdi-bom/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-bom/pom.xml?rev=1849707&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-bom/pom.xml (added)
+++ aries/trunk/cdi/cdi-bom/pom.xml Mon Dec 24 23:51:03 2018
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries.cdi</groupId>
+ <artifactId>org.apache.aries.cdi</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.aries.cdi.bom</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Aries CDI - BOM</name>
+ <description>Bill Of Materials for Apache Aries CDI.</description>
+
+ <dependencyManagement>
+ <dependencies>
+ <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.el.jsp</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.aries.cdi</groupId>
+ <artifactId>org.apache.aries.cdi.extra</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.spifly</groupId>
+ <artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
+ <version>1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.3.2.Final</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-osgi-bundle</artifactId>
+ <version>${weld.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>
+</project>
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-executable/executable.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/executable.bndrun?rev=1849707&r1=1849706&r2=1849707&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-executable/executable.bndrun (original)
+++ aries/trunk/cdi/cdi-executable/executable.bndrun Mon Dec 24 23:51:03 2018
@@ -19,16 +19,17 @@
osgi.identity;filter:='(osgi.identity=javax.ejb-api)',\
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)'
-runpath: \
org.apache.aries.cdi.executable,\
- 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,\
+ jul.to.slf4j
-runsystempackages: \
org.slf4j;version=1.7.25,\
@@ -42,12 +43,13 @@
jboss-classfilewriter;version='[1.2.3,1.2.4)',\
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.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.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.gogo.runtime;version='[1.1.0,1.1.1)',\
+ org.apache.felix.gogo.shell;version='[1.1.0,1.1.1)',\
+ 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)',\
org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
Modified: aries/trunk/cdi/cdi-executable/logback.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/logback.xml?rev=1849707&r1=1849706&r2=1849707&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-executable/logback.xml (original)
+++ aries/trunk/cdi/cdi-executable/logback.xml Mon Dec 24 23:51:03 2018
@@ -33,7 +33,7 @@
<logger name="org.eclipse" level="ERROR"/>
<logger name="org.jboss" level="ERROR"/>
- <root level="DEBUG">
+ <root level="WARN">
<appender-ref ref="STDOUT" />
</root>
</configuration>
Modified: aries/trunk/cdi/cdi-executable/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-executable/pom.xml?rev=1849707&r1=1849706&r2=1849707&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-executable/pom.xml (original)
+++ aries/trunk/cdi/cdi-executable/pom.xml Mon Dec 24 23:51:03 2018
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -19,10 +36,10 @@
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
<executable.name>executable</executable.name>
- <slf4j.version>1.7.25</slf4j.version>
</properties>
<dependencies>
+ <!-- Needed to compile the JUL fix -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
@@ -37,40 +54,26 @@
<artifactId>osgi.core</artifactId>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
- <scope>runtime</scope>
- </dependency>
+ <!-- Provided by the Aries CDI BOM -->
<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.extra</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <scope>runtime</scope>
+ <groupId>org.apache.aries.spifly</groupId>
+ <artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -78,21 +81,15 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <scope>runtime</scope>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.spifly</groupId>
- <artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
- <version>1.2</version>
- <scope>runtime</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
</dependency>
+
+ <!-- Additional runtime requirements -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
@@ -118,42 +115,31 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>1.0.2</version>
+ <version>1.1.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.shell</artifactId>
- <version>1.0.0</version>
+ <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.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>
+ <version>4.0.6</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>2.1.0</version>
+ <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.http.servlet-api</artifactId>
+ <artifactId>org.apache.felix.logback</artifactId>
+ <version>1.0.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -162,29 +148,20 @@
<version>3.13.100</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>3.3.2.Final</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.promise</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </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>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/cdi/cdi-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/pom.xml?rev=1849707&r1=1849706&r2=1849707&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/pom.xml (original)
+++ aries/trunk/cdi/cdi-extender/pom.xml Mon Dec 24 23:51:03 2018
@@ -147,13 +147,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.0</version>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: aries/trunk/cdi/cdi-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/pom.xml?rev=1849707&r1=1849706&r2=1849707&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/pom.xml (original)
+++ aries/trunk/cdi/cdi-itests/pom.xml Mon Dec 24 23:51:03 2018
@@ -248,13 +248,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
- <version>1.7.25</version>
+ <version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
+ <version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: aries/trunk/cdi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1849707&r1=1849706&r2=1849707&view=diff
==============================================================================
--- aries/trunk/cdi/pom.xml (original)
+++ aries/trunk/cdi/pom.xml Mon Dec 24 23:51:03 2018
@@ -37,7 +37,8 @@
<jsp.version>2.0</jsp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.version>2.12</surefire.version>
- <weld.release>3.0.5.Final</weld.release>
+ <slf4j.version>1.7.25</slf4j.version>
+ <weld.version>3.0.5.Final</weld.version>
</properties>
<licenses>
@@ -54,6 +55,7 @@
<module>cdi-extension-http</module>
<module>cdi-extension-jndi</module>
<module>cdi-itests</module>
+ <module>cdi-bom</module>
<module>cdi-executable</module>
</modules>
@@ -114,7 +116,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-osgi-bundle</artifactId>
- <version>${weld.release}</version>
+ <version>${weld.version}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>