Skip to content

Commit

Permalink
Releasing 3.0.2
Browse files Browse the repository at this point in the history
* move from snapshot versions to stable versions: reference-ui:5.0.0, requisition:3.1.2, referencedata:5.0.1, auth:3.0.2, notification:3.0.1, fulfillment:3.0.2

* also set consul at a specific tag version

* update docs to link to tagged versions for release and remove live api links

* remove stock management service (not including it in 3.0.2)
  • Loading branch information
joshzamor authored and brandonbowersox committed May 9, 2017
1 parent ab9a63d commit b56bf6c
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 75 deletions.
24 changes: 7 additions & 17 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:

consul:
command: -server -bootstrap
image: gliderlabs/consul-server
image: gliderlabs/consul-server:0.6
ports:
- "8300"
- "8400"
Expand All @@ -23,12 +23,12 @@ services:
depends_on: [consul]

reference-ui:
image: openlmis/reference-ui:4.0.1-SNAPSHOT
image: openlmis/reference-ui:5.0.0
env_file: .env
depends_on: [consul]

requisition:
image: openlmis/requisition:3.1.2-SNAPSHOT
image: openlmis/requisition:3.1.2
env_file: .env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
Expand All @@ -38,7 +38,7 @@ services:
depends_on: [log]

referencedata:
image: openlmis/referencedata:5.0.0-SNAPSHOT
image: openlmis/referencedata:5.0.1
env_file: .env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
Expand All @@ -48,7 +48,7 @@ services:
depends_on: [log]

auth:
image: openlmis/auth:3.0.2-SNAPSHOT
image: openlmis/auth:3.0.2
env_file: .env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
Expand All @@ -58,7 +58,7 @@ services:
depends_on: [log]

notification:
image: openlmis/notification:3.0.1-SNAPSHOT
image: openlmis/notification:3.0.1
env_file: .env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
Expand All @@ -68,7 +68,7 @@ services:
depends_on: [log]

fulfillment:
image: openlmis/fulfillment:3.0.2-SNAPSHOT
image: openlmis/fulfillment:3.0.2
env_file: .env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
Expand All @@ -77,16 +77,6 @@ services:
- 'service-config:/config'
depends_on: [log]

stockmanagement:
image: openlmis/stockmanagement:1.0.0-BETA-SNAPSHOT
env_file: .env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dspring.jpa.properties.hibernate.hbm2ddl.import_files=/bootstrap.sql,file:///demo-data/data.sql'
spring_profiles_active: ${spring_profiles_active}
volumes:
- 'service-config:/config'
depends_on: [log]

db:
image: openlmis/postgres:9.6
env_file: .env
Expand Down
30 changes: 5 additions & 25 deletions docs/source/api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,56 +26,36 @@ Auth Service

Security credentials, Authentication and Authorization. Uses OAuth2.

`Live Documentation for Auth API <http://test.openlmis.org/auth/docs/#/default>`_

`Static Documentation for Auth API <http://build.openlmis.org/job/OpenLMIS-auth-service/lastSuccessfulBuild/artifact/build/resources/main/api-definition.html>`_
`Static Documentation for Auth API <http://build.openlmis.org/job/OpenLMIS-auth-service/229/artifact/build/resources/main/api-definition.html>`_

**********************
Reference Data Service
**********************

Provides the reference data for the rest of the processes: facilities, programs, products, etc.

`Live Documentation for Reference Data API <http://test.openlmis.org/referencedata/docs/#/default>`_

`Static Documentation for Reference Data API <http://build.openlmis.org/job/OpenLMIS-referencedata-service/lastSuccessfulBuild/artifact/build/resources/main/api-definition.html>`_
`Static Documentation for Reference Data API <http://build.openlmis.org/job/OpenLMIS-referencedata-service/705/artifact/build/resources/main/api-definition.html>`_

*******************
Requisition Service
*******************

Requisition (pull) based replenishment process.

`Live Documentation for Requisition API <http://test.openlmis.org/requisition/docs/#/default>`_

`Static Documentation for Requisition API <http://build.openlmis.org/job/OpenLMIS-requisition-service/lastSuccessfulBuild/artifact/build/resources/main/api-definition.html>`_
`Static Documentation for Requisition API <http://build.openlmis.org/job/OpenLMIS-requisition-service/1463/artifact/build/resources/main/api-definition.html>`_

*******************
Fulfillment Service
*******************

Includes the basics of fulfillment.

`Live Documentation for Fulfillment API <http://test.openlmis.org/fulfillment/docs/#/default>`_

`Static Documentation for Fulfillment API <http://build.openlmis.org/job/OpenLMIS-fulfillment-service/lastSuccessfulBuild/artifact/build/resources/main/api-definition.html>`_
`Static Documentation for Fulfillment API <http://build.openlmis.org/job/OpenLMIS-fulfillment-service/263/artifact/build/resources/main/api-definition.html>`_

