Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2012-11-09 07:40:49 -0500
committerMarkus Knauer2012-11-09 07:40:49 -0500
commit93d22f2307cafdad2cc383ed9e8015d83c77221b (patch)
treefba278fd91655f4022b6954997493b720a8f5622
parentb42698f0793be89458990a9037249089c078c570 (diff)
downloadorg.eclipse.rap-93d22f2307cafdad2cc383ed9e8015d83c77221b.tar.gz
org.eclipse.rap-93d22f2307cafdad2cc383ed9e8015d83c77221b.tar.xz
org.eclipse.rap-93d22f2307cafdad2cc383ed9e8015d83c77221b.zip
Do not use the jar file in rwt and rwt.osgi tests.
- Exclude (signed) jar file from test execution. - Add plain compiled classes to test class-path. - Remove security manager and Java policy file approach.
-rw-r--r--releng/org.eclipse.rap.releng/java.policy3
-rw-r--r--releng/org.eclipse.rap.releng/pom.xml5
-rw-r--r--tests/org.eclipse.rap.rwt.osgi.test/pom.xml20
-rw-r--r--tests/org.eclipse.rap.rwt.test/pom.xml5
4 files changed, 26 insertions, 7 deletions
diff --git a/releng/org.eclipse.rap.releng/java.policy b/releng/org.eclipse.rap.releng/java.policy
deleted file mode 100644
index facb61327f..0000000000
--- a/releng/org.eclipse.rap.releng/java.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
- permission java.security.AllPermission;
-}; \ No newline at end of file
diff --git a/releng/org.eclipse.rap.releng/pom.xml b/releng/org.eclipse.rap.releng/pom.xml
index 8b0be52110..bc4fd5a2d4 100644
--- a/releng/org.eclipse.rap.releng/pom.xml
+++ b/releng/org.eclipse.rap.releng/pom.xml
@@ -25,7 +25,7 @@
<tycho-version>0.16.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<signing-plugin-version>1.0.1</signing-plugin-version>
- <surefire-version>2.9</surefire-version>
+ <surefire-version>2.12.4</surefire-version>
<junit-version>3.8.2</junit-version>
<mockito-version>1.8.4</mockito-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -167,9 +167,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-version}</version>
- <configuration>
- <argLine>-Djava.security.manager -Djava.security.policy=${basedir}/java.policy</argLine>
- </configuration>
<executions>
<execution>
<id>test</id>
diff --git a/tests/org.eclipse.rap.rwt.osgi.test/pom.xml b/tests/org.eclipse.rap.rwt.osgi.test/pom.xml
index 232ae18525..d10cb7c171 100644
--- a/tests/org.eclipse.rap.rwt.osgi.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.osgi.test/pom.xml
@@ -24,4 +24,24 @@
<artifactId>org.eclipse.rap.rwt.osgi.test</artifactId>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- manually remove the dependency to the compiled and signed jar -->
+ <classpathDependencyExcludes>
+ <classpathDependencyExcludes>org.eclipse.rap:org.eclipse.rap.rwt.osgi</classpathDependencyExcludes>
+ </classpathDependencyExcludes>
+ <!-- manually include jar in classpath (maven-surefire does not use tycho's classpath resolver) -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/../../bundles/org.eclipse.rap.rwt.osgi/target/classes/</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/lib/resource_manager_test.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/tests/org.eclipse.rap.rwt.test/pom.xml b/tests/org.eclipse.rap.rwt.test/pom.xml
index 53635df4b6..bb682d396c 100644
--- a/tests/org.eclipse.rap.rwt.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.test/pom.xml
@@ -30,8 +30,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <!-- manually remove the dependency to the compiled and signed jar -->
+ <classpathDependencyExcludes>
+ <classpathDependencyExcludes>org.eclipse.rap:org.eclipse.rap.rwt</classpathDependencyExcludes>
+ </classpathDependencyExcludes>
<!-- manually include jar in classpath (maven-surefire does not use tycho's classpath resolver) -->
<additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/../../bundles/org.eclipse.rap.rwt/target/classes/</additionalClasspathElement>
<additionalClasspathElement>${basedir}/lib/resource_manager_test.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>

Back to the top