diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-05-11 23:06:36 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-05-11 23:07:28 +0200 |
| commit | ed48e4f187504948ada7fc9ec39de85d1a37a6a9 (patch) | |
| tree | 7ca62b07bb6cc105cfba0d5b1c09997e91639917 /server/sonar-server/src/test/projects | |
| parent | 9f3a9dd2768ecf93c074a1d4020752be76a3a583 (diff) | |
| download | sonarqube-ed48e4f187504948ada7fc9ec39de85d1a37a6a9.tar.gz sonarqube-ed48e4f187504948ada7fc9ec39de85d1a37a6a9.zip | |
SONAR-6517 fix sharing of plugin api packages across plugin classloaders
Diffstat (limited to 'server/sonar-server/src/test/projects')
13 files changed, 36 insertions, 0 deletions
diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-server/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java new file mode 100644 index 00000000000..356a9c829af --- /dev/null +++ b/server/sonar-server/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java @@ -0,0 +1,6 @@ +package org.sonar.plugins.testbase.api; + +public class BaseApi { + public void doNothing() { + } +} diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar b/server/sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar Binary files differindex 9bd9e0e0fc1..32ac594aad1 100644 --- a/server/sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar +++ b/server/sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-server/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java new file mode 100644 index 00000000000..356a9c829af --- /dev/null +++ b/server/sonar-server/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java @@ -0,0 +1,6 @@ +package org.sonar.plugins.testbase.api; + +public class BaseApi { + public void doNothing() { + } +} diff --git a/server/sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar b/server/sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar Binary files differindex 2a6148ce7b6..f943a16b28f 100644 --- a/server/sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar +++ b/server/sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar b/server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar Binary files differindex 62eba2aa80f..278b4596227 100644 --- a/server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar +++ b/server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar b/server/sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar Binary files differindex 7a81fdf0cce..71dcee70496 100644 --- a/server/sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar +++ b/server/sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar b/server/sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar Binary files differindex 85e4772f474..590d91b74f2 100644 --- a/server/sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar +++ b/server/sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/test-require-plugin/pom.xml b/server/sonar-server/src/test/projects/test-require-plugin/pom.xml index 1f77e233f62..2c45fb3afb0 100644 --- a/server/sonar-server/src/test/projects/test-require-plugin/pom.xml +++ b/server/sonar-server/src/test/projects/test-require-plugin/pom.xml @@ -16,6 +16,13 @@ <version>4.5.4</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.codehaus.sonar.tests</groupId> + <artifactId>test-base-plugin</artifactId> + <version>0.1-SNAPSHOT</version> + <type>sonar-plugin</type> + <scope>provided</scope> + </dependency> </dependencies> <build> <sourceDirectory>src</sourceDirectory> diff --git a/server/sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java b/server/sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java index 440f73bfb58..80aa622cf84 100644 --- a/server/sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java +++ b/server/sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java @@ -5,6 +5,11 @@ import java.util.List; public class RequirePlugin extends SonarPlugin { + public RequirePlugin() { + // call a class that is in the api published by the base plugin + new org.sonar.plugins.testbase.api.BaseApi().doNothing(); + } + public List getExtensions() { return Collections.emptyList(); } diff --git a/server/sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar b/server/sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar Binary files differindex ac1f9f68e46..abf9bbed5eb 100644 --- a/server/sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar +++ b/server/sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml b/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml index ca207b10c19..58aee047206 100644 --- a/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml +++ b/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml @@ -16,6 +16,13 @@ <version>4.5.4</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.codehaus.sonar.tests</groupId> + <artifactId>test-base-plugin</artifactId> + <version>0.1-SNAPSHOT</version> + <type>sonar-plugin</type> + <scope>provided</scope> + </dependency> </dependencies> <build> <sourceDirectory>src</sourceDirectory> diff --git a/server/sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java b/server/sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java index 440f73bfb58..80aa622cf84 100644 --- a/server/sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java +++ b/server/sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java @@ -5,6 +5,11 @@ import java.util.List; public class RequirePlugin extends SonarPlugin { + public RequirePlugin() { + // call a class that is in the api published by the base plugin + new org.sonar.plugins.testbase.api.BaseApi().doNothing(); + } + public List getExtensions() { return Collections.emptyList(); } diff --git a/server/sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar b/server/sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar Binary files differindex 3437dfee71c..671f69f10f8 100644 --- a/server/sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar +++ b/server/sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar |