From b0c7a71cd665d92c672714a8a566cf55a545d93e Mon Sep 17 00:00:00 2001 From: debbabi Date: Fri, 10 Jul 2015 17:02:48 +0200 Subject: [PATCH] Prepare 1.1.0 release --- CHANGELOG.txt | 8 +++----- DEPENDENCIES.txt | 10 +++++----- README.rst | 31 +++---------------------------- bin/cohorte-version.bat | 2 +- build/scripts/requirements.txt | 4 ++-- pom.xml | 6 +++--- repo/admin/admin.py | 2 +- repo/debug/api.py | 2 +- 8 files changed, 19 insertions(+), 46 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5b96dfa..ad09d67 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,11 +1,9 @@ -Changes form the 1.0.0 to 1.1.0.pre1 ------------------------------------- - -Note: if you upgrade from 1.0.0 you should read REAME.md file to update your already created Cohorte Nodes (run configurations). +Changes form the 1.0.0 to 1.1.0 +------------------------------- ** New Feature * New "proxy" HTTP Service interface for each Node Composer [#34] - * New "debug" REST API [#33] + * New "debug" REST API [#33] (Java is not yet supported) * New "cohorte-update" shell command [#29] * New "Activity log" tab on Webadmin that tracks Cohorte's isolates activity [#21] * New "Composition" tab on Webadmin that shows the application's composition specification [#21] diff --git a/DEPENDENCIES.txt b/DEPENDENCIES.txt index 0a8b0f6..2456d20 100644 --- a/DEPENDENCIES.txt +++ b/DEPENDENCIES.txt @@ -1,9 +1,9 @@ -1.1.0.pre1 +1.1.0 PYTHON DEPENDENCIES -- Cohorte-Python==1.0.1.dev -- Cohorte-Herald==0.0.4.dev +- Cohorte-Python==1.0.1 +- Cohorte-Herald==0.0.4 - iPOPO==0.6.2 - jsonrpclib-pelix==0.2.5 - sleekxmpp>=1.3.1 @@ -14,6 +14,6 @@ JAVA DEPENDENCIES - org.cohorte.utilities:org.cohorte.utilities:1.0.3 - org.cohorte.jabsorb:org.cohorte.jabsorb:1.1.0 - org.cohorte.remote:cohorte-remote-services:1.2.0 -- org.cohorte.herald:cohorte-herald:0.0.4-SNAPSHOT -- org.cohorte.runtime:cohorte-runtime:1.0.1-SNAPSHOT +- org.cohorte.herald:cohorte-herald:0.0.4 +- org.cohorte.runtime:cohorte-runtime:1.0.1 - ipojo 1.12.1 \ No newline at end of file diff --git a/README.rst b/README.rst index cb9c249..ff2ff75 100644 --- a/README.rst +++ b/README.rst @@ -1,31 +1,6 @@ -What are the changes to consider when you upgrade from 1.0.x to 1.1.x ? -======================================================================= +Cohorte Platform Distributions +============================== -When upgrading from Cohorte 1.0.x you should take in consideration these changes : +This repository contains scripts allowing the generation of the different Cohorte distributions (runtime). -Node Creation script (cohorte-create-node) ------------------------------------------- - -* ``--app-name`` => ``--composition-name`` (``-a`` => ``-c``) : Application's composition name -* new ``--app-id`` (``-a``) : application's ID - - -Startup script (cohorte-start-node) ------------------------------------ - -From Cohorte 1.1, the following arguments where changed (and also their corresponding run.js entries): - -* ``--web-admin`` => ``--http-port`` -* ``--shell-admin`` => ``--shell-port`` - -By default the node starts without the console activated. To activate it on startup, you should add this argument: - -* ``--console`` - -Run configuration files (e.g., run.js) also updates its content : - -* ``application-id`` => ``app-id`` -* ``web-admin`` => ``http-port`` -* ``shell-admin`` => ``shell-port`` - diff --git a/bin/cohorte-version.bat b/bin/cohorte-version.bat index 9db129e..24d46af 100755 --- a/bin/cohorte-version.bat +++ b/bin/cohorte-version.bat @@ -7,6 +7,6 @@ if "%COHORTE_HOME%" == "" ( echo -------------------------------------------------------------------- echo COHORTE -echo version : 1.0.1-dev +echo version : 1.0.1 echo home : %COHORTE_HOME% echo -------------------------------------------------------------------- \ No newline at end of file diff --git a/build/scripts/requirements.txt b/build/scripts/requirements.txt index 10103cb..1c824b6 100644 --- a/build/scripts/requirements.txt +++ b/build/scripts/requirements.txt @@ -1,5 +1,5 @@ -Cohorte-Python==1.0.1.dev -Cohorte-Herald==0.0.4.dev +Cohorte-Python==1.0.1 +Cohorte-Herald==0.0.4 iPOPO==0.6.2 jsonrpclib-pelix==0.2.5 sleekxmpp>=1.3.1 diff --git a/pom.xml b/pom.xml index 8c22f23..9b868bc 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 org.cohorte.platforms cohorte - 1.1.0-SNAPSHOT + 1.1.0 pom COHORTE Project ::: Platforms :: HOME @@ -53,7 +53,7 @@ org.cohorte.runtime cohorte-runtime-package - 1.0.1-SNAPSHOT + 1.0.1 pom provided @@ -61,7 +61,7 @@ org.cohorte.herald cohorte-herald-package - 0.0.4-SNAPSHOT + 0.0.4 pom provided diff --git a/repo/admin/admin.py b/repo/admin/admin.py index 8dc943b..c10fd96 100755 --- a/repo/admin/admin.py +++ b/repo/admin/admin.py @@ -43,7 +43,7 @@ ADMIN_REST_API_PATH = "admin/api/v2" # VERSION -COHORTE_VERSION = "1.0.1.dev" +COHORTE_VERSION = "1.0.1" """ TODO: should have a local cache of all information. diff --git a/repo/debug/api.py b/repo/debug/api.py index d424ec2..3e391e1 100755 --- a/repo/debug/api.py +++ b/repo/debug/api.py @@ -49,7 +49,7 @@ DEBUG_REST_API_VERSION = "v1" # VERSION -COHORTE_VERSION = "1.0.1.dev" +COHORTE_VERSION = "1.0.1" @ComponentFactory("cohorte-debug-api-factory")