update oparent version to 2.1.0

Change-Id: I2c359ba5b2b5891b3edd706a63373f1c15324589
Issue-ID: MODELING-235
Signed-off-by: dyh <dengyuanhong@chinamobile.com>

diff --git a/README.md b/README.md
index 663acc9..d815e8d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -18,15 +18,15 @@
    ./         project files
    ./docker   docker related scripts
    ./logs     log file
-   ./catalog  generic parser management
-       ./packages      package life cycle API& logic
+   ./catalog  package management and generic parser service
+       ./packages      package life cycle API & logic
              ./               API url definition
              ./views          API related views, each operation is a view
              ./serializers    API related request and response parameters.
                               Suggest related to sol003/sol005, each datatype is a file.
                               Common datatypes are put into the common file
-             ./biz            Package management busyness logic files
-             ./tests          All the test case. At least each API should have a test case
+             ./biz            Package management business logic files
+             ./tests          All the test case. Each API should have at least a test case.
        ./jobs      Related job
        ./pub       Common class, including database, external micro service API, utils, and config parameters.
        ./samples   Catalog micro service health check

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index d570e5a..0143d89 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -2,10 +2,49 @@
 .. http://creativecommons.org/licenses/by/4.0
 
 
-genericparser Release Notes
+etsicatalog Release Notes
 ==================
 
-genericparser provides package management service and parser service as Micro Service.
+etsicatalog provides package management service and parser service as Micro Service.
+
+Version: 1.0.4
+--------------
+
+:Release Date: 2019-09-17
+
+**New Features**
+
+- Update to python3.
+- Optimize the process of service package distribution.
+- Merge with vfc/catalog
+
+
+Released components:
+ - etsicatalog 1.0.4
+
+**Bug Fixes**
+
+None
+
+**Known Issues**
+
+None
+
+**Security Issues**
+
+- ` El Alto Vulnerability Report <https://wiki.onap.org/pages/viewpage.action?pageId=68541425>`_
+
+**Upgrade Notes**
+
+None
+
+**Deprecation Notes**
+
+None
+
+**Other**
+
+===========
 
 Version: 1.0.2
 --------------
@@ -19,7 +58,7 @@ Version: 1.0.2
 
 
 Released components:
- - genericparser 1.0.2
+ - etsicatalog 1.0.2
 
 **Bug Fixes**
 
@@ -42,7 +81,6 @@ This is the initial release
 This is the initial release
 
 **Other**
-       NA
 
 ===========
 

diff --git a/pom.xml b/pom.xml
index a765be6..89dd68b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.modeling.etsicatalog</groupId>
     <artifactId>modeling-etsicatalog</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>modeling-etsicatalog</name>
     <description>modeling etsicatalog</description>

diff --git a/version.properties b/version.properties
index d5c705d..e443f93 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -18,7 +18,7 @@
 
 major=1
 minor=0
-patch=3
+patch=4
 
 base_version=${major}.${minor}.${patch}