********************
Notification Service
********************

Notifying users when their attention is needed.

`Live Documentation for Notification API <http://test.openlmis.org/notification/docs/#/default>`_

`Static Documentation for Notification API <http://build.openlmis.org/job/OpenLMIS-notification-service/lastSuccessfulBuild/artifact/build/resources/main/api-definition.html>`_

********************
Stock Management Service
********************

Electronic stock cards.

`Live Documentation for Stock Management API <http://test.openlmis.org/stockmanagement/docs/#/default>`_

`Static Documentation for Stock Management API <http://build.openlmis.org/job/OpenLMIS-stockmanagement-service/lastSuccessfulBuild/artifact/build/resources/main/api-definition.html>`_
`Static Documentation for Notification API <http://build.openlmis.org/job/OpenLMIS-notification-service/101/artifact/build/resources/main/api-definition.html>`_
11 changes: 5 additions & 6 deletions docs/source/collect-docs.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import urllib

urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-fulfillment/master/README.md", "developer-docs/fulfillment.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-requisition/master/README.md", "developer-docs/requisition.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-auth/master/README.md", "developer-docs/auth.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-referencedata/master/README.md", "developer-docs/referencedata.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-stockmanagement/master/README.md", "developer-docs/stockmanagement.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-fulfillment/v3.0.2/README.md", "developer-docs/fulfillment.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-requisition/v3.1.2/README.md", "developer-docs/requisition.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-auth/v3.0.2/README.md", "developer-docs/auth.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-referencedata/v5.0.1/README.md", "developer-docs/referencedata.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/master/README.md", "developer-docs/templateService.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-reference-ui/master/README.md", "developer-docs/referenceUI.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-reference-ui/v5.0.0/README.md", "developer-docs/referenceUI.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/master/STYLE-GUIDE.md", "developer-docs/codeStyleguide.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/master/TESTING.md", "developer-docs/testing.md")
urllib.urlretrieve("https://raw.githubusercontent.com/OpenLMIS/openlmis-template-service/master/ERROR_HANDLING.md", "developer-docs/errorHandling.md")
Expand Down
3 changes: 1 addition & 2 deletions docs/source/erd/erd-auth.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ Auth ERD

ERD schema of Auth service:

* `Live ERD <http://ci.openlmis.org/erd-auth/>`_
* `Zip ERD <http://build.openlmis.org/job/OpenLMIS-auth-erd-generation/lastSuccessfulBuild/artifact/erd-auth.zip>`_
* `Zip ERD <http://build.openlmis.org/job/OpenLMIS-auth-erd-generation/197/artifact/erd-auth.zip>`_
3 changes: 1 addition & 2 deletions docs/source/erd/erd-fulfillment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ Fulfillment ERD

ERD schema of Fulfillment service:

* `Live ERD <http://ci.openlmis.org/erd-fulfillment/>`_
* `Zip ERD <http://build.openlmis.org/job/OpenLMIS-fulfillment-erd-generation/lastSuccessfulBuild/artifact/erd-auth.zip>`_
* `Zip ERD <http://build.openlmis.org/job/OpenLMIS-fulfillment-erd-generation/226/artifact/erd-fulfillment.zip>`_
8 changes: 1 addition & 7 deletions docs/source/erd/erd-referencedata.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,4 @@ Reference Data ERD

ERD schema of Reference Data service:

* `Live ERD <http://ci.openlmis.org/erd-referencedata/>`_
* `Zip ERD <http://build.openlmis.org/job/OpenLMIS-referencedata-erd-generation/lastSuccessfulBuild/artifact/erd-referencedata.zip>`_





* `Zip ERD <http://build.openlmis.org/job/OpenLMIS-referencedata-erd-generation/555/artifact/erd-referencedata.zip>`_
8 changes: 1 addition & 7 deletions docs/source/erd/erd-requisition.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,4 @@ Requisition ERD

ERD schema of Requisition service:

* `Live ERD <http://ci.openlmis.org/erd-requisition/>`_
* `Zip ERD <http://build.openlmis.org/job/OpenLMIS-requisition-erd-generation/lastSuccessfulBuild/artifact/erd-requisition.zip>`_





* `Zip ERD <http://build.openlmis.org/job/OpenLMIS-requisition-erd-generation/1072/artifact/erd-requisition.zip>`_
8 changes: 0 additions & 8 deletions docs/source/erd/erd-stockmanagement.rst

This file was deleted.

2 changes: 1 addition & 1 deletion docs/source/erd/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ Generated OpenLMIS v3 ERD.
erd-requisition
erd-fulfillment
erd-auth
erd-stockmanagement

0 comments on commit b56bf6c

Please sign in to comment.