Merge branch 'dev'

* dev: OLMIS-91, removed sonar project name Remove lock_timeout reference to fix build errors Add master build badge Conflicts: gradle.properties
OpenLMIS · Mar 8, 2016 · 425d4f7 · 425d4f7
2 parents 3299511 + 52ba176
commit 425d4f7
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
-[![Build Status](http://ci.openlmis.org:8080/job/OpenLMIS-dev-branch/badge/icon)](http://ci.openlmis.org:8080/job/OpenLMIS-dev-branch/)
+| Stable        | Development           |
+|:-------------:|:-------------:|
+| [![Master Build Status](http://ci.openlmis.org:8080/job/OpenLMIS-Stable/badge/icon)](http://ci.openlmis.org:8080/job/OpenLMIS-Stable/)     | [![Dev Build Status](http://ci.openlmis.org:8080/job/OpenLMIS-dev-branch/badge/icon)](http://ci.openlmis.org:8080/job/OpenLMIS-dev-branch/)|
 
 OpenLMIS (Open Logistics Management Information System) is software for a shared, open source solution for managing medical commodity distribution in low- and middle-income countries.  For more information, see http://openlmis.org/.
 

diff --git a/build.gradle b/build.gradle
@@ -38,7 +38,6 @@ sonarRunner {
     sonarProperties {
 	  property "sonar.host.url", "$sonarServer"
 	  property "sonar.jdbc.url", "$sonarJdbc"
-	  property "sonar.projectName", "$sonarProject"
       property "sonar.projectVersion", "$sonarProjectVersion"
   }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -25,7 +25,6 @@ org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=512m -Xms512m
 
 sonarServer = http://localhost:9000
 sonarJdbc = jdbc:h2:tcp://localhost/sonar
-sonarProject = OpenLMIS Stable
 sonarProjectVersion = 2.0
 
 toggleOnCustom = false
diff --git a/modules/db/src/main/resources/seed/extra_seed.sql b/modules/db/src/main/resources/seed/extra_seed.sql
@@ -6,7 +6,6 @@
 --
 
 SET statement_timeout = 0;
-SET lock_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SET check_function_bodies = false;

diff --git a/modules/db/src/main/resources/seed/true_seed.sql b/modules/db/src/main/resources/seed/true_seed.sql
@@ -6,7 +6,6 @@
 --
 
 SET statement_timeout = 0;
-SET lock_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SET check_function_bodies = false;