From b4dadedf4610bbfafc87f3b526cf619e9b62c71c Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Thu, 7 Jun 2018 16:53:22 +0300 Subject: [PATCH] Update profile configuration identifiers for consistency --- .../resources/applicationContext-opensrp.xml | 113 +-- opensrp-web/pom.xml | 8 +- pom.xml | 860 +++++++++--------- 3 files changed, 491 insertions(+), 490 deletions(-) diff --git a/opensrp-core/src/main/resources/applicationContext-opensrp.xml b/opensrp-core/src/main/resources/applicationContext-opensrp.xml index 6aeac0ced9..538214525d 100644 --- a/opensrp-core/src/main/resources/applicationContext-opensrp.xml +++ b/opensrp-core/src/main/resources/applicationContext-opensrp.xml @@ -1,78 +1,79 @@ - - - - + + + + - - - - - + + + + + - + - + - + - + - - - + + + - - - + + + - - + + - - - + + + - + - + - - - - - - - + + + + + + + - + - - - + + + - + - + diff --git a/opensrp-web/pom.xml b/opensrp-web/pom.xml index ef88335437..b34ef5605e 100644 --- a/opensrp-web/pom.xml +++ b/opensrp-web/pom.xml @@ -24,7 +24,7 @@ - Jedis + jedis true @@ -33,7 +33,7 @@ - Jedis + jedis @@ -45,7 +45,7 @@ - Lettuce + lettuce opensrp.redis.client.type @@ -53,7 +53,7 @@ - Lettuce + lettuce diff --git a/pom.xml b/pom.xml index 7610ae4639..26cd2b48c8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,449 +1,449 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.opensrp - opensrp - pom - 0.1-SNAPSHOT - opensrp + org.opensrp + opensrp + pom + 0.1-SNAPSHOT + opensrp http://github.com/OpenSRP/opensrp-server - - opensrp-common - opensrp-api - opensrp-form - opensrp-core - opensrp-interface - opensrp-register - opensrp-connector - opensrp-web - - + + opensrp-common + opensrp-api + opensrp-form + opensrp-core + opensrp-interface + opensrp-register + opensrp-connector + opensrp-web + + - - ${project.basedir} + + ${project.basedir} 0.11 org.motechproject.contrib-drishti 0.1-SNAPSHOT UTF-8 3.1.1.RELEASE - 5.1.36 + 5.1.36 1.9.7 - always - + always + - - - opensrp.nexus - OpenSRP Releases Repository - http://ci.smartregistries.org:8081/nexus/content/repositories/releases - false - - - opensrp.nexus - OpenSRP Snapshots Repository - http://ci.smartregistries.org:8081/nexus/content/repositories/opensrp-server - false - - + + + opensrp.nexus + OpenSRP Releases Repository + http://ci.smartregistries.org:8081/nexus/content/repositories/releases + false + + + opensrp.nexus + OpenSRP Snapshots Repository + http://ci.smartregistries.org:8081/nexus/content/repositories/opensrp-server + false + + - - - jasmine-js-bdd - Jasmine JavaScript BDD Repository - http://searls-maven-repository.googlecode.com/svn/trunk/snapshots - - + + + jasmine-js-bdd + Jasmine JavaScript BDD Repository + http://searls-maven-repository.googlecode.com/svn/trunk/snapshots + + - - - central - http://repo1.maven.org/maven2 - Repository for dependencies - - true - - - - spring-maven-release - Spring Maven Release Repository - http://maven.springframework.org/release - - - spring-maven-milestone - Spring Maven Milestone Repository - http://maven.springframework.org/milestone - - - motech.opensrp - Motech Snapshots Repository - http://nexus.motechproject.org/content/repositories/opensrp-server - - true - ${opensrp.updatePolicy} - - - - motech.nexus - Motech Snapshots Repository - http://nexus.motechproject.org/content/repositories/snapshots - - true - ${opensrp.updatePolicy} - - - - motech.nexus.release - Motech Snapshots Repository - http://nexus.motechproject.org/content/repositories/releases - - - - - skip-integration-tests - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.9 - - - - integration-test - verify - - - -XX:MaxPermSize=1024M - - **/it/** - - true - - - - - - - - - integration-tests - - true - - - - - - - maven-antrun-plugin - 1.6 - - - Drop DB Before Unit and Repository Tests - process-test-classes - - - - - - - - - - - - - - - - - run - - - - CREATE DB OPENSRP - pre-integration-test - - - - - - - - - - - - - run - - - - - - org.codehaus.mojo - sql-maven-plugin - 1.5 - - - - mysql - mysql-connector-java - ${mysql.connector.version} - - + + + central + http://repo1.maven.org/maven2 + Repository for dependencies + + true + + + + spring-maven-release + Spring Maven Release Repository + http://maven.springframework.org/release + + + spring-maven-milestone + Spring Maven Milestone Repository + http://maven.springframework.org/milestone + + + motech.opensrp + Motech Snapshots Repository + http://nexus.motechproject.org/content/repositories/opensrp-server + + true + ${opensrp.updatePolicy} + + + + motech.nexus + Motech Snapshots Repository + http://nexus.motechproject.org/content/repositories/snapshots + + true + ${opensrp.updatePolicy} + + + + motech.nexus.release + Motech Snapshots Repository + http://nexus.motechproject.org/content/repositories/releases + + + + + skip-integration-tests + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.9 + + + + integration-test + verify + + + -XX:MaxPermSize=1024M + + **/it/** + + true + + + + + + + + + integration-tests + + true + - - ${jdbc.driverClassName} - ${jdbc.url-wo-db} - ${jdbc.username} - ${jdbc.password} - ${maven.test.skip} - + + + + + maven-antrun-plugin + 1.6 + + + Drop DB Before Unit and Repository Tests + process-test-classes + + + + + + + + + + + + + + + + + run + + + + CREATE DB OPENSRP + pre-integration-test + + + + + + + + + + + + + run + + + + + + org.codehaus.mojo + sql-maven-plugin + 1.5 + + + + mysql + mysql-connector-java + ${mysql.connector.version} + + - - - - drop-create-relational-db - pre-integration-test - - execute - - - ${jdbc.url-wo-db} - ${jdbc.username} - ${jdbc.password} - true - - drop database if exists ${db.quartz}; - create database ${db.quartz}; - - abort - - - - - create-quartz-tables - pre-integration-test - - execute - - - ${jdbc.url-wo-db}/${db.quartz} - ${jdbc.username} - ${jdbc.password} - true - - ../build/sql/tables_quartz_${jdbc.backend}.sql - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.9 - - - - integration-test - verify - - - -XX:MaxPermSize=1024M - - **/it/** - - true - - - - - - - - - - CoachDB - - - opensrp.database.type - coachdb - - - - CoachDB - - - - Postgres - - true - - opensrp.database.type - postgres - - - - Postgres - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.7 - 1.7 - UTF-8 - - - - org.apache.maven.plugins - maven-resources-plugin - 2.5 - - UTF-8 - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.5 - + + ${jdbc.driverClassName} + ${jdbc.url-wo-db} + ${jdbc.username} + ${jdbc.password} + ${maven.test.skip} + - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - initialize - - read-project-properties - - - - ${main.basedir}/build/maven.properties - ${main.basedir}/assets/config/opensrp.properties - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20 - - true - - **/it/** - - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.9 - - ${basedir}/target/coverage-reports/jacoco-unit.exec - ${basedir}/target/coverage-reports/jacoco-unit.exec - - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - test - - report - - - - - - org.eluder.coveralls - coveralls-maven-plugin - 4.0.0 - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-antrun-plugin - - - [1.6,) - - - run - - - - - - - - - - org.codehaus.mojo - - - properties-maven-plugin - - - [1.0-alpha-2,) - - - - read-project-properties - - - - - - - - - - - - - - + + + + drop-create-relational-db + pre-integration-test + + execute + + + ${jdbc.url-wo-db} + ${jdbc.username} + ${jdbc.password} + true + + drop database if exists ${db.quartz}; + create database ${db.quartz}; + + abort + + + + + create-quartz-tables + pre-integration-test + + execute + + + ${jdbc.url-wo-db}/${db.quartz} + ${jdbc.username} + ${jdbc.password} + true + + ../build/sql/tables_quartz_${jdbc.backend}.sql + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.9 + + + + integration-test + verify + + + -XX:MaxPermSize=1024M + + **/it/** + + true + + + + + + + + + + couchDb + + + opensrp.database.type + couchdb + + + + couchdb + + + + postgres + + true + + opensrp.database.type + postgres + + + + postgres + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + 1.7 + 1.7 + UTF-8 + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + UTF-8 + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.5 + + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + initialize + + read-project-properties + + + + ${main.basedir}/build/maven.properties + ${main.basedir}/assets/config/opensrp.properties + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20 + + true + + **/it/** + + + + + + + org.jacoco + jacoco-maven-plugin + 0.7.9 + + ${basedir}/target/coverage-reports/jacoco-unit.exec + ${basedir}/target/coverage-reports/jacoco-unit.exec + + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + test + + report + + + + + + org.eluder.coveralls + coveralls-maven-plugin + 4.0.0 + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-antrun-plugin + + + [1.6,) + + + run + + + + + + + + + + org.codehaus.mojo + + + properties-maven-plugin + + + [1.0-alpha-2,) + + + + read-project-properties + + + + + + + + + + + + + +