]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-6552 fix maven dependency for SQLServer tests
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 17 Sep 2015 14:21:03 +0000 (16:21 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 17 Sep 2015 14:21:03 +0000 (16:21 +0200)
pom.xml
server/sonar-server/pom.xml
sonar-db/pom.xml

diff --git a/pom.xml b/pom.xml
index b21b09e3d06fa44ec9cda70229f85496a8d1cb0e..fd58a84439ba5e3688b87b17d5aeee90275c95af 100644 (file)
--- a/pom.xml
+++ b/pom.xml
       </properties>
     </profile>
 
-    <profile>
-      <!-- SonarSource internal use -->
-      <id>dbTests</id>
-      <activation>
-        <property>
-          <name>dbTests</name>
-        </property>
-      </activation>
-      <properties>
-        <junitGroups>org.sonar.test.DbTests</junitGroups>
-      </properties>
-      <dependencies>
-        <dependency>
-          <groupId>mysql</groupId>
-          <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.postgresql</groupId>
-          <artifactId>postgresql</artifactId>
-        </dependency>
-        <dependency>
-          <!-- this artifact is located in the SonarSource internal repository -->
-          <groupId>com.oracle</groupId>
-          <artifactId>ojdbc6</artifactId>
-          <version>11.2.0.3.0</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-
     <profile>
       <!-- add microbenchmarks module to IDE -->
       <id>includeMicrobenchmarkModule</id>
index b83c1d783daffa23d658ab94854c486eddfd1982..ec53f2d96d19c95af4b731339cd59bf801ff3991 100644 (file)
         </plugins>
       </build>
     </profile>
+    <profile>
+      <!-- SonarSource internal use -->
+      <id>dbTests</id>
+      <activation>
+        <property>
+          <name>dbTests</name>
+        </property>
+      </activation>
+      <properties>
+        <junitGroups>org.sonar.test.DbTests</junitGroups>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>mysql</groupId>
+          <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.postgresql</groupId>
+          <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+        <!-- this artifact is located in the SonarSource internal repository -->
+        <groupId>com.oracle</groupId>
+        <artifactId>ojdbc6</artifactId>
+        <version>11.2.0.3.0</version>
+        <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.microsoft.sqljdbc</groupId>
+          <artifactId>sqljdbc41</artifactId>
+          <version>4.1</version>
+          <scope>system</scope>
+          <systemPath>${project.basedir}/../../sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc41.jar</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
+
   </profiles>
 
 
index 02ea2ab18a1f8f233a35e957555a84aa16d319e4..51e80f759c21dea9d3895ec0672b67e455c330d4 100644 (file)
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <!-- SonarSource internal use -->
+      <id>dbTests</id>
+      <activation>
+        <property>
+          <name>dbTests</name>
+        </property>
+      </activation>
+      <properties>
+        <junitGroups>org.sonar.test.DbTests</junitGroups>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>mysql</groupId>
+          <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.postgresql</groupId>
+          <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+        <!-- this artifact is located in the SonarSource internal repository -->
+        <groupId>com.oracle</groupId>
+        <artifactId>ojdbc6</artifactId>
+        <version>11.2.0.3.0</version>
+        <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.microsoft.sqljdbc</groupId>
+          <artifactId>sqljdbc41</artifactId>
+          <version>4.1</version>
+          <scope>system</scope>
+          <systemPath>${project.basedir}/../sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc41.jar</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>