diff --git a/README.md b/README.md index 92f6d7fea8..c6909f0837 100644 --- 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 index c0bb131b09..11c9c877c6 100644 --- 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 index 27bd96f5fa..78e1016699 100644 --- 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 \ No newline at end of file diff --git a/modules/db/src/main/resources/seed/extra_seed.sql b/modules/db/src/main/resources/seed/extra_seed.sql index 46670f16a4..87c2d102e9 100644 --- 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 index ef3bd9a053..6923db0148 100644 --- 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;