SLING-2788 - prepare for release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1560941 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index b4b08bf..a69e323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,21 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>derby.log</include>
+ <include>jackrabbit/**</include>
+ <include>coverage.ec</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -95,7 +110,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
<type>maven-plugin</type>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
index c1a14c8..b436511 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
@@ -48,7 +48,7 @@
@org.ops4j.pax.exam.Configuration
public Option[] config() {
- return SlingPaxOptions.defaultLaunchpadOptions("7-SNAPSHOT").getOptions();
+ return SlingPaxOptions.defaultLaunchpadOptions("6").getOptions();
}
@Test
@@ -69,4 +69,4 @@
assertNotNull(s);
s.logout();
}
- }
\ No newline at end of file
+ }
diff --git a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
index cc7cfe2..f11cd16 100644
--- a/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
+++ b/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
@@ -45,7 +45,7 @@
@org.ops4j.pax.exam.Configuration
public Option[] config() {
- return SlingPaxOptions.defaultLaunchpadOptions("7-SNAPSHOT").getOptions();
+ return SlingPaxOptions.defaultLaunchpadOptions("6").getOptions();
}
private void assertBundleActive(String symbolicName) {
@@ -98,47 +98,32 @@
"org.apache.sling.commons.classloader",
"org.apache.sling.commons.json",
"org.apache.sling.commons.log",
- "org.apache.sling.commons.logservice",
"org.apache.sling.commons.mime",
"org.apache.sling.commons.osgi",
"org.apache.sling.commons.scheduler",
"org.apache.sling.commons.threads",
- "org.apache.sling.discovery.api",
- "org.apache.sling.discovery.impl",
- "org.apache.sling.discovery.support",
"org.apache.sling.engine",
"org.apache.sling.event",
"org.apache.sling.extensions.explorer",
- "org.apache.sling.extensions.groovy",
"org.apache.sling.extensions.threaddump",
"org.apache.sling.extensions.webconsolebranding",
"org.apache.sling.extensions.webconsolesecurityprovider",
- "org.apache.sling.fragment.transaction",
- "org.apache.sling.fragment.ws",
- "org.apache.sling.fragment.xml",
"org.apache.sling.fsresource",
- "org.apache.sling.installer.console",
"org.apache.sling.installer.core",
- "org.apache.sling.installer.factory.configuration",
"org.apache.sling.installer.provider.file",
"org.apache.sling.installer.provider.jcr",
- "org.apache.sling.jcr.jcr-wrapper",
"org.apache.sling.jcr.api",
"org.apache.sling.jcr.base",
"org.apache.sling.jcr.classloader",
"org.apache.sling.jcr.contentloader",
- "org.apache.sling.jcr.davex",
"org.apache.sling.jcr.jackrabbit.accessmanager",
"org.apache.sling.jcr.jackrabbit.server",
"org.apache.sling.jcr.jackrabbit.usermanager",
"org.apache.sling.jcr.ocm",
- "org.apache.sling.jcr.registration",
"org.apache.sling.jcr.resource",
"org.apache.sling.jcr.webconsole",
- "org.apache.sling.jcr.webdav",
"org.apache.sling.launchpad.content",
"org.apache.sling.launchpad.installer",
- "org.apache.sling.resourceresolver",
"org.apache.sling.scripting.api",
"org.apache.sling.scripting.core",
"org.apache.sling.scripting.javascript",
@@ -187,4 +172,4 @@
fail("Some required services are missing:" + missing);
}
}
-}
\ No newline at end of file
+}