Copy only plugins instead of all libraries, when launching dev mode for sonar-server

diff --git a/sonar-server/derby-start.bat b/sonar-server/derby-start.bat
index 16396728f6fed4c034a6d668526e524fe7a5f9e2..0961d6bc42b34214e230f872c081862be82dcc7f 100644 (file)
--- a/sonar-server/derby-start.bat
+++ b/sonar-server/derby-start.bat
@@ -1,2 +1,2 @@
 set MAVEN_OPTS='-Xmx768m -XX:MaxPermSize=128m'
-mvn clean jetty:run -Pstart-dev-server,derby
\ No newline at end of file
+mvn clean jetty:run -Pstart-dev-server,derby

diff --git a/sonar-server/derby-start.sh b/sonar-server/derby-start.sh
index 009ac00529e905d2c330c882f6e700c84a679b4f..15903cacab701ee8a688a87cc22de2a8f42a7bc7 100755 (executable)
--- a/sonar-server/derby-start.sh
+++ b/sonar-server/derby-start.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 export MAVEN_OPTS='-Xmx768m -XX:MaxPermSize=128m'
-mvn clean jetty:run -Pstart-dev-server,derby
\ No newline at end of file
+mvn clean jetty:run -Pstart-dev-server,derby

diff --git a/sonar-server/mysql-start.bat b/sonar-server/mysql-start.bat
index 2b3d7df48427978b7e11defe4fbb93ffafd26fac..ad7061d821ffdb1a7feea3ca49012641dcaf9764 100644 (file)
--- a/sonar-server/mysql-start.bat
+++ b/sonar-server/mysql-start.bat
@@ -1,2 +1,2 @@
 set MAVEN_OPTS='-Xmx768m -XX:MaxPermSize=128m'
-mvn clean jetty:run -Pstart-dev-server,mysql
\ No newline at end of file
+mvn clean jetty:run -Pstart-dev-server,mysql

diff --git a/sonar-server/mysql-start.sh b/sonar-server/mysql-start.sh
index 6b0901e07c711bc03a105ffa0fe1afaa3c409e61..6e239f0d3062d614a1ee5c4483b56225875a4456 100755 (executable)
--- a/sonar-server/mysql-start.sh
+++ b/sonar-server/mysql-start.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 export MAVEN_OPTS='-Xmx768m -XX:MaxPermSize=128m'
-mvn clean jetty:run -Pstart-dev-server,mysql
\ No newline at end of file
+mvn clean jetty:run -Pstart-dev-server,mysql

diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index a121cda169c4f5bbf8c20adb5df4e819db5967c0..88f57bd654087b1b5fe29923435fe6c5a2270d79 100644 (file)
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -341,6 +341,7 @@
                   <overWriteIfNewer>true</overWriteIfNewer>
                   <overWriteReleases>true</overWriteReleases>
                   <overWriteSnapshots>true</overWriteSnapshots>
+                  <includeTypes>sonar-plugin</includeTypes>
                   <outputDirectory>${project.build.directory}/sonar-dev-home/lib/core-plugins/</outputDirectory>
                 </configuration>
               </execution>
@@ -399,78 +400,91 @@
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-core-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-design-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-findbugs-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-checkstyle-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-dbcleaner-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-pmd-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-squid-java-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-cobertura-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-surefire-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-cpd-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-l10n-en-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-email-notifications-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.codehaus.sonar.plugins</groupId>
           <artifactId>sonar-jacoco-plugin</artifactId>
           <version>${project.version}</version>
+          <type>sonar-plugin</type>
           <scope>provided</scope>
         </dependency>
       </dependencies>
@@ -668,4 +682,4 @@
     </profile>
   </profiles>
 
-</project>
\ No newline at end of file
+</project>

diff --git a/sonar-server/postgresql-start.bat b/sonar-server/postgresql-start.bat
index 357be9b10c288fce38c279c5ec9927203e6aa4e0..38377106445021eac141d474d818964a8e5c0c70 100644 (file)
--- a/sonar-server/postgresql-start.bat
+++ b/sonar-server/postgresql-start.bat
@@ -1,2 +1,2 @@
 set MAVEN_OPTS='-Xmx768m -XX:MaxPermSize=128m'
-mvn clean jetty:run -Pstart-dev-server,postgresql
\ No newline at end of file
+mvn clean jetty:run -Pstart-dev-server,postgresql

diff --git a/sonar-server/postgresql-start.sh b/sonar-server/postgresql-start.sh
index 40d38f1a9c5ead956b3799274f8e745843f425b0..e1078cfe61608f58946cf8b65d82aed8e8d03e92 100755 (executable)
--- a/sonar-server/postgresql-start.sh
+++ b/sonar-server/postgresql-start.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 export MAVEN_OPTS='-Xmx768m -XX:MaxPermSize=128m'
-mvn clean jetty:run -Pstart-dev-server,postgresql
\ No newline at end of file
+mvn clean jetty:run -Pstart-dev-server,postgresql