From 0196b85b64455b39c1e163319a4eecbc6175766b Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 9 Aug 2011 11:25:44 +0200 Subject: [maven-release-plugin] prepare release 2.10-RC2 --- archetypes/sonar-basic-plugin/pom.xml | 2 +- archetypes/sonar-gwt-plugin/pom.xml | 2 +- plugins/sonar-checkstyle-plugin/pom.xml | 2 +- plugins/sonar-cobertura-plugin/pom.xml | 2 +- plugins/sonar-core-gwt/pom.xml | 2 +- plugins/sonar-core-plugin/pom.xml | 2 +- plugins/sonar-cpd-plugin/pom.xml | 2 +- plugins/sonar-dbcleaner-plugin/pom.xml | 2 +- plugins/sonar-design-plugin/pom.xml | 2 +- plugins/sonar-email-notifications-plugin/pom.xml | 2 +- plugins/sonar-findbugs-plugin/pom.xml | 2 +- plugins/sonar-googleanalytics-plugin/pom.xml | 2 +- plugins/sonar-l10n-en-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 | 17 ++++++++--------- sonar-application/pom.xml | 2 +- sonar-batch-bootstrapper/pom.xml | 2 +- sonar-batch-maven-compat/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-java-api/pom.xml | 2 +- sonar-markdown/pom.xml | 2 +- sonar-maven-plugin/pom.xml | 2 +- sonar-maven3-plugin/pom.xml | 2 +- sonar-plugin-api/pom.xml | 2 +- sonar-server/pom.xml | 2 +- sonar-squid/pom.xml | 2 +- sonar-testing-harness/pom.xml | 2 +- sonar-ws-client/pom.xml | 2 +- 39 files changed, 46 insertions(+), 47 deletions(-) diff --git a/archetypes/sonar-basic-plugin/pom.xml b/archetypes/sonar-basic-plugin/pom.xml index 8d58f632349..08ee1b171c4 100644 --- a/archetypes/sonar-basic-plugin/pom.xml +++ b/archetypes/sonar-basic-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. diff --git a/archetypes/sonar-gwt-plugin/pom.xml b/archetypes/sonar-gwt-plugin/pom.xml index 31ec2248c3f..0f66848131f 100644 --- a/archetypes/sonar-gwt-plugin/pom.xml +++ b/archetypes/sonar-gwt-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. diff --git a/plugins/sonar-checkstyle-plugin/pom.xml b/plugins/sonar-checkstyle-plugin/pom.xml index b43a2c2cae5..0f8ddc2c12b 100644 --- a/plugins/sonar-checkstyle-plugin/pom.xml +++ b/plugins/sonar-checkstyle-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-cobertura-plugin/pom.xml b/plugins/sonar-cobertura-plugin/pom.xml index 4fde38170d0..2ad71fce53b 100644 --- a/plugins/sonar-cobertura-plugin/pom.xml +++ b/plugins/sonar-cobertura-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-core-gwt/pom.xml b/plugins/sonar-core-gwt/pom.xml index b501ab293a1..24fceaae75f 100644 --- a/plugins/sonar-core-gwt/pom.xml +++ b/plugins/sonar-core-gwt/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. sonar-core-gwt diff --git a/plugins/sonar-core-plugin/pom.xml b/plugins/sonar-core-plugin/pom.xml index 017856716bb..2b8581b3035 100644 --- a/plugins/sonar-core-plugin/pom.xml +++ b/plugins/sonar-core-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-cpd-plugin/pom.xml b/plugins/sonar-cpd-plugin/pom.xml index ea0eea7c185..9d20df42d2d 100644 --- a/plugins/sonar-cpd-plugin/pom.xml +++ b/plugins/sonar-cpd-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-dbcleaner-plugin/pom.xml b/plugins/sonar-dbcleaner-plugin/pom.xml index 67ab0934b1e..392860fff93 100644 --- a/plugins/sonar-dbcleaner-plugin/pom.xml +++ b/plugins/sonar-dbcleaner-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-design-plugin/pom.xml b/plugins/sonar-design-plugin/pom.xml index 074c481794e..921c7ed6bfa 100644 --- a/plugins/sonar-design-plugin/pom.xml +++ b/plugins/sonar-design-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-email-notifications-plugin/pom.xml b/plugins/sonar-email-notifications-plugin/pom.xml index db5076fad6c..7a4e41418cd 100644 --- a/plugins/sonar-email-notifications-plugin/pom.xml +++ b/plugins/sonar-email-notifications-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. diff --git a/plugins/sonar-findbugs-plugin/pom.xml b/plugins/sonar-findbugs-plugin/pom.xml index 24e5574f95d..e2d86c7f1fe 100644 --- a/plugins/sonar-findbugs-plugin/pom.xml +++ b/plugins/sonar-findbugs-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-googleanalytics-plugin/pom.xml b/plugins/sonar-googleanalytics-plugin/pom.xml index b0e8d77c612..eae6602aa21 100644 --- a/plugins/sonar-googleanalytics-plugin/pom.xml +++ b/plugins/sonar-googleanalytics-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. diff --git a/plugins/sonar-l10n-en-plugin/pom.xml b/plugins/sonar-l10n-en-plugin/pom.xml index 2080587ce93..d19c4a821bd 100644 --- a/plugins/sonar-l10n-en-plugin/pom.xml +++ b/plugins/sonar-l10n-en-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. diff --git a/plugins/sonar-pmd-plugin/pom.xml b/plugins/sonar-pmd-plugin/pom.xml index 7b36d130ff7..7077cbd4d53 100644 --- a/plugins/sonar-pmd-plugin/pom.xml +++ b/plugins/sonar-pmd-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-squid-java-plugin/pom.xml b/plugins/sonar-squid-java-plugin/pom.xml index 57f7ee18e47..1f81c781fb7 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.11-SNAPSHOT + 2.10-RC2 ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-surefire-plugin/pom.xml b/plugins/sonar-surefire-plugin/pom.xml index fd7b35c1c67..be9c3149ff3 100644 --- a/plugins/sonar-surefire-plugin/pom.xml +++ b/plugins/sonar-surefire-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 ../.. diff --git a/pom.xml b/pom.xml index 6a4e5b961a3..d3d019a4269 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 org.codehaus.sonar sonar pom - 2.11-SNAPSHOT + 2.10-RC2 Sonar http://www.sonarsource.org Put technical debt under control @@ -106,7 +105,7 @@ 1.5 - + -Xmx512m -Xss1024k dav:https://dav.codehaus.org/snapshots.repository/sonar @@ -1142,7 +1141,7 @@ - + @@ -1155,7 +1154,7 @@ - + @@ -1168,7 +1167,7 @@ - + @@ -1182,7 +1181,7 @@ - + @@ -1195,7 +1194,7 @@ - + diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index ef66df08615..80a665aa751 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-application jar diff --git a/sonar-batch-bootstrapper/pom.xml b/sonar-batch-bootstrapper/pom.xml index 1da517f33bb..29f3fa67b8d 100644 --- a/sonar-batch-bootstrapper/pom.xml +++ b/sonar-batch-bootstrapper/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-batch-bootstrapper diff --git a/sonar-batch-maven-compat/pom.xml b/sonar-batch-maven-compat/pom.xml index 47f0b515f1b..c8ca08c5993 100644 --- a/sonar-batch-maven-compat/pom.xml +++ b/sonar-batch-maven-compat/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-batch-maven-compat diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml index f6ab33cf18f..423beeed53f 100644 --- a/sonar-batch/pom.xml +++ b/sonar-batch/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 org.codehaus.sonar diff --git a/sonar-channel/pom.xml b/sonar-channel/pom.xml index 2758b32e6fc..cfbbaf30a55 100644 --- a/sonar-channel/pom.xml +++ b/sonar-channel/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 .. sonar-channel diff --git a/sonar-check-api/pom.xml b/sonar-check-api/pom.xml index d626cde8e77..c129193636b 100644 --- a/sonar-check-api/pom.xml +++ b/sonar-check-api/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 .. sonar-check-api diff --git a/sonar-colorizer/pom.xml b/sonar-colorizer/pom.xml index ac062366aaa..a710c873b6d 100644 --- a/sonar-colorizer/pom.xml +++ b/sonar-colorizer/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 .. sonar-colorizer diff --git a/sonar-core-maven-plugin/pom.xml b/sonar-core-maven-plugin/pom.xml index 9fb3b019aac..6ef093ca67b 100644 --- a/sonar-core-maven-plugin/pom.xml +++ b/sonar-core-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml index 61560744f54..0e6d84b2406 100644 --- a/sonar-core/pom.xml +++ b/sonar-core/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-core Sonar :: Core diff --git a/sonar-deprecated/pom.xml b/sonar-deprecated/pom.xml index b06320dfa5b..fe65086b08e 100644 --- a/sonar-deprecated/pom.xml +++ b/sonar-deprecated/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-deprecated Sonar :: Deprecated diff --git a/sonar-duplications/pom.xml b/sonar-duplications/pom.xml index f2d5d8ce047..7e3c6c73339 100644 --- a/sonar-duplications/pom.xml +++ b/sonar-duplications/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-duplications Sonar :: Duplications diff --git a/sonar-graph/pom.xml b/sonar-graph/pom.xml index 09606f4d41a..ed88cc56b41 100644 --- a/sonar-graph/pom.xml +++ b/sonar-graph/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 .. org.codehaus.sonar diff --git a/sonar-gwt-api/pom.xml b/sonar-gwt-api/pom.xml index 5386c335fe1..6fe29e5fa89 100644 --- a/sonar-gwt-api/pom.xml +++ b/sonar-gwt-api/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-gwt-api jar diff --git a/sonar-java-api/pom.xml b/sonar-java-api/pom.xml index 2ff857746f8..0486655103f 100644 --- a/sonar-java-api/pom.xml +++ b/sonar-java-api/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-java-api Sonar :: Java API diff --git a/sonar-markdown/pom.xml b/sonar-markdown/pom.xml index b2eab7de4c8..c3922abd7c1 100644 --- a/sonar-markdown/pom.xml +++ b/sonar-markdown/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 .. sonar-markdown diff --git a/sonar-maven-plugin/pom.xml b/sonar-maven-plugin/pom.xml index 1516fe7ba70..746421ace49 100644 --- a/sonar-maven-plugin/pom.xml +++ b/sonar-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-maven-plugin maven-plugin diff --git a/sonar-maven3-plugin/pom.xml b/sonar-maven3-plugin/pom.xml index ad32b9fd6f2..320c7521fa9 100644 --- a/sonar-maven3-plugin/pom.xml +++ b/sonar-maven3-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-maven3-plugin maven-plugin diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml index 5f562c904e1..c4664aacb2c 100644 --- a/sonar-plugin-api/pom.xml +++ b/sonar-plugin-api/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-plugin-api jar diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml index f0fa740e98f..4e205478576 100644 --- a/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-server war diff --git a/sonar-squid/pom.xml b/sonar-squid/pom.xml index d92981b1ace..e3e69189033 100644 --- a/sonar-squid/pom.xml +++ b/sonar-squid/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 .. org.codehaus.sonar diff --git a/sonar-testing-harness/pom.xml b/sonar-testing-harness/pom.xml index e1ca997cfaf..2d61d09b0ab 100644 --- a/sonar-testing-harness/pom.xml +++ b/sonar-testing-harness/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-testing-harness jar diff --git a/sonar-ws-client/pom.xml b/sonar-ws-client/pom.xml index f86f2fea36c..cf2753deebb 100644 --- a/sonar-ws-client/pom.xml +++ b/sonar-ws-client/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-RC2 sonar-ws-client jar -- cgit v1.2.3 From 9b84ef3a74ee2342e848dc08086a283110eda7e6 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 9 Aug 2011 11:25:45 +0200 Subject: [maven-release-plugin] prepare for next development iteration --- archetypes/sonar-basic-plugin/pom.xml | 2 +- archetypes/sonar-gwt-plugin/pom.xml | 2 +- plugins/sonar-checkstyle-plugin/pom.xml | 2 +- plugins/sonar-cobertura-plugin/pom.xml | 2 +- plugins/sonar-core-gwt/pom.xml | 2 +- plugins/sonar-core-plugin/pom.xml | 2 +- plugins/sonar-cpd-plugin/pom.xml | 2 +- plugins/sonar-dbcleaner-plugin/pom.xml | 2 +- plugins/sonar-design-plugin/pom.xml | 2 +- plugins/sonar-email-notifications-plugin/pom.xml | 2 +- plugins/sonar-findbugs-plugin/pom.xml | 2 +- plugins/sonar-googleanalytics-plugin/pom.xml | 2 +- plugins/sonar-l10n-en-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-bootstrapper/pom.xml | 2 +- sonar-batch-maven-compat/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-java-api/pom.xml | 2 +- sonar-markdown/pom.xml | 2 +- sonar-maven-plugin/pom.xml | 2 +- sonar-maven3-plugin/pom.xml | 2 +- sonar-plugin-api/pom.xml | 2 +- sonar-server/pom.xml | 2 +- sonar-squid/pom.xml | 2 +- sonar-testing-harness/pom.xml | 2 +- sonar-ws-client/pom.xml | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/archetypes/sonar-basic-plugin/pom.xml b/archetypes/sonar-basic-plugin/pom.xml index 08ee1b171c4..018641def44 100644 --- a/archetypes/sonar-basic-plugin/pom.xml +++ b/archetypes/sonar-basic-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. diff --git a/archetypes/sonar-gwt-plugin/pom.xml b/archetypes/sonar-gwt-plugin/pom.xml index 0f66848131f..aab1fa370a2 100644 --- a/archetypes/sonar-gwt-plugin/pom.xml +++ b/archetypes/sonar-gwt-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. diff --git a/plugins/sonar-checkstyle-plugin/pom.xml b/plugins/sonar-checkstyle-plugin/pom.xml index 0f8ddc2c12b..d0ca868630e 100644 --- a/plugins/sonar-checkstyle-plugin/pom.xml +++ b/plugins/sonar-checkstyle-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-cobertura-plugin/pom.xml b/plugins/sonar-cobertura-plugin/pom.xml index 2ad71fce53b..1dbd6f6ccc3 100644 --- a/plugins/sonar-cobertura-plugin/pom.xml +++ b/plugins/sonar-cobertura-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-core-gwt/pom.xml b/plugins/sonar-core-gwt/pom.xml index 24fceaae75f..4f6a84d051b 100644 --- a/plugins/sonar-core-gwt/pom.xml +++ b/plugins/sonar-core-gwt/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. sonar-core-gwt diff --git a/plugins/sonar-core-plugin/pom.xml b/plugins/sonar-core-plugin/pom.xml index 2b8581b3035..00b03525dc8 100644 --- a/plugins/sonar-core-plugin/pom.xml +++ b/plugins/sonar-core-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-cpd-plugin/pom.xml b/plugins/sonar-cpd-plugin/pom.xml index 9d20df42d2d..a8c4bb671d8 100644 --- a/plugins/sonar-cpd-plugin/pom.xml +++ b/plugins/sonar-cpd-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-dbcleaner-plugin/pom.xml b/plugins/sonar-dbcleaner-plugin/pom.xml index 392860fff93..ef0a699e63f 100644 --- a/plugins/sonar-dbcleaner-plugin/pom.xml +++ b/plugins/sonar-dbcleaner-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-design-plugin/pom.xml b/plugins/sonar-design-plugin/pom.xml index 921c7ed6bfa..8ed7317cfd5 100644 --- a/plugins/sonar-design-plugin/pom.xml +++ b/plugins/sonar-design-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-email-notifications-plugin/pom.xml b/plugins/sonar-email-notifications-plugin/pom.xml index 7a4e41418cd..359ff706848 100644 --- a/plugins/sonar-email-notifications-plugin/pom.xml +++ b/plugins/sonar-email-notifications-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. diff --git a/plugins/sonar-findbugs-plugin/pom.xml b/plugins/sonar-findbugs-plugin/pom.xml index e2d86c7f1fe..7687def4980 100644 --- a/plugins/sonar-findbugs-plugin/pom.xml +++ b/plugins/sonar-findbugs-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-googleanalytics-plugin/pom.xml b/plugins/sonar-googleanalytics-plugin/pom.xml index eae6602aa21..0847913abb7 100644 --- a/plugins/sonar-googleanalytics-plugin/pom.xml +++ b/plugins/sonar-googleanalytics-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. diff --git a/plugins/sonar-l10n-en-plugin/pom.xml b/plugins/sonar-l10n-en-plugin/pom.xml index d19c4a821bd..63ea27efc65 100644 --- a/plugins/sonar-l10n-en-plugin/pom.xml +++ b/plugins/sonar-l10n-en-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. diff --git a/plugins/sonar-pmd-plugin/pom.xml b/plugins/sonar-pmd-plugin/pom.xml index 7077cbd4d53..84d7233f91b 100644 --- a/plugins/sonar-pmd-plugin/pom.xml +++ b/plugins/sonar-pmd-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-squid-java-plugin/pom.xml b/plugins/sonar-squid-java-plugin/pom.xml index 1f81c781fb7..c86514ec2d9 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.10-RC2 + 2.10-SNAPSHOT ../.. org.codehaus.sonar.plugins diff --git a/plugins/sonar-surefire-plugin/pom.xml b/plugins/sonar-surefire-plugin/pom.xml index be9c3149ff3..7cd6d707563 100644 --- a/plugins/sonar-surefire-plugin/pom.xml +++ b/plugins/sonar-surefire-plugin/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT ../.. diff --git a/pom.xml b/pom.xml index d3d019a4269..8c836b1bad6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar pom - 2.10-RC2 + 2.10-SNAPSHOT Sonar http://www.sonarsource.org Put technical debt under control diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index 80a665aa751..4b3941e48db 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-application jar diff --git a/sonar-batch-bootstrapper/pom.xml b/sonar-batch-bootstrapper/pom.xml index 29f3fa67b8d..814fe1186b3 100644 --- a/sonar-batch-bootstrapper/pom.xml +++ b/sonar-batch-bootstrapper/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-batch-bootstrapper diff --git a/sonar-batch-maven-compat/pom.xml b/sonar-batch-maven-compat/pom.xml index c8ca08c5993..2b4c990c717 100644 --- a/sonar-batch-maven-compat/pom.xml +++ b/sonar-batch-maven-compat/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-batch-maven-compat diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml index 423beeed53f..89a6cb4fbaa 100644 --- a/sonar-batch/pom.xml +++ b/sonar-batch/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT org.codehaus.sonar diff --git a/sonar-channel/pom.xml b/sonar-channel/pom.xml index cfbbaf30a55..8a1fc5925f7 100644 --- a/sonar-channel/pom.xml +++ b/sonar-channel/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT .. sonar-channel diff --git a/sonar-check-api/pom.xml b/sonar-check-api/pom.xml index c129193636b..5c130b264db 100644 --- a/sonar-check-api/pom.xml +++ b/sonar-check-api/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT .. sonar-check-api diff --git a/sonar-colorizer/pom.xml b/sonar-colorizer/pom.xml index a710c873b6d..8e55317bc21 100644 --- a/sonar-colorizer/pom.xml +++ b/sonar-colorizer/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT .. sonar-colorizer diff --git a/sonar-core-maven-plugin/pom.xml b/sonar-core-maven-plugin/pom.xml index 6ef093ca67b..562d722195c 100644 --- a/sonar-core-maven-plugin/pom.xml +++ b/sonar-core-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml index 0e6d84b2406..a7de1503e90 100644 --- a/sonar-core/pom.xml +++ b/sonar-core/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-core Sonar :: Core diff --git a/sonar-deprecated/pom.xml b/sonar-deprecated/pom.xml index fe65086b08e..3675c1cd81a 100644 --- a/sonar-deprecated/pom.xml +++ b/sonar-deprecated/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-deprecated Sonar :: Deprecated diff --git a/sonar-duplications/pom.xml b/sonar-duplications/pom.xml index 7e3c6c73339..3325290dfd6 100644 --- a/sonar-duplications/pom.xml +++ b/sonar-duplications/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-duplications Sonar :: Duplications diff --git a/sonar-graph/pom.xml b/sonar-graph/pom.xml index ed88cc56b41..31c82aba65f 100644 --- a/sonar-graph/pom.xml +++ b/sonar-graph/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT .. org.codehaus.sonar diff --git a/sonar-gwt-api/pom.xml b/sonar-gwt-api/pom.xml index 6fe29e5fa89..659191e3ee8 100644 --- a/sonar-gwt-api/pom.xml +++ b/sonar-gwt-api/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-gwt-api jar diff --git a/sonar-java-api/pom.xml b/sonar-java-api/pom.xml index 0486655103f..42ba5c7932d 100644 --- a/sonar-java-api/pom.xml +++ b/sonar-java-api/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-java-api Sonar :: Java API diff --git a/sonar-markdown/pom.xml b/sonar-markdown/pom.xml index c3922abd7c1..49eb119a576 100644 --- a/sonar-markdown/pom.xml +++ b/sonar-markdown/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT .. sonar-markdown diff --git a/sonar-maven-plugin/pom.xml b/sonar-maven-plugin/pom.xml index 746421ace49..141b9929000 100644 --- a/sonar-maven-plugin/pom.xml +++ b/sonar-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-maven-plugin maven-plugin diff --git a/sonar-maven3-plugin/pom.xml b/sonar-maven3-plugin/pom.xml index 320c7521fa9..76e65d0fbd1 100644 --- a/sonar-maven3-plugin/pom.xml +++ b/sonar-maven3-plugin/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-maven3-plugin maven-plugin diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml index c4664aacb2c..dfb994003a5 100644 --- a/sonar-plugin-api/pom.xml +++ b/sonar-plugin-api/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-plugin-api jar diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml index 4e205478576..630c4497c85 100644 --- a/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-server war diff --git a/sonar-squid/pom.xml b/sonar-squid/pom.xml index e3e69189033..2d0959d3b49 100644 --- a/sonar-squid/pom.xml +++ b/sonar-squid/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT .. org.codehaus.sonar diff --git a/sonar-testing-harness/pom.xml b/sonar-testing-harness/pom.xml index 2d61d09b0ab..cb2dca64067 100644 --- a/sonar-testing-harness/pom.xml +++ b/sonar-testing-harness/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-testing-harness jar diff --git a/sonar-ws-client/pom.xml b/sonar-ws-client/pom.xml index cf2753deebb..313e69d17a5 100644 --- a/sonar-ws-client/pom.xml +++ b/sonar-ws-client/pom.xml @@ -4,7 +4,7 @@ org.codehaus.sonar sonar - 2.10-RC2 + 2.10-SNAPSHOT sonar-ws-client jar -- cgit v1.2.3 From f127da71a68783c5306d37fa66a845ea5f36e145 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 9 Aug 2011 12:09:00 +0200 Subject: Fix version of sample --- samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/pom.xml b/samples/pom.xml index 1e7308bd051..3b0669ea853 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ org.codehaus.sonar sonar - 2.11-SNAPSHOT + 2.10-SNAPSHOT .. org.codehaus.sonar.samples -- cgit v1.2.3 From f6c065834cddaeb5e1072a4ac0032c8c13f7c857 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Thu, 11 Aug 2011 15:54:36 +0200 Subject: Rename the page 'Settings' to 'General Settings' and move up 'Email Settings' --- .../main/resources/org/sonar/l10n/core.properties | 24 +++++++++++----------- .../WEB-INF/app/views/layouts/_layout.html.erb | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties index 12e43941c36..8aa669a8ae4 100644 --- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -266,28 +266,28 @@ backup.page=Backup clouds.page=Clouds components.page=Components coverage.page=Coverage -default_dashboards.page=Default dashboards -default_filters.page=Default filters +default_dashboards.page=Default Dashboards +default_filters.page=Default Filters dependencies.page=Dependencies -email_configuration.page=Email settings -event_categories.page=Event categories +email_configuration.page=Email Settings +event_categories.page=Event Categories filters.page=Filters -global_roles.page=Global roles -manual_metrics.page=Manual metrics -manual_measures.page=Manual measures -my_profile.page=My profile -project_roles.page=Project roles +global_roles.page=Global Roles +manual_metrics.page=Manual Metrics +manual_measures.page=Manual Measures +my_profile.page=My Profile +project_roles.page=Project Roles project_settings.page=Settings -quality_profiles.page=Quality profiles +quality_profiles.page=Quality Profiles reviews.page=Reviews -settings.page=Settings +settings.page=General Settings source.page=Source system_info.page=System Info timemachine.page=Time Machine user_groups.page=Groups users.page=Users violations.page=Violations -violations_drilldown.page=Violations drilldown +violations_drilldown.page=Violations Drilldown update_center.page=Update Center diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb index e8364f9b06b..871641fa03a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb @@ -80,13 +80,13 @@
  • <%= message('sidebar.system') -%>
  • <%= message('settings.page') -%>
    • +
  • <%= message('email_configuration.page') -%>
  • <%= message('backup.page') -%>
  • <%= message('system_info.page') -%>
    • <% update_center_activated = controller.java_facade.getConfigurationValue('sonar.updatecenter.activate') || 'true'; if update_center_activated=='true' %>
  • <%= message('update_center.page') -%>
    • <% end %> -
  • <%= message('email_configuration.page') -%>
    • <% end %> <% end %> -- cgit v1.2.3 From 9ca86cd73f8807401910cf8610b7b37bfb528b10 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 15 Aug 2011 15:47:40 +0200 Subject: SONAR-2707 Some dependencies might miss in the Libraries, Dependencies and Design services when running several sonar analysis at same time --- .../dbcleaner/purges/PurgeDependencies.java | 6 +- .../dbcleaner/purges/PurgeDependenciesTest.java | 9 +++ .../shouldNotPurgeUnprocessedSnapshots-result.xml | 73 ++++++++++++++++++++++ .../shouldNotPurgeUnprocessedSnapshots.xml | 73 ++++++++++++++++++++++ 4 files changed, 159 insertions(+), 2 deletions(-) create mode 100644 plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots-result.xml create mode 100644 plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots.xml diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java index a05bd16bb02..65792f152aa 100644 --- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java +++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeDependencies.java @@ -37,8 +37,10 @@ public final class PurgeDependencies extends Purge { public void purge(PurgeContext context) { Query query = getSession().createQuery("SELECT d.projectSnapshotId FROM " + DependencyDto.class.getSimpleName() + - " d WHERE NOT EXISTS(FROM " + Snapshot.class.getSimpleName() + " s WHERE s.id=d.projectSnapshotId AND s.last=:last)"); - query.setParameter("last", true); + " d WHERE EXISTS(FROM " + Snapshot.class.getSimpleName() + " s WHERE s.id=d.projectSnapshotId AND s.last=:last and s.status=:status)"); + query.setParameter("last", false); + query.setParameter("status", Snapshot.STATUS_PROCESSED); + final List projectSnapshotIds = query.getResultList(); PurgeUtils.executeQuery(getSession(), "", projectSnapshotIds, "DELETE FROM " + DependencyDto.class.getSimpleName() + " WHERE projectSnapshotId in (:ids)"); } diff --git a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest.java b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest.java index 3ce14d6d27b..5fb68a63e88 100644 --- a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest.java +++ b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest.java @@ -31,6 +31,15 @@ public class PurgeDependenciesTest extends AbstractDbUnitTestCase { assertPurge("purgeDependencies"); } + /** + * See https://jira.codehaus.org/browse/SONAR-2707 + * Do not remove dependencies which are computed at the same time in other parallel jobs. + */ + @Test + public void shouldNotPurgeUnprocessedSnapshots() throws SQLException { + assertPurge("shouldNotPurgeUnprocessedSnapshots"); + } + private void assertPurge(String testName) { setupData(testName); new PurgeDependencies(getSession()).purge(null); diff --git a/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots-result.xml b/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots-result.xml new file mode 100644 index 00000000000..2d2599d8794 --- /dev/null +++ b/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots-result.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots.xml b/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots.xml new file mode 100644 index 00000000000..6b143bea1ec --- /dev/null +++ b/plugins/sonar-dbcleaner-plugin/src/test/resources/org/sonar/plugins/dbcleaner/purges/PurgeDependenciesTest/shouldNotPurgeUnprocessedSnapshots.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3