Author: bdelacretaz
Date: Thu Aug 8 14:20:14 2013
New Revision: 1511800
URL: http://svn.apache.org/r1511800
Log:
SLING-2987 - fix integration tests and remove obsolete modules from pom
Modified:
sling/branches/SLING-2987-healthcheck-redesign/it/src/test/java/org/apache/sling/hc/it/core/U.java
sling/branches/SLING-2987-healthcheck-redesign/pom.xml
Modified:
sling/branches/SLING-2987-healthcheck-redesign/it/src/test/java/org/apache/sling/hc/it/core/U.java
URL:
http://svn.apache.org/viewvc/sling/branches/SLING-2987-healthcheck-redesign/it/src/test/java/org/apache/sling/hc/it/core/U.java?rev=1511800&r1=1511799&r2=1511800&view=diff
==============================================================================
---
sling/branches/SLING-2987-healthcheck-redesign/it/src/test/java/org/apache/sling/hc/it/core/U.java
(original)
+++
sling/branches/SLING-2987-healthcheck-redesign/it/src/test/java/org/apache/sling/hc/it/core/U.java
Thu Aug 8 14:20:14 2013
@@ -49,7 +49,10 @@ public class U {
provision(
mavenBundle("org.apache.felix", "org.apache.felix.scr",
"1.6.2"),
mavenBundle("org.apache.sling",
"org.apache.sling.hc.core", coreVersion),
- mavenBundle("org.apache.sling",
"org.apache.sling.commons.osgi", "2.2.0")
+ mavenBundle("org.apache.sling",
"org.apache.sling.commons.osgi", "2.2.0"),
+ mavenBundle("org.apache.sling",
"org.apache.sling.jcr.jcr-wrapper", "2.0.0"),
+ mavenBundle("org.apache.sling",
"org.apache.sling.jcr.api", "2.1.0"),
+ mavenBundle("org.mortbay.jetty", "servlet-api-2.5",
"6.1.14")
)
);
}
Modified: sling/branches/SLING-2987-healthcheck-redesign/pom.xml
URL:
http://svn.apache.org/viewvc/sling/branches/SLING-2987-healthcheck-redesign/pom.xml?rev=1511800&r1=1511799&r2=1511800&view=diff
==============================================================================
--- sling/branches/SLING-2987-healthcheck-redesign/pom.xml (original)
+++ sling/branches/SLING-2987-healthcheck-redesign/pom.xml Thu Aug 8 14:20:14
2013
@@ -27,8 +27,6 @@
<modules>
<module>hc-core</module>
- <module>hc-rules</module>
- <module>hc-sling</module>
<module>sling-demo</module>
<module>it</module>
</modules>