You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by en...@apache.org on 2021/06/14 19:44:30 UTC
[sling-org-apache-sling-servlets-resolver] branch master updated:
SLING-10487 Update to Sling Bundle Parent 43
This is an automated email from the ASF dual-hosted git repository.
enorman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 70819c3 SLING-10487 Update to Sling Bundle Parent 43
70819c3 is described below
commit 70819c377630df56c2af2979d49384fdf31d0f2a
Author: Eric Norman <en...@apache.org>
AuthorDate: Mon Jun 14 12:44:20 2021 -0700
SLING-10487 Update to Sling Bundle Parent 43
---
pom.xml | 27 ++---------------
.../resolver/it/ServletResolverTestSupport.java | 35 +++++++++++-----------
2 files changed, 20 insertions(+), 42 deletions(-)
diff --git a/pom.xml b/pom.xml
index 92f96df..bbba837 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>39</version>
+ <version>43</version>
<relativePath />
</parent>
@@ -43,9 +43,9 @@
</scm>
<properties>
+ <project.build.outputTimestamp>2021-06-07T16:53:27Z</project.build.outputTimestamp>
<site.jira.version.id>12314292</site.jira.version.id>
<org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
- <jacoco.maven.plugin.version>0.8.2</jacoco.maven.plugin.version>
<!-- To debug the pax process, override this with -D -->
<pax.vm.options>-Xmx512M</pax.vm.options>
</properties>
@@ -121,29 +121,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>@{argLine}</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.maven.plugin.version}</version>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${project.build.directory}/jacoco-unit.exec</destFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
diff --git a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
index 72f8885..780e135 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
@@ -18,9 +18,20 @@
*/
package org.apache.sling.servlets.resolver.it;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingServlets;
+import static org.apache.sling.testing.paxexam.SlingOptions.versionResolver;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.CoreOptions.composite;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.when;
+import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
+
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
@@ -32,26 +43,11 @@ import org.apache.sling.engine.SlingRequestProcessor;
import org.apache.sling.servlethelpers.MockSlingHttpServletRequest;
import org.apache.sling.servlethelpers.MockSlingHttpServletResponse;
import org.apache.sling.testing.paxexam.TestSupport;
-import org.junit.Before;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import static org.apache.sling.testing.paxexam.SlingOptions.slingServlets;
-import static org.apache.sling.testing.paxexam.SlingOptions.versionResolver;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.vmOption;
-import static org.ops4j.pax.exam.CoreOptions.when;
-import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
-
public class ServletResolverTestSupport extends TestSupport {
@Inject
@@ -77,6 +73,8 @@ public class ServletResolverTestSupport extends TestSupport {
public Option[] configuration() {
final String debugPort = System.getProperty("debugPort");
final String vmOpt = System.getProperty("pax.vm.options");
+ final String jacocoOpt = System.getProperty("jacoco.command");
+
final int httpPort = findFreePort();
versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.api");
versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.resourceresolver");
@@ -91,6 +89,9 @@ public class ServletResolverTestSupport extends TestSupport {
when(vmOpt != null).useOptions(
vmOption(vmOpt)
),
+ when(jacocoOpt != null).useOptions(
+ vmOption(jacocoOpt)
+ ),
baseConfiguration(),
slingServlets(),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.converter").version("1.0.12"), // new Sling API dependency