From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Wed, 7 Nov 2012 16:09:48 +0000 (+0100)
Subject: Remove useless Maven dependencies
X-Git-Tag: 3.4~359
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0c410b971537947ff4900e015fe71dd3e81157f2;p=sonarqube.git

Remove useless Maven dependencies
---

diff --git a/pom.xml b/pom.xml
index a3ffaff5f48..0a31b81cb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.sonar</groupId>
@@ -91,7 +92,7 @@
     <skipSanityChecks>false</skipSanityChecks>
 
     <!-- default GWT configuration. It's overridden by the profile 'dev' to speed up compilation in dev environments-->
-    <gwt.permutationSuffix />
+    <gwt.permutationSuffix/>
     <gwt.extraJvmArgs>-Xmx512m -Xss1024k</gwt.extraJvmArgs>
     <sonar.snapshotRepository.url>dav:https://dav.codehaus.org/snapshots.repository/sonar</sonar.snapshotRepository.url>
   </properties>
@@ -727,6 +728,17 @@
         <artifactId>jfreechart</artifactId>
         <version>1.0.9</version>
       </dependency>
+      <dependency>
+        <groupId>com.googlecode.json-simple</groupId>
+        <artifactId>json-simple</artifactId>
+        <version>1.1.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-annotations</artifactId>
@@ -748,17 +760,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-ehcache</artifactId>
-        <version>3.3.2.GA</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-entitymanager</artifactId>
@@ -1219,7 +1220,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore />
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -1232,7 +1233,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore />
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -1245,7 +1246,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore />
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -1259,7 +1260,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore />
+                        <ignore/>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -1272,7 +1273,7 @@
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore />
+                        <ignore/>
                       </action>
                     </pluginExecution>
                   </pluginExecutions>
diff --git a/sonar-application/src/main/assembly/conf/logback.xml b/sonar-application/src/main/assembly/conf/logback.xml
index 63913b48eea..cea4a381d49 100644
--- a/sonar-application/src/main/assembly/conf/logback.xml
+++ b/sonar-application/src/main/assembly/conf/logback.xml
@@ -58,11 +58,6 @@
     <!-- removing "An item was expired by the cache while it was locked (increase your cache timeout)" msg -->
     <level value="ERROR"/>
   </logger>
-  <logger name="org.hibernate.cache.EhCacheProvider">
-    <!-- removing "org.hibernate.cache.EhCacheProvider - Could not find configuration)" message -->
-    <level value="ERROR"/>
-  </logger>
-
   <logger name="org.hibernate">
     <level value="WARN"/>
   </logger>
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/bootstrapper/logback.xml b/sonar-batch/src/main/resources/org/sonar/batch/bootstrapper/logback.xml
index eb3084afa54..08e4a0a3703 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/bootstrapper/logback.xml
+++ b/sonar-batch/src/main/resources/org/sonar/batch/bootstrapper/logback.xml
@@ -18,17 +18,10 @@
     </encoder>
   </appender>
 
-  <logger name="net.sf.ehcache">
-    <level value="WARN"/>
-  </logger>
   <logger name="org.hibernate.cache.ReadWriteCache">
     <!-- removing "An item was expired by the cache while it was locked (increase your cache timeout)" msg -->
     <level value="ERROR"/>
   </logger>
-  <logger name="org.hibernate.cache.EhCacheProvider">
-    <!-- removing "org.hibernate.cache.EhCacheProvider - Could not find configuratio)" message -->
-    <level value="ERROR"/>
-  </logger>
   <logger name="org.hibernate">
     <level value="WARN"/>
   </logger>
diff --git a/sonar-batch/src/main/resources/org/sonar/batch/logback.xml b/sonar-batch/src/main/resources/org/sonar/batch/logback.xml
index 1dba6b7f3cc..539320cd1b8 100644
--- a/sonar-batch/src/main/resources/org/sonar/batch/logback.xml
+++ b/sonar-batch/src/main/resources/org/sonar/batch/logback.xml
@@ -14,17 +14,10 @@
     </encoder>
   </appender>
 
-  <logger name="net.sf.ehcache">
-    <level value="WARN"/>
-  </logger>
   <logger name="org.hibernate.cache.ReadWriteCache">
     <!-- removing "An item was expired by the cache while it was locked (increase your cache timeout)" msg -->
     <level value="ERROR"/>
   </logger>
-  <logger name="org.hibernate.cache.EhCacheProvider">
-    <!-- removing "org.hibernate.cache.EhCacheProvider - Could not find configuratio)" message -->
-    <level value="ERROR"/>
-  </logger>
   <logger name="org.hibernate">
     <level value="WARN"/>
   </logger>
diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml
index 2a22e81b20e..108a800bdb2 100644
--- a/sonar-core/pom.xml
+++ b/sonar-core/pom.xml
@@ -52,10 +52,6 @@
       <groupId>geronimo-spec</groupId>
       <artifactId>geronimo-spec-jta</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-ehcache</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
@@ -67,7 +63,6 @@
     <dependency>
       <groupId>com.googlecode.json-simple</groupId>
       <artifactId>json-simple</artifactId>
-      <version>1.1.1</version>
     </dependency>
 
     <!-- logging -->
diff --git a/sonar-core/src/main/resources/ehcache.xml b/sonar-core/src/main/resources/ehcache.xml
deleted file mode 100644
index 9385f272c34..00000000000
--- a/sonar-core/src/main/resources/ehcache.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<ehcache>
-  <!--ehcache config ref
-
-      name:
-       Sets the name of the cache. This is used to identify the cache. It must be unique.
-
-      maxElementsInMemory:
-       Sets the maximum number of objects that will be created in memory
-
-      maxElementsOnDisk:
-       Sets the maximum number of objects that will be maintained in the DiskStore
-       The default value is zero, meaning unlimited.
-
-      eternal:
-       Sets whether elements are eternal. If eternal,  timeouts are ignored and the
-       element is never expired.
-
-      overflowToDisk:
-       Sets whether elements can overflow to disk when the memory store
-       has reached the maxInMemory limit.
-
-      The following attributes are optional.
-
-      timeToIdleSeconds:
-       Sets the time to idle for an element before it expires.
-       i.e. The maximum amount of time between accesses before an element expires
-       Is only used if the element is not eternal.
-       Optional attribute. A value of 0 means that an Element can idle for infinity.
-       The default value is 0.
-
-      timeToLiveSeconds:
-       Sets the time to live for an element before it expires.
-       i.e. The maximum time between creation time and when an element expires.
-       Is only used if the element is not eternal.
-       Optional attribute. A value of 0 means that and Element can live for infinity.
-       The default value is 0.
-
-      diskPersistent:
-       Whether the disk store persists between restarts of the Virtual Machine.
-       The default value is false.
-
-      diskExpiryThreadIntervalSeconds:
-       The number of seconds between runs of the disk expiry thread. The default value
-       is 120 seconds.
-
-      memoryStoreEvictionPolicy:
-       Policy would be enforced upon reaching the maxElementsInMemory limit. Default
-       policy is Least Recently Used (specified as LRU). Other policies available -
-       First In First Out (specified as FIFO) and Less Frequently Used
-       (specified as LFU)
-  -->
-
-  <defaultCache
-      maxElementsInMemory="4096"
-      eternal="false"
-      timeToIdleSeconds="300"
-      timeToLiveSeconds="1200"
-      overflowToDisk="false"
-      memoryStoreEvictionPolicy="LRU"/>
-
-  <cache
-      name="org.sonar.api.measures.Metric"
-      maxElementsInMemory="256"
-      eternal="false"
-      overflowToDisk="false"/>
-  <cache
-      name="org.sonar.api.rules.Rule"
-      maxElementsInMemory="4096"
-      eternal="false"
-      overflowToDisk="false"/>
-  <cache
-      name="org.sonar.api.rules.RulesCategory"
-      maxElementsInMemory="6"
-      eternal="true"
-      overflowToDisk="false"/>
-</ehcache>
\ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/renamePropertyKey-result.xml b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/renamePropertyKey-result.xml
new file mode 100644
index 00000000000..0877b0035fe
--- /dev/null
+++ b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/renamePropertyKey-result.xml
@@ -0,0 +1,6 @@
+<dataset>
+
+  <properties id="1" prop_key="foo" text_value="bar" resource_id="[null]" user_id="[null]"/>
+  <properties id="2" prop_key="sonar.license" text_value="the license" resource_id="[null]" user_id="[null]"/>
+
+</dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/renamePropertyKey.xml b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/renamePropertyKey.xml
new file mode 100644
index 00000000000..6ab761e2c6f
--- /dev/null
+++ b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/renamePropertyKey.xml
@@ -0,0 +1,6 @@
+<dataset>
+
+  <properties id="1" prop_key="foo" text_value="bar" resource_id="[null]" user_id="[null]"/>
+  <properties id="2" prop_key="sonar.license.secured" text_value="the license" resource_id="[null]" user_id="[null]"/>
+
+</dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/should_not_rename_if_same_key-result.xml b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/should_not_rename_if_same_key-result.xml
new file mode 100644
index 00000000000..b4fc11a8cdb
--- /dev/null
+++ b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/should_not_rename_if_same_key-result.xml
@@ -0,0 +1,5 @@
+<dataset>
+
+  <properties id="1" prop_key="foo" text_value="bar" resource_id="[null]" user_id="[null]"/>
+
+</dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/should_not_rename_if_same_key.xml b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/should_not_rename_if_same_key.xml
new file mode 100644
index 00000000000..b4fc11a8cdb
--- /dev/null
+++ b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/should_not_rename_if_same_key.xml
@@ -0,0 +1,5 @@
+<dataset>
+
+  <properties id="1" prop_key="foo" text_value="bar" resource_id="[null]" user_id="[null]"/>
+
+</dataset>
diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index 0b1ce4586f0..90164cf32f1 100644
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -102,6 +102,12 @@
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>woodstox-core-lgpl</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index a92abf15a10..8b5c20e7aa5 100644
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -117,10 +117,6 @@
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-ehcache</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jruby.rack</groupId>
       <artifactId>jruby-rack</artifactId>
diff --git a/sonar-server/src/dev/h2/conf/logback.xml b/sonar-server/src/dev/h2/conf/logback.xml
index 3ea98589f88..1bde810d728 100644
--- a/sonar-server/src/dev/h2/conf/logback.xml
+++ b/sonar-server/src/dev/h2/conf/logback.xml
@@ -14,19 +14,10 @@
     <level value="ERROR"/>
   </logger>
 
-  <logger name="org.hibernate.cache.EhCacheProvider">
-    <!-- removing "org.hibernate.cache.EhCacheProvider - Could not find configuratio)" message -->
-    <level value="ERROR"/>
-  </logger>
-
   <logger name="org.sonar.INFO">
     <level value="INFO"/>
   </logger>
 
-  <logger name="net.sf.ehcache">
-    <level value="INFO"/>
-  </logger>
-
   <logger name="rails">
     <level value="DEBUG"/>
   </logger>
diff --git a/sonar-server/src/dev/mysql/conf/logback.xml b/sonar-server/src/dev/mysql/conf/logback.xml
index 3ea98589f88..1bde810d728 100644
--- a/sonar-server/src/dev/mysql/conf/logback.xml
+++ b/sonar-server/src/dev/mysql/conf/logback.xml
@@ -14,19 +14,10 @@
     <level value="ERROR"/>
   </logger>
 
-  <logger name="org.hibernate.cache.EhCacheProvider">
-    <!-- removing "org.hibernate.cache.EhCacheProvider - Could not find configuratio)" message -->
-    <level value="ERROR"/>
-  </logger>
-
   <logger name="org.sonar.INFO">
     <level value="INFO"/>
   </logger>
 
-  <logger name="net.sf.ehcache">
-    <level value="INFO"/>
-  </logger>
-
   <logger name="rails">
     <level value="DEBUG"/>
   </logger>
diff --git a/sonar-server/src/dev/postgresql/conf/logback.xml b/sonar-server/src/dev/postgresql/conf/logback.xml
index 3ea98589f88..1bde810d728 100644
--- a/sonar-server/src/dev/postgresql/conf/logback.xml
+++ b/sonar-server/src/dev/postgresql/conf/logback.xml
@@ -14,19 +14,10 @@
     <level value="ERROR"/>
   </logger>
 
-  <logger name="org.hibernate.cache.EhCacheProvider">
-    <!-- removing "org.hibernate.cache.EhCacheProvider - Could not find configuratio)" message -->
-    <level value="ERROR"/>
-  </logger>
-
   <logger name="org.sonar.INFO">
     <level value="INFO"/>
   </logger>
 
-  <logger name="net.sf.ehcache">
-    <level value="INFO"/>
-  </logger>
-
   <logger name="rails">
     <level value="DEBUG"/>
   </logger>
diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java b/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java
new file mode 100644
index 00000000000..6e154c7144e
--- /dev/null
+++ b/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java
@@ -0,0 +1,47 @@
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2008-2012 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Sonar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ */
+package org.sonar.server.startup;
+
+import com.google.common.base.Strings;
+import org.sonar.api.config.PropertyDefinition;
+import org.sonar.api.config.PropertyDefinitions;
+import org.sonar.core.properties.PropertiesDao;
+
+/**
+ * @since 3.4
+ */
+public class RenameDeprecatedPropertyKeys {
+
+  private PropertiesDao dao;
+  private PropertyDefinitions definitions;
+
+  public RenameDeprecatedPropertyKeys(PropertiesDao dao, PropertyDefinitions definitions) {
+    this.dao = dao;
+    this.definitions = definitions;
+  }
+
+  public void start() {
+    for (PropertyDefinition definition : definitions.getAll()) {
+      if (!Strings.isNullOrEmpty(definition.getDeprecatedKey())) {
+        dao.renamePropertyKey(definition.getDeprecatedKey(), definition.getKey());
+      }
+    }
+  }
+}
diff --git a/sonar-ws-client/pom.xml b/sonar-ws-client/pom.xml
index 49d446dd589..ec7b3dca56d 100644
--- a/sonar-ws-client/pom.xml
+++ b/sonar-ws-client/pom.xml
@@ -15,7 +15,6 @@
     <dependency>
       <groupId>com.googlecode.json-simple</groupId>
       <artifactId>json-simple</artifactId>
-      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>