This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/update-to-parent52
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-rewriter.git
commit bad6cd16aaf7269fa58ed35754a9cb8c682481de
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Tue Dec 26 19:36:35 2023 +0100
SLING-12211 Update Parent to 52
Update some testing dependencies
---
pom.xml | 52 +++++++++++-----------
.../impl/ProcessorConfigurationImplTest.java | 4 +-
2 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index e14231a..33933be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>47</version>
+ <version>52</version>
<relativePath />
</parent>
@@ -129,29 +129,23 @@
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.resource.presence</artifactId>
- <version>0.0.2</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.serviceusermapper</artifactId>
<version>1.3.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>3.1.0</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- OSGi -->
<dependency>
<groupId>org.osgi</groupId>
@@ -160,7 +154,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -178,6 +177,19 @@
<artifactId>org.osgi.service.component.annotations</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- start testing dependencies -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.paxexam</artifactId>
+ <version>4.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.resource.presence</artifactId>
+ <version>0.0.2</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.event</artifactId>
@@ -186,22 +198,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.log</artifactId>
- <version>1.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http</artifactId>
- <version>1.2.1</version>
<scope>test</scope>
</dependency>
- <!-- logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <!-- testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -222,7 +225,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.9.5</version>
+ <version>5.8.0</version>
<scope>test</scope>
</dependency>
<!-- Apache Felix -->
@@ -239,7 +242,6 @@
<version>1.12.1</version>
<scope>test</scope>
</dependency>
- <!-- testing -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.hamcrest</artifactId>
diff --git
a/src/test/java/org/apache/sling/rewriter/impl/ProcessorConfigurationImplTest.java
b/src/test/java/org/apache/sling/rewriter/impl/ProcessorConfigurationImplTest.java
index 7d6af9d..ad335f1 100644
---
a/src/test/java/org/apache/sling/rewriter/impl/ProcessorConfigurationImplTest.java
+++
b/src/test/java/org/apache/sling/rewriter/impl/ProcessorConfigurationImplTest.java
@@ -37,7 +37,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import com.google.common.collect.ImmutableMap;
@@ -54,7 +54,7 @@ public class ProcessorConfigurationImplTest {
public void setup() {
when(processingContext.getContentType()).thenReturn("text/html");
when(processingContext.getRequest()).thenReturn(context.request());
- when(processingContext.getResponse()).thenReturn(context.response());
+ //when(processingContext.getResponse()).thenReturn(context.response());
}
private ProcessorConfigurationImpl buildConfig(Map<String,Object>
configProps) {
