sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1753900 - in /sling/trunk/bundles/commons/classloader: pom.xml src/test/java/org/apache/sling/commons/classloader/impl/ClassLoadingTest.java
Date Sun, 24 Jul 2016 10:47:59 GMT
Author: cziegeler
Date: Sun Jul 24 10:47:59 2016
New Revision: 1753900

URL: http://svn.apache.org/viewvc?rev=1753900&view=rev
Log:
Update to parent pom 27

Modified:
    sling/trunk/bundles/commons/classloader/pom.xml
    sling/trunk/bundles/commons/classloader/src/test/java/org/apache/sling/commons/classloader/impl/ClassLoadingTest.java

Modified: sling/trunk/bundles/commons/classloader/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/classloader/pom.xml?rev=1753900&r1=1753899&r2=1753900&view=diff
==============================================================================
--- sling/trunk/bundles/commons/classloader/pom.xml (original)
+++ sling/trunk/bundles/commons/classloader/pom.xml Sun Jul 24 10:47:59 2016
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>26</version>
+        <version>27</version>
         <relativePath/>
     </parent>
 
@@ -49,8 +49,8 @@
         <bundle.file.name>
             ${bundle.build.name}/${project.build.finalName}.jar
         </bundle.file.name>
-        <pax-exam.version>4.6.0</pax-exam.version>
-        <pax-link.version>2.4.3</pax-link.version>
+        <pax-exam.version>4.9.1</pax-exam.version>
+        <pax-link.version>2.4.7</pax-link.version>
     </properties>
 
     <build>
@@ -68,18 +68,11 @@
                         <Bundle-Activator>
                             org.apache.sling.commons.classloader.impl.Activator
                         </Bundle-Activator>
-                        <Export-Package>
-                            org.apache.sling.commons.classloader;version=1.3.0
-                        </Export-Package>
-                        <Private-Package>
-                            org.apache.sling.commons.classloader.impl
-                        </Private-Package>
                     </instructions>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.12</version>
                 <executions>
                     <execution>
                          <goals>
@@ -122,11 +115,11 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
+            <artifactId>osgi.cmpn</artifactId>
         </dependency>
       <!-- Unit Testing -->
         <dependency>

Modified: sling/trunk/bundles/commons/classloader/src/test/java/org/apache/sling/commons/classloader/impl/ClassLoadingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/classloader/src/test/java/org/apache/sling/commons/classloader/impl/ClassLoadingTest.java?rev=1753900&r1=1753899&r2=1753900&view=diff
==============================================================================
--- sling/trunk/bundles/commons/classloader/src/test/java/org/apache/sling/commons/classloader/impl/ClassLoadingTest.java
(original)
+++ sling/trunk/bundles/commons/classloader/src/test/java/org/apache/sling/commons/classloader/impl/ClassLoadingTest.java
Sun Jul 24 10:47:59 2016
@@ -16,12 +16,11 @@
  */
 package org.apache.sling.commons.classloader.impl;
 
-import org.junit.Assert;
-
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.Sequence;
 import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Assert;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -53,10 +52,10 @@ public class ClassLoadingTest {
         this.context.checking(new Expectations() {{
             allowing(bundleContext).createFilter(with(any(String.class)));
             will(returnValue(null));
+            allowing(bundleContext).getServiceReferences(with(any(String.class)), with((String)null));
+            will(returnValue(null));
             allowing(bundleContext).addServiceListener(with(any(ServiceListener.class)),
with(any(String.class)));
             allowing(bundleContext).removeServiceListener(with(any(ServiceListener.class)));
-            allowing(bundleContext).getServiceReferences(with(any(String.class)), with(any(String.class)));
-            will(returnValue(null));
             allowing(packageAdmin).getExportedPackage("org.apache.sling.test");
             will(returnValue(ep));
             allowing(ep).getExportingBundle();



Mime
View raw message