This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-teleporter.git
The following commit(s) were added to refs/heads/master by this push:
new 793ccef SLING-11633 Compile with Java 11 (#4)
793ccef is described below
commit 793ccef02e77c0221daaf1d589ea417eb372d35f
Author: Sufyan Haroon <[email protected]>
AuthorDate: Mon Mar 11 18:01:43 2024 +0530
SLING-11633 Compile with Java 11 (#4)
Co-authored-by: Sufyan Haroon <[email protected]>
---
pom.xml | 18 +++++++++++++-----
.../teleporter/client/ClientSideTeleporter.java | 22 +++++++++++-----------
.../client/DefaultPropertyBasedCustomizerTest.java | 2 +-
3 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 25e8e12..df01f3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>38</version>
+ <version>50</version>
<relativePath />
</parent>
@@ -76,17 +76,20 @@
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
- <version>3.0.0</version>
+ <version>4.0.0</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-analyzer</artifactId>
<version>1.13.0</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.junit.core</artifactId>
- <version>1.0.31-SNAPSHOT</version>
+ <version>1.0.30</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -101,24 +104,29 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.14</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
@@ -128,8 +136,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
+ <artifactId>mockito-core</artifactId>
+ <version>5.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/src/main/java/org/apache/sling/testing/teleporter/client/ClientSideTeleporter.java
b/src/main/java/org/apache/sling/testing/teleporter/client/ClientSideTeleporter.java
index ed0e199..7c33efa 100644
---
a/src/main/java/org/apache/sling/testing/teleporter/client/ClientSideTeleporter.java
+++
b/src/main/java/org/apache/sling/testing/teleporter/client/ClientSideTeleporter.java
@@ -41,8 +41,8 @@ import org.apache.commons.io.IOUtils;
import org.apache.sling.junit.rules.TeleporterRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
-import org.ops4j.pax.tinybundles.core.TinyBundle;
-import org.ops4j.pax.tinybundles.core.TinyBundles;
+import org.ops4j.pax.tinybundles.TinyBundle;
+import org.ops4j.pax.tinybundles.TinyBundles;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.NOPLogger;
@@ -78,26 +78,26 @@ public class ClientSideTeleporter extends TeleporterRule {
private InputStream buildTestBundle(Class<?> c, Collection<Class<?>>
embeddedClasses, String bundleSymbolicName) throws IOException {
final TinyBundle b = TinyBundles.bundle()
- .set("Bundle-SymbolicName", bundleSymbolicName)
- .set("Sling-Test-Regexp", c.getName() + ".*")
- .set("Sling-Test-WaitForService-Timeout",
Integer.toString(waitForServiceTimout))
- .add(c);
+ .setHeader("Bundle-SymbolicName", bundleSymbolicName)
+ .setHeader("Sling-Test-Regexp", c.getName() + ".*")
+ .setHeader("Sling-Test-WaitForService-Timeout",
Integer.toString(waitForServiceTimout))
+ .addClass(c);
for(Map.Entry<String, String> header :
additionalBundleHeaders.entrySet()) {
log.info("Add bundle header '{}' with value '{}'",
header.getKey(), header.getValue());
- b.set(header.getKey(), header.getValue());
+ b.setHeader(header.getKey(), header.getValue());
}
// enrich embedded classes by automatically detected dependencies
for(Class<?> clz : dependencyAnalyzer.getDependencies(log)) {
log.debug("Embed dependent class '{}' because it is referenced and
in the allowed package prefixes", clz);
- b.add(clz);
+ b.addClass(clz);
}
// Embed specified classes
for(Class<?> clz : embeddedClasses) {
log.info("Embed class '{}'", clz);
- b.add(clz);
+ b.addClass(clz);
}
// Embed specified resources
@@ -106,7 +106,7 @@ public class ClientSideTeleporter extends TeleporterRule {
final ClassResourceVisitor.Processor p = new
ClassResourceVisitor.Processor() {
@Override
public void process(String resourcePath, InputStream
resourceStream) throws IOException {
- b.add(resourcePath, resourceStream);
+ b.addResource(resourcePath, resourceStream);
log.info("Embed resource '{}'", resourcePath);
}
@@ -115,7 +115,7 @@ public class ClientSideTeleporter extends TeleporterRule {
}
}
- return b.build(TinyBundles.withBnd());
+ return b.build(TinyBundles.bndBuilder());
}
public void setBaseUrl(String url) {
diff --git
a/src/test/java/org/apache/sling/testing/teleporter/client/DefaultPropertyBasedCustomizerTest.java
b/src/test/java/org/apache/sling/testing/teleporter/client/DefaultPropertyBasedCustomizerTest.java
index 3435cfd..8e90376 100644
---
a/src/test/java/org/apache/sling/testing/teleporter/client/DefaultPropertyBasedCustomizerTest.java
+++
b/src/test/java/org/apache/sling/testing/teleporter/client/DefaultPropertyBasedCustomizerTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class DefaultPropertyBasedCustomizerTest {
