Author: reto
Date: Mon Aug 16 16:24:21 2010
New Revision: 986011
URL: http://svn.apache.org/viewvc?rev=986011&view=rev
Log:
CLEREZZA-217: tests working again with pax-exam 1.2.1
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml?rev=986011&r1=986010&r2=986011&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
Mon Aug 16 16:24:21 2010
@@ -25,24 +25,24 @@
<groupId>org.apache.clerezza.ext</groupId>
<artifactId>com.hp.hpl.jena</artifactId>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.felix</groupId>
<version>1.0.0</version>
<artifactId>org.apache.felix.log</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
- <version>1.4</version>
+ <version>1.5.2</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
<scope>provided</scope>
- <version>1.4</version>
- <exclusions>
+ <version>1.5.2</version>
+ <!-- <exclusions>
<exclusion>
<artifactId>jmxri</artifactId>
<groupId>com.sun.jmx</groupId>
@@ -51,7 +51,7 @@
<artifactId>jmxtools</artifactId>
<groupId>com.sun.jdmk</groupId>
</exclusion>
- </exclusions>
+ </exclusions> -->
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
@@ -112,6 +112,11 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.permissiondescriptions</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.utils</artifactId>
<scope>provided</scope>
</dependency>
@@ -162,6 +167,16 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.utils</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.platform</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.content</artifactId>
<scope>provided</scope>
</dependency>
@@ -335,19 +350,16 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit</artifactId>
- <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-default</artifactId>
- <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -361,18 +373,15 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit-extender-impl</artifactId>
- <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit-extender</artifactId>
- <version>1.2.0</version>
</dependency>
</dependencies>
<build>
@@ -390,21 +399,6 @@
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
- <version>1.2.0</version>
- <executions>
- <execution>
- <id>generate-depends-file</id>
- <goals>
-
<goal>generate-depends-file</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-config</id>
- <goals>
-
<goal>generate-config</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java?rev=986011&r1=986010&r2=986011&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
Mon Aug 16 16:24:21 2010
@@ -61,8 +61,8 @@ public class FelixClerezzaPlatformTest {
"org.osgi.compendium").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
"com.hp.hpl.jena").versionAsInProject(),
-
mavenBundle().groupId("org.apache.felix").artifactId(
- "org.apache.felix.log").versionAsInProject(),
+
/*mavenBundle().groupId("org.apache.felix").artifactId(
+ "org.apache.felix.log").versionAsInProject(),*/
mavenBundle().groupId("org.ops4j.pax.logging").artifactId(
"pax-logging-api").versionAsInProject(),
mavenBundle().groupId("org.ops4j.pax.logging").artifactId(
@@ -102,14 +102,22 @@ public class FelixClerezzaPlatformTest {
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.rdf.ontologies").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.config").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.graphprovider.content").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.templating").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza.scala").artifactId(
+ "scala-compiler-osgi").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza.scala").artifactId(
+ "scala-library-osgi").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza.scala").artifactId(
"script-engine").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.permissiondescriptions").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.typerendering.scalaserverpages").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.rdf.scala.utils").versionAsInProject(),
@@ -162,15 +170,20 @@ public class FelixClerezzaPlatformTest {
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.web.resources.yui").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.permissiondescriptions").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.utils.imageprocessing").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.menumanager").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.language.core").versionAsInProject(),
+
mavenBundle().groupId("org.apache.httpcomponents").artifactId(
+ "httpcore-osgi").versionAsInProject(),
//dsProfile(),
configProfile(),
webProfile(),
junitBundles(),
+ vmOption("-XX:MaxPermSize=200m"),
frameworks(
felix()),
systemProperty("org.osgi.service.http.port").value(
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml?rev=986011&r1=986010&r2=986011&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml
Mon Aug 16 16:24:21 2010
@@ -113,20 +113,6 @@
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-depends-file</id>
- <goals>
-
<goal>generate-depends-file</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-config</id>
- <goals>
-
<goal>generate-config</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml?rev=986011&r1=986010&r2=986011&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Mon Aug 16
16:24:21 2010
@@ -218,7 +218,7 @@
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<executions>
<execution>
<id>generate-depends-file</id>
@@ -479,9 +479,9 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</dependency>
- <!-- this is a dependecy of pax-exam, enforcing latest
version
+ <!-- this is a dependecy of pax-exam, enforcing
latescat t version
to get latest felix -->
<dependency>
<groupId>org.ops4j.pax.runner</groupId>
@@ -491,12 +491,22 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit-extender</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+
<artifactId>pax-exam-junit-extender-impl</artifactId>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-default</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>com.sun.script.jruby</groupId>
