From a512de3bbd7929e0cd09523cf446cf24273838b3 Mon Sep 17 00:00:00 2001 From: simonbrandhof Date: Thu, 30 Sep 2010 17:35:41 +0000 Subject: [PATCH] upgrade trunk to 2.4-SNAPSHOT --- archetypes/sonar-basic-plugin/pom.xml | 2 +- archetypes/sonar-gwt-plugin/pom.xml | 2 +- plugins/sonar-checkstyle-plugin/pom.xml | 2 +- plugins/sonar-clover-plugin/pom.xml | 2 +- plugins/sonar-cobertura-plugin/pom.xml | 2 +- plugins/sonar-core-plugin/pom.xml | 2 +- plugins/sonar-cpd-plugin/pom.xml | 2 +- plugins/sonar-design-plugin/pom.xml | 2 +- plugins/sonar-findbugs-plugin/pom.xml | 2 +- plugins/sonar-googleanalytics-plugin/pom.xml | 2 +- plugins/sonar-pmd-plugin/pom.xml | 2 +- plugins/sonar-squid-java-plugin/pom.xml | 2 +- plugins/sonar-surefire-plugin/pom.xml | 2 +- pom.xml | 2 +- sonar-application/pom.xml | 2 +- sonar-batch/pom.xml | 2 +- sonar-channel/pom.xml | 2 +- sonar-check-api/pom.xml | 2 +- sonar-colorizer/pom.xml | 2 +- sonar-core-maven-plugin/pom.xml | 2 +- sonar-core/pom.xml | 2 +- sonar-deprecated/pom.xml | 2 +- sonar-duplications/pom.xml | 2 +- sonar-graph/pom.xml | 2 +- sonar-gwt-api/pom.xml | 2 +- sonar-maven-plugin/pom.xml | 2 +- sonar-maven3-plugin/pom.xml | 2 +- sonar-plugin-api/pom.xml | 2 +- .../src/main/java/org/sonar/api/rules/RuleRepository.java | 3 ++- sonar-server/pom.xml | 2 +- sonar-squid/pom.xml | 2 +- sonar-testing-harness/pom.xml | 2 +- sonar-ws-client/pom.xml | 2 +- tests/integration/checkstyle-extensions/pom.xml | 2 +- tests/integration/pmd-extensions/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/reference-plugin/pom.xml | 2 +- tests/integration/tests/pom.xml | 2 +- tests/volume/pom.xml | 2 +- 39 files changed, 40 insertions(+), 39 deletions(-) diff --git a/archetypes/sonar-basic-plugin/pom.xml b/archetypes/sonar-basic-plugin/pom.xml index 8cb2ddc9305..59565bc876f 100644 --- a/archetypes/sonar-basic-plugin/pom.xml +++ b/archetypes/sonar-basic-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. diff --git a/archetypes/sonar-gwt-plugin/pom.xml b/archetypes/sonar-gwt-plugin/pom.xml index 377bfde4d1a..02fefc35488 100644 --- a/archetypes/sonar-gwt-plugin/pom.xml +++ b/archetypes/sonar-gwt-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. diff --git a/plugins/sonar-checkstyle-plugin/pom.xml b/plugins/sonar-checkstyle-plugin/pom.xml index 4262dcfa7e5..8837be8948c 100644 --- a/plugins/sonar-checkstyle-plugin/pom.xml +++ b/plugins/sonar-checkstyle-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-clover-plugin/pom.xml b/plugins/sonar-clover-plugin/pom.xml index 0405112f093..49aeb594f26 100644 --- a/plugins/sonar-clover-plugin/pom.xml +++ b/plugins/sonar-clover-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-cobertura-plugin/pom.xml b/plugins/sonar-cobertura-plugin/pom.xml index c259d5a95be..124cf20dd4e 100644 --- a/plugins/sonar-cobertura-plugin/pom.xml +++ b/plugins/sonar-cobertura-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-core-plugin/pom.xml b/plugins/sonar-core-plugin/pom.xml index 0b599a3e273..59db64620fa 100644 --- a/plugins/sonar-core-plugin/pom.xml +++ b/plugins/sonar-core-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-cpd-plugin/pom.xml b/plugins/sonar-cpd-plugin/pom.xml index f15ec0e824d..bea430d52bc 100644 --- a/plugins/sonar-cpd-plugin/pom.xml +++ b/plugins/sonar-cpd-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-design-plugin/pom.xml b/plugins/sonar-design-plugin/pom.xml index 360361aec5e..c49a09559b1 100644 --- a/plugins/sonar-design-plugin/pom.xml +++ b/plugins/sonar-design-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-findbugs-plugin/pom.xml b/plugins/sonar-findbugs-plugin/pom.xml index d74fc6a92a7..e5a6a2de718 100644 --- a/plugins/sonar-findbugs-plugin/pom.xml +++ b/plugins/sonar-findbugs-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-googleanalytics-plugin/pom.xml b/plugins/sonar-googleanalytics-plugin/pom.xml index 2eb1bb62e24..cad5b9230d9 100644 --- a/plugins/sonar-googleanalytics-plugin/pom.xml +++ b/plugins/sonar-googleanalytics-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-pmd-plugin/pom.xml b/plugins/sonar-pmd-plugin/pom.xml index fe66fe29934..83a23d63e02 100644 --- a/plugins/sonar-pmd-plugin/pom.xml +++ b/plugins/sonar-pmd-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-squid-java-plugin/pom.xml b/plugins/sonar-squid-java-plugin/pom.xml index 9ae8a290a2f..aaf83b00c29 100644 --- a/plugins/sonar-squid-java-plugin/pom.xml +++ b/plugins/sonar-squid-java-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-surefire-plugin/pom.xml b/plugins/sonar-surefire-plugin/pom.xml index 67d03648873..6c05234504c 100644 --- a/plugins/sonar-surefire-plugin/pom.xml +++ b/plugins/sonar-surefire-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/pom.xml b/pom.xml index cf312641ffc..393b655a8cc 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar pom - 2.3-SNAPSHOT + 2.4-SNAPSHOT Sonar http://www.sonarsource.org diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index 027d20d6f03..e6f372b49f8 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT sonar-application jar diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml index 5ff838014a5..d437f4f0ae5 100644 --- a/sonar-batch/pom.xml +++ b/sonar-batch/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT org.codehaus.sonar diff --git a/sonar-channel/pom.xml b/sonar-channel/pom.xml index f4e0c5891fc..fe801dd48a0 100644 --- a/sonar-channel/pom.xml +++ b/sonar-channel/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT .. sonar-channel diff --git a/sonar-check-api/pom.xml b/sonar-check-api/pom.xml index 361499f631d..781dce3480a 100644 --- a/sonar-check-api/pom.xml +++ b/sonar-check-api/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT .. sonar-check-api diff --git a/sonar-colorizer/pom.xml b/sonar-colorizer/pom.xml index abca4773a36..b641ba86a5b 100644 --- a/sonar-colorizer/pom.xml +++ b/sonar-colorizer/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT .. sonar-colorizer diff --git a/sonar-core-maven-plugin/pom.xml b/sonar-core-maven-plugin/pom.xml index af6706ef6b2..73ac82df647 100644 --- a/sonar-core-maven-plugin/pom.xml +++ b/sonar-core-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml index 2874417e059..83f207bcc10 100644 --- a/sonar-core/pom.xml +++ b/sonar-core/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT sonar-core Sonar :: Core diff --git a/sonar-deprecated/pom.xml b/sonar-deprecated/pom.xml index 6cad8861fc9..c8b955f1eb8 100644 --- a/sonar-deprecated/pom.xml +++ b/sonar-deprecated/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT sonar-deprecated Sonar :: Deprecated diff --git a/sonar-duplications/pom.xml b/sonar-duplications/pom.xml index 9b0554bc921..a1374b66466 100644 --- a/sonar-duplications/pom.xml +++ b/sonar-duplications/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT sonar-duplications Sonar :: Duplications diff --git a/sonar-graph/pom.xml b/sonar-graph/pom.xml index 62942050670..81fb23dd4f6 100644 --- a/sonar-graph/pom.xml +++ b/sonar-graph/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT .. org.codehaus.sonar diff --git a/sonar-gwt-api/pom.xml b/sonar-gwt-api/pom.xml index be88d29c861..5bdebbd3e6f 100644 --- a/sonar-gwt-api/pom.xml +++ b/sonar-gwt-api/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT sonar-gwt-api jar diff --git a/sonar-maven-plugin/pom.xml b/sonar-maven-plugin/pom.xml index 7b088a6807e..1701cd2f97d 100644 --- a/sonar-maven-plugin/pom.xml +++ b/sonar-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT sonar-maven-plugin maven-plugin diff --git a/sonar-maven3-plugin/pom.xml b/sonar-maven3-plugin/pom.xml index c9a60c9eb1d..71022136e4d 100644 --- a/sonar-maven3-plugin/pom.xml +++ b/sonar-maven3-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT sonar-maven3-plugin maven-plugin diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml index 712f58e424f..a8ac876468c 100644 --- a/sonar-plugin-api/pom.xml +++ b/sonar-plugin-api/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT sonar-plugin-api jar diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleRepository.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleRepository.java index 755aa90c094..84d9d6d6214 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleRepository.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RuleRepository.java @@ -22,6 +22,7 @@ package org.sonar.api.rules; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; +import org.sonar.api.BatchExtension; import org.sonar.api.ServerExtension; import java.util.List; @@ -29,7 +30,7 @@ import java.util.List; /** * @since 2.3 */ -public abstract class RuleRepository implements ServerExtension { +public abstract class RuleRepository implements BatchExtension, ServerExtension { private String key; private String language; diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml index a100eb8d94b..3427d048c85 100644 --- a/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT sonar-server war diff --git a/sonar-squid/pom.xml b/sonar-squid/pom.xml index 3f98dff47ab..eb5423ecf3c 100644 --- a/sonar-squid/pom.xml +++ b/sonar-squid/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT .. org.codehaus.sonar diff --git a/sonar-testing-harness/pom.xml b/sonar-testing-harness/pom.xml index 2f0cebf0b15..23782575945 100644 --- a/sonar-testing-harness/pom.xml +++ b/sonar-testing-harness/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT sonar-testing-harness jar diff --git a/sonar-ws-client/pom.xml b/sonar-ws-client/pom.xml index 2875ed54b10..18603e61382 100644 --- a/sonar-ws-client/pom.xml +++ b/sonar-ws-client/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT sonar-ws-client jar diff --git a/tests/integration/checkstyle-extensions/pom.xml b/tests/integration/checkstyle-extensions/pom.xml index b683e4b38f3..31e256bc455 100644 --- a/tests/integration/checkstyle-extensions/pom.xml +++ b/tests/integration/checkstyle-extensions/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar.tests integration - 2.3-SNAPSHOT + 2.4-SNAPSHOT checkstyle-extensions Sonar :: Integration Tests :: Checkstyle Extensions diff --git a/tests/integration/pmd-extensions/pom.xml b/tests/integration/pmd-extensions/pom.xml index a306799c4f7..2093c3e8b95 100644 --- a/tests/integration/pmd-extensions/pom.xml +++ b/tests/integration/pmd-extensions/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar.tests integration - 2.3-SNAPSHOT + 2.4-SNAPSHOT pmd-extensions diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 855ffc33d47..fe363492826 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.tests diff --git a/tests/integration/reference-plugin/pom.xml b/tests/integration/reference-plugin/pom.xml index b88ab5e0f6b..23058ffcff5 100644 --- a/tests/integration/reference-plugin/pom.xml +++ b/tests/integration/reference-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar.tests integration - 2.3-SNAPSHOT + 2.4-SNAPSHOT reference-plugin diff --git a/tests/integration/tests/pom.xml b/tests/integration/tests/pom.xml index ae3cc362ae7..7832c3402ba 100644 --- a/tests/integration/tests/pom.xml +++ b/tests/integration/tests/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar.tests integration - 2.3-SNAPSHOT + 2.4-SNAPSHOT tests diff --git a/tests/volume/pom.xml b/tests/volume/pom.xml index ea3b1bd187e..d26e7e7eeea 100644 --- a/tests/volume/pom.xml +++ b/tests/volume/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.3-SNAPSHOT + 2.4-SNAPSHOT ../.. org.codehaus.sonar.tests -- 2.39.5