Author: cziegeler
Date: Thu Sep 15 08:26:19 2016
New Revision: 1760894
URL: http://svn.apache.org/viewvc?rev=1760894&view=rev
Log:
Try to fix build problems for reactor build
Modified:
sling/trunk/bundles/extensions/i18n/pom.xml
sling/trunk/bundles/extensions/i18n/src/test/java/org/apache/sling/i18n/it/ResourceBundleProviderIT.java
Modified: sling/trunk/bundles/extensions/i18n/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n/pom.xml?rev=1760894&r1=1760893&r2=1760894&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/i18n/pom.xml (original)
+++ sling/trunk/bundles/extensions/i18n/pom.xml Thu Sep 15 08:26:19 2016
@@ -38,7 +38,7 @@
</description>
<properties>
- <exam.version>3.3.0</exam.version>
+ <exam.version>3.5.0</exam.version>
<url.version>1.5.2</url.version>
<org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
<bundle.file.name>${basedir}/target/${project.build.finalName}.jar</bundle.file.name>
@@ -121,11 +121,6 @@
<bundle.file.name>${bundle.file.name}</bundle.file.name>
<sling.launchpad.version>${sling.launchpad.version}</sling.launchpad.version>
</systemPropertyVariables>
- <classpathDependencyExcludes>
- <!-- The osgi.org dependencies cause trouble with pax
exam -->
-
<classpathDependencyExcludes>org.osgi:org.osgi.core</classpathDependencyExcludes>
-
<classpathDependencyExcludes>org.osgi:org.osgi.compendium</classpathDependencyExcludes>
- </classpathDependencyExcludes>
</configuration>
</plugin>
<plugin>
@@ -232,12 +227,6 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.paxexam.util</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
<version>2.0.14</version>
<scope>test</scope>
@@ -292,6 +281,11 @@
<version>5.4.0</version>
<scope>test</scope>
</dependency>
- </dependencies>
-
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.paxexam.util</artifactId>
+ <version>1.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified:
sling/trunk/bundles/extensions/i18n/src/test/java/org/apache/sling/i18n/it/ResourceBundleProviderIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n/src/test/java/org/apache/sling/i18n/it/ResourceBundleProviderIT.java?rev=1760894&r1=1760893&r2=1760894&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/i18n/src/test/java/org/apache/sling/i18n/it/ResourceBundleProviderIT.java
(original)
+++
sling/trunk/bundles/extensions/i18n/src/test/java/org/apache/sling/i18n/it/ResourceBundleProviderIT.java
Thu Sep 15 08:26:19 2016
@@ -80,6 +80,7 @@ public class ResourceBundleProviderIT {
SlingPaxOptions.defaultLaunchpadOptions(launchpadVersion),
CoreOptions.provision(CoreOptions.bundle(thisProjectsBundle.toURI().toString())),
mavenBundle("org.apache.felix",
"org.apache.felix.http.servlet-api", "1.1.2"),
+ mavenBundle("org.apache.felix", "org.apache.felix.http.jetty",
"3.1.6"),
mavenBundle("org.apache.sling",
"org.apache.sling.commons.osgi", "2.4.0")
).getOptions();
}
