From c19420c7f8f3c4985ff700a65eff0a2c4107b5cc Mon Sep 17 00:00:00 2001 From: richmag Date: Fri, 4 Mar 2016 15:55:11 -0800 Subject: [PATCH 1/3] Add master build badge --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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/. From e6b8d7516eecc7c542c0e0e23946ee4b0dccd1f8 Mon Sep 17 00:00:00 2001 From: Chongsun Ahn Date: Mon, 7 Mar 2016 13:02:34 -0800 Subject: [PATCH 2/3] Remove lock_timeout reference to fix build errors --- modules/db/src/main/resources/seed/extra_seed.sql | 1 - modules/db/src/main/resources/seed/true_seed.sql | 1 - 2 files changed, 2 deletions(-) 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; From 52ba176eab47c2adaae92515f24fb7aaa534cc24 Mon Sep 17 00:00:00 2001 From: joshzamor Date: Mon, 7 Mar 2016 15:20:43 -0800 Subject: [PATCH 3/3] OLMIS-91, removed sonar project name sonar project name in the gradle plugin seems to be overriding the environment variable. Removing to test this with Jenkins. --- build.gradle | 1 - gradle.properties | 1 - 2 files changed, 2 deletions(-) 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 a52e7700a6..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 sonarProjectVersion = 2.0 toggleOnCustom = false \ No newline at end of file