From d6292d3d3d04567a7bd127744d28fd6ff77d7a92 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 4 Jun 2014 23:01:56 +0200 Subject: [PATCH] Revert bad commit --- sonar-server/pom.xml | 1309 +++++++++++++++++++++--------------------- 1 file changed, 653 insertions(+), 656 deletions(-) diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml index 3e1ae89450a..d989048ac35 100644 --- a/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -1,696 +1,693 @@ - 4.0.0 - - org.codehaus.sonar - sonar - 4.4-SNAPSHOT - - sonar-server - war - SonarQube :: Server + 4.0.0 + + org.codehaus.sonar + sonar + 4.4-SNAPSHOT + + sonar-server + war + SonarQube :: Server - - default + + default - - src/main/java,src/main/js - src/main/js/third-party/**/*,src/main/js/require.js,src/main/js/tests/**/* - + + src/main/java,src/main/js + src/main/js/third-party/**/*,src/main/js/require.js,src/main/js/tests/**/* + - - - com.google.code.gson - gson - - - com.h2database - h2 - - - org.codehaus.sonar - sonar-channel - - - org.codehaus.sonar - sonar-colorizer - - - org.codehaus.sonar - sonar-core - - - org.codehaus.sonar - sonar-deprecated - - - org.apache.maven - maven-project - - - - - org.codehaus.sonar - sonar-home - - - org.codehaus.sonar - sonar-java-api - - - org.codehaus.sonar - sonar-markdown - - - org.codehaus.sonar - sonar-update-center-common - - - org.codehaus.sonar - sonar-plugin-api - ${project.version} - - - - com.google.code.findbugs - jsr305 - - - org.apache.maven.shared - maven-dependency-tree - - - org.apache.maven.shared - maven-common-artifact-filters - - - - - commons-beanutils - commons-beanutils - - - commons-configuration - commons-configuration - - - com.thoughtworks.xstream - xstream - - - commons-collections - commons-collections - - - commons-dbutils - commons-dbutils - - - commons-io - commons-io - - - commons-lang - commons-lang - - - org.picocontainer - picocontainer - - - org.jruby - jruby-complete - - - commons-codec - commons-codec - - - jfree - jfreechart - - - org.slf4j - slf4j-api - - - commons-dbcp - commons-dbcp - - - org.jruby.rack - jruby-rack - + + + com.google.code.gson + gson + + + com.h2database + h2 + + + org.codehaus.sonar + sonar-channel + + + org.codehaus.sonar + sonar-colorizer + + + org.codehaus.sonar + sonar-core + + + org.codehaus.sonar + sonar-deprecated + + + org.apache.maven + maven-project + + + + + org.codehaus.sonar + sonar-home + + + org.codehaus.sonar + sonar-java-api + + + org.codehaus.sonar + sonar-markdown + + + org.codehaus.sonar + sonar-update-center-common + + + org.codehaus.sonar + sonar-plugin-api + ${project.version} + + + + com.google.code.findbugs + jsr305 + + + org.apache.maven.shared + maven-dependency-tree + + + org.apache.maven.shared + maven-common-artifact-filters + + + + + commons-beanutils + commons-beanutils + + + commons-configuration + commons-configuration + + + com.thoughtworks.xstream + xstream + + + commons-collections + commons-collections + + + commons-dbutils + commons-dbutils + + + commons-io + commons-io + + + commons-lang + commons-lang + + + org.picocontainer + picocontainer + + + org.jruby + jruby-complete + + + commons-codec + commons-codec + + + jfree + jfreechart + + + org.slf4j + slf4j-api + + + commons-dbcp + commons-dbcp + + + org.jruby.rack + jruby-rack + + + org.elasticsearch + elasticsearch + + + org.apache.tomcat.embed + tomcat-embed-core + 7.0.42 + provided + + + com.google.code.findbugs + jsr305 + provided + + + + org.codehaus.sonar + sonar-core + ${project.version} + test-jar + test + + + junit + junit + test + + + org.easytesting + fest-assert + test + + + org.mockito + mockito-all + test + + + org.dbunit + dbunit + test + + + com.github.tlrx + elasticsearch-test + test + + + org.skyscreamer + jsonassert + test + + + org.hamcrest + hamcrest-all + test + + + xmlunit + xmlunit + test + + + + + + + + src/main/resources + true + + + + + + maven-clean-plugin + + + + ${basedir}/src/main/webapp/deploy + + **/* + + + readme.txt + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + generate-sources + + unpack + + + + + org.codehaus.sonar + sonar-colorizer + ${project.version} + ${basedir}/src/main/webapp/stylesheets + **/sonar-colorizer.css + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + process-resources + + copy-resources + + + ${project.build.directory}/${project.build.finalName}/ + + + ${basedir}/src/main/webapp + false + + + + + + copy-generated-webapp + + process-resources + + copy-resources + + + ${project.build.directory}/${project.build.finalName} + true + + + src/main/webapp/build + false + + + + + + + + com.github.eirslett + frontend-maven-plugin + + + generate-resources + install node and npm + + install-node-and-npm + + + v0.10.26 + 1.4.3 + + + + generate-resources + npm install + + npm + + + install + + + + generate-resources + grunt build + + grunt + + + ${gruntTask} + + + + + + org.apache.maven.plugins + maven-war-plugin + + + **/*.log,*.iml,WEB-INF/script/,WEB-INF/test/,javascripts/*-min.js,stylesheets/*-min.css,javascripts/tests/**/*, + build/**,coffee/**,less/**,templates/** + + + js/**,css/** + + + + ${project.version} + + ${buildNumber} + ${timestamp} + + + + + + + + + + js-tests + + + !skipTests + + + + + + com.github.eirslett + frontend-maven-plugin + + + javascript tests + test + + grunt + + + test + + + + + + + + + start-dev-server + + dev + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-plugins + process-resources + + copy-dependencies + + + false + false + false + sonar-plugin + ${project.build.directory}/dev/lib/core-plugins + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-conf + process-resources + + copy-resources + + + ${project.build.directory}/dev/conf + false + + + src/dev + + sonar.properties + + false + + + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.1 + + 9000 + /dev + ${project.basedir}/src/main/webapp/META-INF/context.xml + false + + ${project.build.directory}/dev + development + 3 + ${sonar.jdbc.url} + development + 127.0.0.1 + 9200 + true + FULL + http://localhost:9000/dev + + + + + + + - org.elasticsearch - elasticsearch + org.codehaus.sonar.plugins + sonar-core-plugin + ${project.version} + sonar-plugin + provided - org.apache.tomcat.embed - tomcat-embed-core - 7.0.42 - provided + org.codehaus.sonar.plugins + sonar-design-plugin + ${project.version} + sonar-plugin + provided - com.google.code.findbugs - jsr305 - provided + org.codehaus.sonar-plugins.java + sonar-findbugs-plugin + ${sonarJava.version} + sonar-plugin + provided - - org.codehaus.sonar - sonar-core - ${project.version} - test-jar - test + org.codehaus.sonar.plugins + sonar-dbcleaner-plugin + ${project.version} + sonar-plugin + provided - junit - junit - test + org.codehaus.sonar-plugins.java + sonar-squid-java-plugin + ${sonarJava.version} + sonar-plugin + provided - org.easytesting - fest-assert - test + org.codehaus.sonar-plugins.java + sonar-surefire-plugin + ${sonarJava.version} + sonar-plugin + provided - org.mockito - mockito-all - test + org.codehaus.sonar.plugins + sonar-cpd-plugin + ${project.version} + sonar-plugin + provided - org.dbunit - dbunit - test + org.codehaus.sonar.plugins + sonar-l10n-en-plugin + ${project.version} + sonar-plugin + provided - com.github.tlrx - elasticsearch-test - test + org.codehaus.sonar.plugins + sonar-email-notifications-plugin + ${project.version} + sonar-plugin + provided - org.skyscreamer - jsonassert - test + org.codehaus.sonar-plugins.java + sonar-jacoco-plugin + ${sonarJava.version} + sonar-plugin + provided - org.hamcrest - hamcrest-all - test + org.codehaus.sonar-plugins.java + sonar-java-plugin + ${sonarJava.version} + sonar-plugin + provided + + + + + postgresql + + jdbc:postgresql://localhost:15432/sonar + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-jdbc-driver + process-resources + + copy-dependencies + + + false + false + false + postgresql + ${project.build.directory}/dev/extensions/jdbc-driver/postgresql + + + + + + + - xmlunit - xmlunit - test + postgresql + postgresql - - - - - - - src/main/resources - true - - + + + + mysql + + jdbc:mysql://localhost:13306/sonar?autoReconnect=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true + + - - maven-clean-plugin + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-jdbc-driver + process-resources + + copy-dependencies + - - - ${basedir}/src/main/webapp/deploy - - **/* - - - readme.txt - - - + false + false + false + mysql-connector-java + ${project.build.directory}/dev/extensions/jdbc-driver/mysql - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - generate-sources - - unpack - - - - - org.codehaus.sonar - sonar-colorizer - ${project.version} - ${basedir}/src/main/webapp/stylesheets - **/sonar-colorizer.css - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - process-resources - - copy-resources - - - ${project.build.directory}/${project.build.finalName}/ - - - ${basedir}/src/main/webapp - false - - - - - - copy-generated-webapp - - process-resources - - copy-resources - - - ${project.build.directory}/${project.build.finalName} - true - - - src/main/webapp/build - false - - - - - - - - com.github.eirslett - frontend-maven-plugin - - - generate-resources - install node and npm - - install-node-and-npm - - - v0.10.26 - 1.4.3 - - - - generate-resources - npm install - - npm - - - install - - - - generate-resources - grunt build - - grunt - - - ${gruntTask} - - - - - - org.apache.maven.plugins - maven-war-plugin + + + + + + + + mysql + mysql-connector-java + + + + + h2 + + jdbc:h2:tcp://localhost:9092/sonar + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-jdbc-driver + process-resources + + copy-dependencies + - - **/*.log,*.iml,WEB-INF/script/,WEB-INF/test/,javascripts/*-min.js,stylesheets/*-min.css,javascripts/tests/**/*, - build/**,coffee/**,less/**,templates/** - - - js/**,css/** - - - - ${project.version} - - ${buildNumber} - ${timestamp} - - + false + false + false + h2 + ${project.build.directory}/dev/extensions/jdbc-driver/h2 - + + + - - - - - js-tests - - - !skipTests - - - - - - com.github.eirslett - frontend-maven-plugin - - - javascript tests - test - - grunt - - - test - - - - - - - - - start-dev-server - - dev - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-plugins - process-resources - - copy-dependencies - - - false - false - false - sonar-plugin - ${project.build.directory}/dev/lib/core-plugins - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-conf - process-resources - - copy-resources - - - ${project.build.directory}/dev/conf - false - - - src/dev - - sonar.properties - - false - - - - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.1 - - 9000 - /dev - ${project.basedir}/src/main/webapp/META-INF/context.xml - false - - ${project.build.directory}/dev - development - 3 - ${sonar.jdbc.url} - development - 127.0.0.1 - 9200 - true - WARN - http://localhost:9000/dev - - - - - - - - - org.codehaus.sonar.plugins - sonar-core-plugin - ${project.version} - sonar-plugin - provided - - - org.codehaus.sonar.plugins - sonar-design-plugin - ${project.version} - sonar-plugin - provided - - - org.codehaus.sonar-plugins.java - sonar-findbugs-plugin - ${sonarJava.version} - sonar-plugin - provided - - - org.codehaus.sonar.plugins - sonar-dbcleaner-plugin - ${project.version} - sonar-plugin - provided - - - org.codehaus.sonar-plugins.java - sonar-squid-java-plugin - ${sonarJava.version} - sonar-plugin - provided - - - org.codehaus.sonar-plugins.java - sonar-surefire-plugin - ${sonarJava.version} - sonar-plugin - provided - - - org.codehaus.sonar.plugins - sonar-cpd-plugin - ${project.version} - sonar-plugin - provided - - - org.codehaus.sonar.plugins - sonar-l10n-en-plugin - ${project.version} - sonar-plugin - provided - - - org.codehaus.sonar.plugins - sonar-email-notifications-plugin - ${project.version} - sonar-plugin - provided - - - org.codehaus.sonar-plugins.java - sonar-jacoco-plugin - ${sonarJava.version} - sonar-plugin - provided - - - org.codehaus.sonar-plugins.java - sonar-java-plugin - ${sonarJava.version} - sonar-plugin - provided - - - + + - - postgresql - - jdbc:postgresql://localhost:15432/sonar - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-jdbc-driver - process-resources - - copy-dependencies - - - false - false - false - postgresql - ${project.build.directory}/dev/extensions/jdbc-driver/postgresql - - - - - - - - - - postgresql - postgresql - - - - - - mysql - - jdbc:mysql://localhost:13306/sonar?autoReconnect=true&useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-jdbc-driver - process-resources - - copy-dependencies - - - false - false - false - mysql-connector-java - ${project.build.directory}/dev/extensions/jdbc-driver/mysql - - - - - - - - - - mysql - mysql-connector-java - - - - - h2 - - jdbc:h2:tcp://localhost:9092/sonar - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-jdbc-driver - process-resources - - copy-dependencies - - - false - false - false - h2 - ${project.build.directory}/dev/extensions/jdbc-driver/h2 - - - - - - - - - - - release - - - - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-war-plugin - - - - com.sonarsource - sonarsource-branding - - - - - - - - - - - - - com.sonarsource - sonarsource-branding - 1.0 - war - runtime - - - - + + release + + + + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-war-plugin + + + + com.sonarsource + sonarsource-branding + + + + + + + + + + + + + com.sonarsource + sonarsource-branding + 1.0 + war + runtime + + + + -- 2.39.5