From 6dd4909218c3de58dc498f2130458bf33e479755 Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Sun, 17 Dec 2023 20:24:34 +0000 Subject: [PATCH] RApp Catalogue-Enhanced Release notes & Roll version after i-release 1.1.0 -> 1.1.1 Change-Id: If51bf2ae14c1bfcee6ac5d5c3865dbcf124bb24a Issue-ID: NONRTRIC-958 Signed-off-by: JohnKeeney --- .gitignore | 1 + catalogue-enhanced/Dockerfile | 3 ++- catalogue-enhanced/README.md | 4 +++- catalogue-enhanced/container-tag.yaml | 2 +- catalogue-enhanced/setup.py | 2 +- docs/conf.py | 2 +- docs/developer-guide.rst | 5 +++-- docs/release-notes.rst | 27 ++++++++++++++++++++++++--- 8 files changed, 36 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 2b6a724..51fdc2f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ docs/_build/ .DS_STORE .swagger* docs/offeredapis/swagger/README.md +api/.openapi-generator* # Eclipse .checkstyle diff --git a/catalogue-enhanced/Dockerfile b/catalogue-enhanced/Dockerfile index 9939ebf..4b5fbef 100644 --- a/catalogue-enhanced/Dockerfile +++ b/catalogue-enhanced/Dockerfile @@ -1,5 +1,6 @@ # ============LICENSE_START=============================================== -# Copyright (C) 2022 Nordix Foundation. All rights reserved. +# Copyright (C) 2022-2023 Nordix Foundation. All rights reserved. +# Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. # ======================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/catalogue-enhanced/README.md b/catalogue-enhanced/README.md index 83c8c0a..1753c6d 100644 --- a/catalogue-enhanced/README.md +++ b/catalogue-enhanced/README.md @@ -1,6 +1,8 @@ ## License Copyright (C) 2022-2023 Nordix Foundation. +Copyright (C) 2023 OpenInfra Foundation Europe. + Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -21,7 +23,7 @@ The O-RAN Non-RT RIC rApp Catalogue Enhanced module supports GET, PUT and DELETE |Yaml file | Version | |-----------------------------|-------------------- | -|rapp-catalogue-enhanced.yaml | 1.0.0 | +|rapp-catalogue-enhanced.yaml | 1.1.1 | The overall folder structure is (relative to the location of this README file): diff --git a/catalogue-enhanced/container-tag.yaml b/catalogue-enhanced/container-tag.yaml index 5c5003f..a33e933 100644 --- a/catalogue-enhanced/container-tag.yaml +++ b/catalogue-enhanced/container-tag.yaml @@ -19,4 +19,4 @@ # By default this file is in the docker build directory, # but the location can configured in the JJB template. --- -tag: 1.1.0 +tag: 1.1.1 diff --git a/catalogue-enhanced/setup.py b/catalogue-enhanced/setup.py index 6f92040..050de66 100644 --- a/catalogue-enhanced/setup.py +++ b/catalogue-enhanced/setup.py @@ -21,7 +21,7 @@ from setuptools import setup setup(name='rappcatalogue-enhanced', - version='1.1.0', + version='1.1.1', description='The O-RAN Non-RT RIC rApp Catalogue Enhanced provides an OpenApi 3.0 REST API for rApp services to register/unregister themselves and discover other services', url='https://gerrit.o-ran-sc.org/r/admin/repos/nonrtric/plt/rappcatalogue,general', license='Apache License, Version 2.0', diff --git a/docs/conf.py b/docs/conf.py index 1cbdedd..bb9c870 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -19,7 +19,7 @@ from docs_conf.conf import * #branch configuration -branch = 'latest' +branch = 'i-release' language = 'en' diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst index e642f18..5eed72b 100644 --- a/docs/developer-guide.rst +++ b/docs/developer-guide.rst @@ -1,13 +1,14 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. SPDX-License-Identifier: CC-BY-4.0 -.. Copyright (C) 2021 Nordix +.. Copyright (C) 2021-2013 Nordix +.. Copyright (C) 2021 OpenInfra Foundation Europe Developer Guide =============== This document provides a quickstart for developers of the Non-RT RIC App Catalogue. -Additional developer guides are available on the `O-RAN SC NONRTRIC Developer wiki `_. +Additional developer guides are available on the `O-RAN SC NONRTRIC Developer wiki `_. See the README.md file in the Gerrit repo for more details how to run the component. diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 812bf55..6ca9586 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -12,8 +12,8 @@ This document provides the release notes for the Non-RT RIC App Catalogue. :depth: 1 :local: -Version history App Catalogue -================================= +Version history rApp Catalogue & rApp Catalogue Enhanced +======================================================== +------------+----------+------------------+----------------+ | **Date** | **Ver.** | **Author** | **Comment** | @@ -163,7 +163,7 @@ G Maintenance Release | **Project** | Non-RT RIC App Catalogue | | | | +-----------------------------+---------------------------------------------------+ -| **Repo/commit-ID** | nonrtric/plt/rappcatalogue | +| **Repo/commit-ID** | nonrtric-plt-rappcatalogue-enhanced:1.0.2 | | | f6314546c2e7c5992882fff9756ddf510151c338 | | | | +-----------------------------+---------------------------------------------------+ @@ -197,3 +197,24 @@ H Release | | Update to JDK 17 & Springboot 3 | | | | +-----------------------------+---------------------------------------------------+ + +I Release +--------- ++-----------------------------+---------------------------------------------------+ +| **Project** | Non-RT RIC App Catalogue-Enhanced | +| | | ++-----------------------------+---------------------------------------------------+ +| **Repo/commit-ID** | nonrtric-plt-rappcatalogue-enhanced | +| | c8890f7f4dfaca51762e04b24999ab0ef1a1c72e | +| | | ++-----------------------------+---------------------------------------------------+ +| **Release designation** | I | +| | | ++-----------------------------+---------------------------------------------------+ +| **Release date** | 2023-12-17 | +| | | ++-----------------------------+---------------------------------------------------+ +| **Purpose of the delivery** | nonrtric-plt-rappcatalogue-enhanced:1.1.0 | +| | Update version of Flask 3PP | +| | | ++-----------------------------+---------------------------------------------------+ -- 2.16.6