You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2023/07/21 06:58:23 UTC
[sling-org-apache-sling-launchpad-base] branch master updated: SLING-11976 : Update to parent 51 and make build work with Java 11
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git
The following commit(s) were added to refs/heads/master by this push:
new f6b6cd5 SLING-11976 : Update to parent 51 and make build work with Java 11
f6b6cd5 is described below
commit f6b6cd5d73f8e0b5427152e15333f764215f56b3
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 21 08:58:16 2023 +0200
SLING-11976 : Update to parent 51 and make build work with Java 11
---
.gitignore | 1 +
pom.xml | 24 +++++-----
.../sling/launchpad/app/ControlListener.java | 2 +-
.../sling/launchpad/base/impl/SlingFelix.java | 1 -
.../sling/launchpad/base/impl/StartupManager.java | 24 ++++------
.../sling/launchpad/app/ControlListenerTest.java | 6 +--
.../ClassLoaderResourceProviderChildrenTest.java | 3 +-
.../base/impl/StartupManagerTimestampTest.java | 2 +-
.../BootstrapCommandFileTest.java | 37 ++++-----------
.../UninstallBundleCommandTest.java | 53 ++++++----------------
10 files changed, 51 insertions(+), 102 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5b783ed..d4bfe7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.vscode
/target
.idea
.classpath
diff --git a/pom.xml b/pom.xml
index db3dc2a..3354517 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>51</version>
<relativePath />
</parent>
@@ -233,6 +233,15 @@
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.20</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>
+ --add-reads=org.apache.felix.framework=java.management
+ </argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -276,22 +285,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- <version>1.4</version>
+ <version>5.4.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/main/java/org/apache/sling/launchpad/app/ControlListener.java b/src/main/java/org/apache/sling/launchpad/app/ControlListener.java
index ac0af14..8aef2b3 100644
--- a/src/main/java/org/apache/sling/launchpad/app/ControlListener.java
+++ b/src/main/java/org/apache/sling/launchpad/app/ControlListener.java
@@ -565,7 +565,7 @@ class ControlListener implements Runnable {
return result;
}
- private static String generateKey() {
+ public static String generateKey() {
return new BigInteger(165, new SecureRandom()).toString(32);
}
diff --git a/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java b/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
index 373c060..f3d8a0a 100644
--- a/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
+++ b/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
@@ -24,7 +24,6 @@ import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
-import java.util.Properties;
import org.apache.felix.framework.Felix;
import org.apache.sling.launchpad.base.shared.Loader;
diff --git a/src/main/java/org/apache/sling/launchpad/base/impl/StartupManager.java b/src/main/java/org/apache/sling/launchpad/base/impl/StartupManager.java
index d7a5f9c..5e87644 100644
--- a/src/main/java/org/apache/sling/launchpad/base/impl/StartupManager.java
+++ b/src/main/java/org/apache/sling/launchpad/base/impl/StartupManager.java
@@ -23,7 +23,6 @@ import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.Map;
import org.apache.felix.framework.Logger;
@@ -183,20 +182,15 @@ public class StartupManager {
long getTimeStampOfClass(final Class<?> clazz, final long selfStamp) {
long timeStamp = selfStamp;
final ClassLoader loader = clazz.getClassLoader();
- if (loader instanceof URLClassLoader) {
- @SuppressWarnings("resource")
- final URLClassLoader urlLoader = (URLClassLoader) loader;
- final URL[] urls = urlLoader.getURLs();
- if (urls.length > 0) {
- final URL url = urls[0];
- try {
- final long stamp = urls[0].openConnection().getLastModified();
- if ( stamp > selfStamp ) {
- logger.log(Logger.LOG_INFO, String.format("Newer timestamp for %s from %s : %s", clazz.getName(), url, selfStamp));
- timeStamp = stamp;
- }
- } catch (final IOException ignore) {}
- }
+ final URL url = loader.getResource(clazz.getName().replace('.', '/') + ".class");
+ if (url != null) {
+ try {
+ final long stamp = url.openConnection().getLastModified();
+ if ( stamp > selfStamp ) {
+ logger.log(Logger.LOG_INFO, String.format("Newer timestamp for %s from %s : %s", clazz.getName(), url, selfStamp));
+ timeStamp = stamp;
+ }
+ } catch (final IOException ignore) {}
}
return timeStamp;
}
diff --git a/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java b/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java
index fecb2a4..10277c3 100644
--- a/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java
+++ b/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java
@@ -32,7 +32,6 @@ import org.apache.sling.launchpad.base.shared.SharedConstants;
import org.junit.Assert;
import junit.framework.TestCase;
-import junitx.util.PrivateAccessor;
public class ControlListenerTest extends TestCase {
@@ -344,10 +343,7 @@ public class ControlListenerTest extends TestCase {
public void test_generateKey() throws Throwable {
Pattern pattern = Pattern.compile("([a-zA-Z0-9-_=]+)");
- MyMain main = new MyMain(SLING1);
- ControlListener cl = new ControlListener(main, null);
-
- String secretkey = (String) PrivateAccessor.invoke(cl, "generateKey", new Class[] {}, new Object[] {});
+ String secretkey = ControlListener.generateKey();
Assert.assertTrue(secretkey.length() >= 32);
Matcher matcher = pattern.matcher(secretkey);
if (!matcher.matches()) {
diff --git a/src/test/java/org/apache/sling/launchpad/base/impl/ClassLoaderResourceProviderChildrenTest.java b/src/test/java/org/apache/sling/launchpad/base/impl/ClassLoaderResourceProviderChildrenTest.java
index af4431f..2078996 100644
--- a/src/test/java/org/apache/sling/launchpad/base/impl/ClassLoaderResourceProviderChildrenTest.java
+++ b/src/test/java/org/apache/sling/launchpad/base/impl/ClassLoaderResourceProviderChildrenTest.java
@@ -38,7 +38,6 @@ import java.util.jar.JarFile;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mockito;
public class ClassLoaderResourceProviderChildrenTest {
@@ -78,7 +77,7 @@ public class ClassLoaderResourceProviderChildrenTest {
entries.add(new JarEntry(path));
}
- when(cl.getResource(Matchers.contains("install"))).thenReturn(url);
+ when(cl.getResource(Mockito.contains("install"))).thenReturn(url);
when(conn.getJarFile()).thenReturn(f);
when(f.entries()).thenReturn(entries.elements());
diff --git a/src/test/java/org/apache/sling/launchpad/base/impl/StartupManagerTimestampTest.java b/src/test/java/org/apache/sling/launchpad/base/impl/StartupManagerTimestampTest.java
index 1cf18f5..c5299e0 100644
--- a/src/test/java/org/apache/sling/launchpad/base/impl/StartupManagerTimestampTest.java
+++ b/src/test/java/org/apache/sling/launchpad/base/impl/StartupManagerTimestampTest.java
@@ -55,7 +55,7 @@ public class StartupManagerTimestampTest {
@Test
public void testClassTimestamp() {
final int defaultValue = Integer.MIN_VALUE;
- final long ts = startupManager.getTimeStampOfClass(getClass(), defaultValue);
+ final long ts = startupManager.getTimeStampOfClass(StartupManager.class, defaultValue);
assertTrue("Expecting non-default timestamp, got " + ts, ts > defaultValue);
}
}
diff --git a/src/test/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/BootstrapCommandFileTest.java b/src/test/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/BootstrapCommandFileTest.java
index ab38ac3..16bd488 100644
--- a/src/test/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/BootstrapCommandFileTest.java
+++ b/src/test/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/BootstrapCommandFileTest.java
@@ -32,24 +32,18 @@ import java.util.Hashtable;
import java.util.List;
import org.apache.felix.framework.Logger;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.mockito.Mockito;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.Version;
-@RunWith(JMock.class)
public class BootstrapCommandFileTest {
private final Logger logger = new Logger();
private final File nonExistentFile = new File("/nonexistent." + System.currentTimeMillis());
- final Mockery mockery = new JUnit4Mockery();
private File dataFile;
private File cmdFile;
private BundleContext bundleContext;
@@ -58,28 +52,17 @@ public class BootstrapCommandFileTest {
public void setUp() throws IOException,BundleException {
dataFile = File.createTempFile(getClass().getSimpleName(), "txt");
- final Bundle b1 = mockery.mock(Bundle.class);
- mockery.checking(new Expectations() {{
- allowing(b1).getSymbolicName();
- will(returnValue("somebundle"));
- allowing(b1).getHeaders();
- will(returnValue(new Hashtable<String, String>()));
- allowing(b1).getVersion();
- will(returnValue(new Version("1.0.0")));
- allowing(b1).uninstall();
- }});
+ final Bundle b1 = Mockito.mock(Bundle.class);
+ Mockito.when(b1.getSymbolicName()).thenReturn("somebundle");
+ Mockito.when(b1.getHeaders()).thenReturn(new Hashtable<String, String>());
+ Mockito.when(b1.getVersion()).thenReturn(new Version("1.0.0"));
+
final Bundle [] bundles = { b1 };
-
- bundleContext = mockery.mock(BundleContext.class);
- mockery.checking(new Expectations() {{
- allowing(bundleContext).getDataFile(with(any(String.class)));
- will(returnValue(dataFile));
- allowing(bundleContext).getBundles();
- will(returnValue(bundles));
- allowing(bundleContext).getServiceReference(with(any(String.class)));
- will(returnValue(null));
- }});
+ bundleContext = Mockito.mock(BundleContext.class);
+ Mockito.when(bundleContext.getDataFile(Mockito.anyString())).thenReturn(dataFile);
+ Mockito.when(bundleContext.getBundles()).thenReturn(bundles);
+ Mockito.when(bundleContext.getServiceReference(Mockito.anyString())).thenReturn(null);
cmdFile = File.createTempFile(getClass().getSimpleName(), "cmd");
final PrintWriter w = new PrintWriter(new FileWriter(cmdFile));
diff --git a/src/test/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/UninstallBundleCommandTest.java b/src/test/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/UninstallBundleCommandTest.java
index da0ccba..4c3cc87 100644
--- a/src/test/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/UninstallBundleCommandTest.java
+++ b/src/test/java/org/apache/sling/launchpad/base/impl/bootstrapcommands/UninstallBundleCommandTest.java
@@ -23,21 +23,15 @@ import static org.junit.Assert.assertNotNull;
import java.util.Hashtable;
import org.apache.felix.framework.Logger;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.mockito.Mockito;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Version;
/** Test the UninstallBundleCommand */
-@RunWith(JMock.class)
public class UninstallBundleCommandTest {
- final Mockery mockery = new JUnit4Mockery();
private BundleContext bundleContext;
private final Logger logger = new Logger();
@@ -45,45 +39,26 @@ public class UninstallBundleCommandTest {
public void setUp() throws Exception {
final Bundle [] b = new Bundle[3];
for(int i=0; i < b.length; i++) {
- b[i] = mockery.mock(Bundle.class, "bundle" + i);
+ b[i] = Mockito.mock(Bundle.class);
}
// b0 is in version range, will be uninstalled
- mockery.checking(new Expectations() {{
- allowing(b[0]).getSymbolicName();
- will(returnValue("testbundle"));
- allowing(b[0]).getHeaders();
- will(returnValue(new Hashtable<String, String>()));
- allowing(b[0]).getVersion();
- will(returnValue(new Version("1.0.0")));
- exactly(1).of(b[0]).uninstall();
- }});
+ Mockito.when(b[0].getSymbolicName()).thenReturn("testbundle");
+ Mockito.when(b[0].getHeaders()).thenReturn(new Hashtable<String, String>());
+ Mockito.when(b[0].getVersion()).thenReturn(new Version("1.0.0"));
// b1 is not in version range, not uninstalled
- mockery.checking(new Expectations() {{
- allowing(b[1]).getSymbolicName();
- will(returnValue("testbundle"));
- allowing(b[1]).getHeaders();
- will(returnValue(new Hashtable<String, String>()));
- allowing(b[1]).getVersion();
- will(returnValue(new Version("2.0.0")));
- }});
+ Mockito.when(b[1].getSymbolicName()).thenReturn("testbundle");
+ Mockito.when(b[1].getHeaders()).thenReturn(new Hashtable<String, String>());
+ Mockito.when(b[1].getVersion()).thenReturn(new Version("2.0.0"));
// b2 has different symbolic name, not uninstalled
- mockery.checking(new Expectations() {{
- allowing(b[2]).getSymbolicName();
- will(returnValue("otherbundle"));
- allowing(b[2]).getHeaders();
- will(returnValue(new Hashtable<String, String>()));
- allowing(b[2]).getVersion();
- will(returnValue(new Version("1.0.0")));
- }});
+ Mockito.when(b[2].getSymbolicName()).thenReturn("otherbundle");
+ Mockito.when(b[2].getHeaders()).thenReturn(new Hashtable<String, String>());
+ Mockito.when(b[2].getVersion()).thenReturn(new Version("1.0.0"));
- bundleContext = mockery.mock(BundleContext.class);
- mockery.checking(new Expectations() {{
- allowing(bundleContext).getBundles();
- will(returnValue(b));
- }});
+ bundleContext = Mockito.mock(BundleContext.class);
+ Mockito.when(bundleContext.getBundles()).thenReturn(b);
}
@Test
@@ -93,6 +68,7 @@ public class UninstallBundleCommandTest {
final Command cmd = proto.parse("uninstall testbundle 1.0.0");
assertNotNull("Expecting parsing to succeed", cmd);
cmd.execute(logger, bundleContext);
+ Mockito.verify(bundleContext.getBundles()[0]).uninstall();
}
@Test
@@ -102,5 +78,6 @@ public class UninstallBundleCommandTest {
final Command cmd = proto.parse("uninstall testbundle " + from1Includedto2NotIncluded);
assertNotNull("Expecting parsing to succeed", cmd);
cmd.execute(logger, bundleContext);
+ Mockito.verify(bundleContext.getBundles()[0]).uninstall();
}
}
\ No newline at end of file