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:55:01 UTC
svn commit: r1832713 - in /aries/trunk/cdi: ./ cdi-extender/ cdi-itests/
cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/
cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT/
cdi-itests/local-repo/org/...
Author: rotty3000
Date: Fri Jun 1 18:55:01 2018
New Revision: 1832713
URL: http://svn.apache.org/viewvc?rev=1832713&view=rev
Log:
[CDI] cleanup and update dependencies
Signed-off-by: Raymond Auge <ro...@apache.org>
Removed:
aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT/maven-metadata-local.xml
aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT/org.apache.felix.configadmin-1.9.0-SNAPSHOT-sources.jar
aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT/org.apache.felix.configadmin-1.9.0-SNAPSHOT.bundle
aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT/org.apache.felix.configadmin-1.9.0-SNAPSHOT.jar
aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT/org.apache.felix.configadmin-1.9.0-SNAPSHOT.pom
aries/trunk/cdi/cdi-itests/local-repo/org/apache/felix/org.apache.felix.configadmin/maven-metadata-local.xml
aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/3.13.0/org.eclipse.osgi-3.13.0.jar
aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/3.13.0/org.eclipse.osgi-3.13.0.pom
aries/trunk/cdi/cdi-itests/local-repo/org/eclipse/platform/org.eclipse.osgi/maven-metadata-local.xml
aries/trunk/cdi/javax.inject-api/README
aries/trunk/cdi/javax.inject-api/bnd.bnd
aries/trunk/cdi/javax.inject-api/pom.xml
Modified:
aries/trunk/cdi/cdi-extender/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/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java
aries/trunk/cdi/javax.cdi-api/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=1832713&r1=1832712&r2=1832713&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/pom.xml (original)
+++ aries/trunk/cdi/cdi-extender/pom.xml Fri Jun 1 18:55:01 2018
@@ -27,8 +27,8 @@
</parent>
<artifactId>org.apache.aries.cdi.extender</artifactId>
- <name>CDI Extender</name>
- <description>CDI Extender</description>
+ <name>Aries CCR</name>
+ <description>Aries CDI Component Runtime</description>
<build>
<plugins>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
- <version>1.8.6</version>
+ <version>1.11.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-osgi-bundle</artifactId>
- <version>3.0.2.Final</version>
+ <version>${weld.release}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
Modified: aries/trunk/cdi/cdi-itests/cdi-executable.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/cdi-executable.bndrun?rev=1832713&r1=1832712&r2=1832713&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/cdi-executable.bndrun (original)
+++ aries/trunk/cdi/cdi-itests/cdi-executable.bndrun Fri Jun 1 18:55:01 2018
@@ -39,7 +39,6 @@
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.inject-api;version='[0.0.2,0.0.3)',\
org.apache.aries.javax.interceptor-api;version='[0.0.2,0.0.3)',\
org.apache.felix.configadmin;version='[1.9.0,1.9.1)',\
org.apache.felix.gogo.command;version='[1.0.2,1.0.3)',\
@@ -48,6 +47,7 @@
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.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)',\
Modified: aries/trunk/cdi/cdi-itests/itest.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/itest.bndrun?rev=1832713&r1=1832712&r2=1832713&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/itest.bndrun (original)
+++ aries/trunk/cdi/cdi-itests/itest.bndrun Fri Jun 1 18:55:01 2018
@@ -46,7 +46,6 @@
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.inject-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)',\
@@ -59,10 +58,11 @@
org.apache.felix.gogo.shell;version='[1.0.0,1.0.1)',\
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.0.8,2.0.9)',\
+ org.apache.felix.scr;version='[2.1.0,2.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)',\
Modified: aries/trunk/cdi/cdi-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/pom.xml?rev=1832713&r1=1832712&r2=1832713&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/pom.xml (original)
+++ aries/trunk/cdi/cdi-itests/pom.xml Fri Jun 1 18:55:01 2018
@@ -38,6 +38,74 @@
<build>
<plugins>
<plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.4.0</version>
+ <executions>
+ <execution>
+ <id>get-equinox-3.13.0</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/plugins/org.eclipse.osgi_3.13.0.v20180409-1500.jar</url>
+ <outputDirectory>${project.build.directory}/equinox</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>get-equinox-3.13.0-sources</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/plugins/org.eclipse.osgi.source_3.13.0.v20180409-1500.jar</url>
+ <outputDirectory>${project.build.directory}/equinox</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.5.2</version>
+ <executions>
+ <execution>
+ <id>install-equinox</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <repositoryLayout>default</repositoryLayout>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.13.0.v20180409-1500</version>
+ <file>${project.build.directory}/equinox/org.eclipse.osgi_3.13.0.v20180409-1500.jar</file>
+ <packaging>jar</packaging>
+ <generatePom>true</generatePom>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install-equinox-sources</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <repositoryLayout>default</repositoryLayout>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.13.0.v20180409-1500</version>
+ <file>${project.build.directory}/equinox/org.eclipse.osgi.source_3.13.0.v20180409-1500.jar</file>
+ <packaging>jar</packaging>
+ <classifier>sources</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>
@@ -142,7 +210,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -205,7 +273,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.8</version>
+ <version>2.1.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -227,7 +295,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.13.0</version>
+ <version>3.13.0.v20180409-1500</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -305,18 +373,4 @@
<scope>runtime</scope>
</dependency>
</dependencies>
-
- <repositories>
- <repository>
- <id>my-local-repo</id>
- <url>file://${project.basedir}/local-repo/</url>
- <releases>
- <enabled>true</enabled>
- <checksumPolicy>ignore</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java?rev=1832713&r1=1832712&r2=1832713&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java Fri Jun 1 18:55:01 2018
@@ -17,6 +17,8 @@ package org.apache.aries.cdi.test.cases;
import static org.junit.Assert.*;
import java.io.InputStream;
+import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -37,7 +39,6 @@ import org.junit.rules.TestName;
import org.osgi.annotation.bundle.Requirement;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
@@ -164,6 +165,14 @@ public class AbstractTestCase {
return track(filter(pattern, objects));
}
+ public Dictionary<String, Object> getProperties(ServiceReference<Integer> reference) {
+ Dictionary<String, Object> properties = new Hashtable<>();
+ for (String key : reference.getPropertyKeys()) {
+ properties.put(key, reference.getProperty(key));
+ }
+ return properties;
+ }
+
BeanManager getBeanManager(Bundle bundle) throws Exception {
return getServiceTracker(bundle).waitForService(timeout);
}
@@ -182,7 +191,7 @@ public class AbstractTestCase {
long getChangeCount(ServiceReference<?> reference) {
return Optional.ofNullable(
- reference.getProperty(Constants.SERVICE_CHANGECOUNT)
+ reference.getProperty("service.changecount")
).map(
v -> (Long)v
).orElse(
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java?rev=1832713&r1=1832712&r2=1832713&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java Fri Jun 1 18:55:01 2018
@@ -70,7 +70,7 @@ public class EventsTests extends Abstrac
changeCount = containerDTO.changeCount;
- Dictionary<String, Object> properties = int1.getReference().getProperties();
+ Dictionary<String, Object> properties = getProperties(int1.getReference());
properties.put("foo", "bar");
int1.setProperties(properties);
@@ -126,7 +126,7 @@ public class EventsTests extends Abstrac
changeCount = containerDTO.changeCount;
- Dictionary<String, Object> properties = int1.getReference().getProperties();
+ Dictionary<String, Object> properties = getProperties(int1.getReference());
properties.put("foo", "bar");
int1.setProperties(properties);
Modified: aries/trunk/cdi/javax.cdi-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/pom.xml?rev=1832713&r1=1832712&r2=1832713&view=diff
==============================================================================
--- aries/trunk/cdi/javax.cdi-api/pom.xml (original)
+++ aries/trunk/cdi/javax.cdi-api/pom.xml Fri Jun 1 18:55:01 2018
@@ -104,13 +104,13 @@
</dependency>
<dependency>
<groupId>org.apache.aries.spec</groupId>
- <artifactId>org.apache.aries.javax.inject-api</artifactId>
+ <artifactId>org.apache.aries.javax.interceptor-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.spec</groupId>
- <artifactId>org.apache.aries.javax.interceptor-api</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>
+ <version>1_3</version>
</dependency>
</dependencies>
Modified: aries/trunk/cdi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1832713&r1=1832712&r2=1832713&view=diff
==============================================================================
--- aries/trunk/cdi/pom.xml (original)
+++ aries/trunk/cdi/pom.xml Fri Jun 1 18:55:01 2018
@@ -32,8 +32,7 @@
<version>0.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <bnd.version>4.0.0-SNAPSHOT</bnd.version>
- <full.version>${project.version} (${timestamp} AD)</full.version>
+ <bnd.version>4.0.0</bnd.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.version>2.12</surefire.version>
<weld.release>3.0.2.Final</weld.release>
@@ -49,7 +48,6 @@
<modules>
<module>javax.annotation-api</module>
<module>javax.el-api</module>
- <module>javax.inject-api</module>
<module>javax.interceptor-api</module>
<module>javax.cdi-api</module>
<module>cdi-extra</module>