Merge branch 'master' of github.com:OpenLMIS/openlmis-ref-distro

.env

@@ -1,13 +1,13 @@
-OL_REFERENCE_UI_VERSION=5.1.8-SNAPSHOT
+OL_REFERENCE_UI_VERSION=5.2.0-SNAPSHOT
 
-OL_REQUISITION_VERSION=8.3.0-SNAPSHOT
-OL_REFERENCEDATA_VERSION=15.2.0-SNAPSHOT
-OL_AUTH_VERSION=4.3.1-SNAPSHOT
-OL_NOTIFICATION_VERSION=4.3.1-SNAPSHOT
-OL_FULFILLMENT_VERSION=8.2.0-SNAPSHOT
+OL_REQUISITION_VERSION=8.3.2-SNAPSHOT
+OL_REFERENCEDATA_VERSION=15.2.1-SNAPSHOT
+OL_AUTH_VERSION=4.3.2-SNAPSHOT
+OL_NOTIFICATION_VERSION=4.3.2-SNAPSHOT
+OL_FULFILLMENT_VERSION=9.0.0-SNAPSHOT
 OL_CCE_VERSION=1.3.1-SNAPSHOT
-OL_STOCKMANAGEMENT_VERSION=5.1.0-SNAPSHOT
-OL_REPORT_VERSION=1.2.1-SNAPSHOT
+OL_STOCKMANAGEMENT_VERSION=5.1.4-SNAPSHOT
+OL_REPORT_VERSION=1.2.2-SNAPSHOT
 OL_HAPIFHIR_VERSION=2.0.1-SNAPSHOT
 
 OL_DIAGNOSTICS_VERSION=1.1.1-SNAPSHOT

config/Dockerfile

@@ -1,4 +1,4 @@
-FROM gliderlabs/alpine:3.4
+FROM alpine:3.11
 
 COPY log/logback.xml /config/log/logback.xml
 

docker-compose.openlmis-stockmanagement-validator-extension.yml

@@ -0,0 +1,183 @@
+version: "3.3"
+services:
+
+  consul:
+    command: -server -bootstrap
+    image: gliderlabs/consul-server
+    ports:
+      - "8300"
+      - "8400"
+      - "8500:8500"
+      - "53"
+
+  nginx:
+    image: openlmis/nginx:${OL_NGINX_VERSION}
+    ports:
+      - "${OL_HTTP_PORT:-80}:80"
+    env_file: settings.env
+    environment:
+      NGINX_LOG_DIR: '/var/log/nginx/log'
+    volumes:
+      - 'nginx-log:/var/log/nginx/log'
+      - 'consul-template-log:/var/log/consul-template'
+    depends_on: [consul]
+
+  reference-ui:
+    image: openlmis/reference-ui:${OL_REFERENCE_UI_VERSION}
+    env_file: settings.env
+    depends_on: [consul]
+
+  requisition:
+    image: openlmis/requisition:${OL_REQUISITION_VERSION}
+    env_file: settings.env
+    environment:
+      JAVA_OPTS: '-server -Xmx1024m -Dlogging.config=/config/log/logback.xml'
+    volumes:
+      - 'service-config:/config'
+    depends_on: [log, db]
+    command: ["/wait-for-postgres.sh", "/run.sh"]
+
+  referencedata:
+    image: openlmis/referencedata:${OL_REFERENCEDATA_VERSION}
+    env_file: settings.env
+    environment:
+      JAVA_OPTS: '-server -Xmx1024m -Dlogging.config=/config/log/logback.xml'
+    volumes:
+      - 'service-config:/config'
+    depends_on: [log, db]
+    command: ["/wait-for-postgres.sh", "/run.sh"]
+
+  auth:
+    image: openlmis/auth:${OL_AUTH_VERSION}
+    env_file: settings.env
+    environment:
+      JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
+    volumes:
+      - 'service-config:/config'
+    depends_on: [log, db]
+    command: ["/wait-for-postgres.sh", "/run.sh"]
+
+  notification:
+    image: openlmis/notification:${OL_NOTIFICATION_VERSION}
+    env_file: settings.env
+    environment:
+      JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
+    volumes:
+      - 'service-config:/config'
+    depends_on: [log, db]
+    command: ["/wait-for-postgres.sh", "/run.sh"]
+
+  fulfillment:
+    image: openlmis/fulfillment:${OL_FULFILLMENT_VERSION}
+    env_file: settings.env
+    environment:
+      JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
+    volumes:
+      - 'service-config:/config'
+    depends_on: [log, db]
+    command: ["/wait-for-postgres.sh", "/run.sh"]
+
+  cce:
+    image: openlmis/cce:${OL_CCE_VERSION}
+    env_file: settings.env
+    environment:
+      JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
+    volumes:
+      - 'service-config:/config'
+    depends_on: [log, db]
+    command: ["/wait-for-postgres.sh", "/run.sh"]
+
+  example-extensions:
+    image: openlmis/openlmis-example-extensions:0.0.1-SNAPSHOT
+    volumes:
+      - 'example-extensions:/extensions'
+
+  stockmanagement:
+    image: openlmis/stockmanagement:${OL_STOCKMANAGEMENT_VERSION}
+    env_file: settings.env
+    environment:
+      JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
+    volumes:
+      - 'example-extensions:/extensions'
+      - 'service-config:/config'
+    depends_on: [log, db, example-extensions]
+    command: ["/wait-for-postgres.sh", "/run.sh"]
+
+  report:
+    image: openlmis/report:${OL_REPORT_VERSION}
+    env_file: settings.env
+    environment:
+      JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
+    volumes:
+      - 'service-config:/config'
+    depends_on: [log, db]
+    command: ["/wait-for-postgres.sh", "/run.sh"]
+
+  hapifhir:
+    restart: always
+    image: openlmis/hapifhir:${OL_HAPIFHIR_VERSION}
+    env_file: settings.env
+    environment:
+      JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
+      spring_profiles_active: ${spring_profiles_active}
+    volumes:
+      - 'service-config:/config'
+    depends_on: [log, db]
+    command: ["/wait-for-postgres.sh", "/run.sh"]
+
+  diagnostics:
+    image: openlmis/diagnostics:${OL_DIAGNOSTICS_VERSION}
+    env_file: settings.env
+    environment:
+      JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
+      spring_profiles_active: ${spring_profiles_active}
+    volumes:
+      - 'service-config:/config'
+    depends_on: [log]
+
+  db:
+    image: openlmis/postgres:${OL_POSTGRES_VERSION}
+    env_file: settings.env
+    networks:
+      default:
+        aliases:
+          - olmis-db
+    depends_on: [consul]
+
+  log:
+    image: openlmis/rsyslog:${OL_RSYSLOG_VERSION}
+    volumes:
+      - 'syslog:/var/log'
+    depends_on:
+      - service-configuration
+      - consul
+
+  service-configuration:
+    build:
+      context: ./config
+    volumes:
+      - service-config:/config
+
+  ftp:
+    image: hauptmedia/proftpd
+    ports:
+      - "${OL_FTP_PORT_21:-21}:21"
+      - "${OL_FTP_PORT_20:-20}:20"
+    env_file: settings.env
+    depends_on: [consul]
+
+  redis:
+    image: redis:3.2.12
+    depends_on: [consul]
+
+volumes:
+  syslog:
+    external: false
+  nginx-log:
+    external: false
+  consul-template-log:
+    external: false
+  service-config:
+    external: false
+  example-extensions:
+    external: false

docs/source/components/index.rst

@@ -253,7 +253,7 @@ Druid
 Superset
 --------
 
