You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2013/06/22 15:36:13 UTC
svn commit: r1495728 - in /directmemory/trunk: integrations/ehcache/pom.xml
itests/osgi/pom.xml
itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/ehcache/EhCacheTest.java
Author: olamy
Date: Sat Jun 22 13:36:13 2013
New Revision: 1495728
URL: http://svn.apache.org/r1495728
Log:
trying to fix osgi metadatas
Modified:
directmemory/trunk/integrations/ehcache/pom.xml
directmemory/trunk/itests/osgi/pom.xml
directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/ehcache/EhCacheTest.java
Modified: directmemory/trunk/integrations/ehcache/pom.xml
URL: http://svn.apache.org/viewvc/directmemory/trunk/integrations/ehcache/pom.xml?rev=1495728&r1=1495727&r2=1495728&view=diff
==============================================================================
--- directmemory/trunk/integrations/ehcache/pom.xml (original)
+++ directmemory/trunk/integrations/ehcache/pom.xml Sat Jun 22 13:36:13 2013
@@ -33,6 +33,7 @@
<description>EHCache CacheStore Implementation to integrate DirectMemory Cache as OffHeapStore.</description>
<properties>
+ <!--
<osgi.import>
org.apache.directmemory*;version="${project.version}",
org.slf4j*,
@@ -40,8 +41,10 @@
</osgi.import>
<osgi.export>
org.apache.directmemory.ehcache;version="${project.version}";-noimport:=true,
- net.sf.ehcache.store.offheap;version="2.5.0";-noimport:=true
+ net.sf.ehcache.store.offheap;version="2.6.0";-noimport:=true,
+ net.sf.ehcache;version="2.6.0";-noimport:=true
</osgi.export>
+ -->
</properties>
<build>
Modified: directmemory/trunk/itests/osgi/pom.xml
URL: http://svn.apache.org/viewvc/directmemory/trunk/itests/osgi/pom.xml?rev=1495728&r1=1495727&r2=1495728&view=diff
==============================================================================
--- directmemory/trunk/itests/osgi/pom.xml (original)
+++ directmemory/trunk/itests/osgi/pom.xml Sat Jun 22 13:36:13 2013
@@ -100,6 +100,7 @@ under the License.
<osgi.debug.port>${osgi.debug.port}</osgi.debug.port>
<osgi.debug.suspend>${osgi.debug.suspend}</osgi.debug.suspend>
<direct.memory.version>${project.version}</direct.memory.version>
+ <ehcache.bundle.version>${ehcache.bundle.version}</ehcache.bundle.version>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
</systemPropertyVariables>
</configuration>
Modified: directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/ehcache/EhCacheTest.java
URL: http://svn.apache.org/viewvc/directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/ehcache/EhCacheTest.java?rev=1495728&r1=1495727&r2=1495728&view=diff
==============================================================================
--- directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/ehcache/EhCacheTest.java (original)
+++ directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/ehcache/EhCacheTest.java Sat Jun 22 13:36:13 2013
@@ -109,7 +109,7 @@ public class EhCacheTest extends DirectM
public static Option[] getDynamicMemoryEhCacheOptions() {
List<MavenArtifactProvisionOption> mavenOptions = Arrays.asList(
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.ehcache").version(
- "2.5.0_2"),
+ System.getProperty( "ehcache.bundle.version", "2.6.6_1" )),
mavenBundle().groupId("org.apache.directmemory").artifactId("directmemory-ehcache").version(
System.getProperty("direct.memory.version")));