-`Superset <https://superset.incubator.apache.org/>`_ is the visualization layer of the reporting stack and is used to create self-service dashboards on the data in Druid. It’s very closely integrated with Druid, and will detect the schema for each data source and the data therein. “Dimensions” are akin to columns within a relational database, and “metrics” are calculations performed on those dimensions - e.g. count distinct, sum, min, max. Typically “metrics” are written off of numeric dimensions, with the exception of count distinct. Superset is the UI in which we write JSON queries for Druid to calculate metrics that are more sophisticated than the basic types outlined above.
+`Superset <https://superset.apache.org/>`_ is the visualization layer of the reporting stack and is used to create self-service dashboards on the data in Druid. It’s very closely integrated with Druid, and will detect the schema for each data source and the data therein. “Dimensions” are akin to columns within a relational database, and “metrics” are calculations performed on those dimensions - e.g. count distinct, sum, min, max. Typically “metrics” are written off of numeric dimensions, with the exception of count distinct. Superset is the UI in which we write JSON queries for Druid to calculate metrics that are more sophisticated than the basic types outlined above.
 
 Slices are individual visualizations and can be listed by clicking on the Charts tab along the top. Each slice has a visualization type, a data source, and one or more metrics and dimensions that you want to display. Superset supports the development of custom visualization types if it’s not included in the default list provided by Apache.
 

docs/source/contribute/contributionGuide.md

@@ -143,12 +143,12 @@ A prime focus of version 3 is enabling extensions and customizations to happen w
 There are multiple ways OpenLMIS can be extended, and lots of documentation and starter code is available:
 
 * The Reference UI supports extension by adding CSS, overriding HTML layouts, adding new screens, or replacing
-existing screens in the UI application. See the [UI Extension Guide](https://github.com/OpenLMIS/openlmis-ui-components/blob/master/docs/extension_guide.md).
+existing screens in the UI application. See the [UI Extension Guide](https://github.com/OpenLMIS/openlmis-ui-components/blob/master/docs/extension_guide.md#ui-extension-guide).
 * The Reference Distribution is a collection of collaborative **Services**, Services may be added in
  or swapped out to create custom distributions.
 * The Services can be extended using **extension points** in the Java code. The core team is eager to add more
 extension points as they are requested by implementors. For documentation about this extension mechanism, see
-these 3 READMEs: [openlmis-example-extensions README](https://github.com/OpenLMIS/openlmis-example-extensions/blob/master/README.md), [openlmis-example-extension module README](https://github.com/OpenLMIS/openlmis-example-extension/blob/master/README.md), and [openlmis-example service README](https://github.com/OpenLMIS/openlmis-example/blob/master/README.md#extension-points-and-extension-modules).
+these 3 READMEs: [openlmis-example-extensions README](https://github.com/OpenLMIS/openlmis-example-extensions/blob/master/README.md#openlmis-example-extensions), [openlmis-stockmanagement-validator-extension module README](https://github.com/OpenLMIS/openlmis-stockmanagement-validator-extension/blob/master/README.md#openlmis-stock-management-validator-extension-module), and [openlmis-example service README](https://github.com/OpenLMIS/openlmis-example/blob/master/README.md#openlmis-example-service).
 * Extra Data allows for clients to add additional data to RESTful resources so that the internal
 storage mechanism inside a Service doesn't need to be changed.
 * Some features may require both API and UI extensions/customizations. The Technical Committee worked on a [Requisition Splitting Extension Scenario](https://openlmis.atlassian.net/wiki/display/OP/Requisition+Splitting+-+Extension+Scenario+Analysis)

docs/source/conventions/versioningReleasing.md

@@ -301,6 +301,10 @@ codebase is working towards):
 - (If your component, such as the openlmis-service-util library, publishes to Maven, then other
   steps will be needed here.)
 
+**Note:** usually during a release many docker images are built in a short time. It may happen that
+the CI build process fails because of a docker pull rate limit which is 250 per 6 hours. It is a
+limitation of a free version of a dockerhub account.
+
 ### Patch Releasing a Component
 
 1. Create a hotfix branch that includes 'rel-' prefix and the patch version, e.g. 'rel-10.0.1'

docs/source/releases/index.rst

@@ -7,6 +7,7 @@ To download a release, please visit `GitHub <https://github.com/OpenLMIS/openlmi
 .. toctree::
    :maxdepth: 1
 
+   openlmis-ref-distro-v3.10.0
    openlmis-ref-distro-v3.9.0
    openlmis-ref-distro-v3.8.0
    openlmis-ref-distro-v3.7.0