Bump up patch version after release 1.5.1 93/103793/1 master
authorBin Yang <bin.yang@windriver.com>
Tue, 17 Mar 2020 13:50:08 +0000 (21:50 +0800)
committerBin Yang <bin.yang@windriver.com>
Tue, 17 Mar 2020 13:50:08 +0000 (21:50 +0800)
Issue-ID: MULTICLOUD-1032
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I0a470b1b8d32aa53f5a5a1e42dd1f576997fbb11

25 files changed:
.readthedocs.yaml [new file with mode: 0644]
artifactbroker/forwarding/pom.xml
artifactbroker/main/pom.xml
artifactbroker/model/pom.xml
artifactbroker/packages/docker/build_image.sh
artifactbroker/packages/pom.xml
artifactbroker/plugins/forwarding-plugins/pom.xml
artifactbroker/plugins/pom.xml
artifactbroker/plugins/reception-plugins/pom.xml
artifactbroker/pom.xml
artifactbroker/reception/pom.xml
docs/.gitignore [new file with mode: 0644]
docs/_static/css/ribbon.css [new file with mode: 0644]
docs/_static/favicon.ico [new file with mode: 0755]
docs/_static/logo_onap_2017.png [new file with mode: 0644]
docs/conf.py
docs/conf.yaml [new file with mode: 0644]
docs/requirements-docs.txt [new file with mode: 0644]
docs/tox.ini [new file with mode: 0644]
multivimbroker/docker/build_image.sh
multivimbroker/pom.xml
pom.xml
releases/container-1.5.1.yaml [new file with mode: 0644]
releases/maven-1.5.1.yaml [new file with mode: 0644]
version.properties

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644 (file)
index 0000000..3797dc8
--- /dev/null
@@ -0,0 +1,20 @@
+---
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+# Required
+version: 2
+
+formats:
+  - htmlzip
+
+build:
+  image: latest
+
+python:
+  version: 3.7
+  install:
+    - requirements: docs/requirements-docs.txt
+
+sphinx:
+  configuration: docs/conf.py
index b5fb446..dd28600 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-forwarding</artifactId>
index 2f3ab87..f4d6c61 100644 (file)
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>multicloud-framework-artifactbroker-main</artifactId>
index d312715..6fffdb3 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-model</artifactId>
index 56c3275..45c864b 100755 (executable)
@@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.5.1-SNAPSHOT"
-STAGING_VERSION="1.5.1-STAGING"
+VERSION="1.5.2-SNAPSHOT"
+STAGING_VERSION="1.5.2-STAGING"
 PROJECT="multicloud"
 IMAGE="framework-artifactbroker"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
index da618fc..9290a97 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-package</artifactId>
index a102eae..96b36f2 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-forwarding-plugins</artifactId>
index 54abc1e..717e5ba 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>
index b81aeb7..3c5b76e 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-reception-plugins</artifactId>
index 54983ef..67be674 100644 (file)
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework-artifactbroker</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.5.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework-artifactbroker</name>
     <description>artifact  broker</description>
         <version.logback>1.2.3</version.logback>
         <policy.common.version>1.3.4</policy.common.version>
         <policy.engine.version>1.3.5</policy.engine.version>
+        <sonar.language>java</sonar.language>
+        <sonar.coverage.jacoco.xmlReportPaths>
+            ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
     <modules>
         <module>model</module>
                             <goal>prepare-agent</goal>
                         </goals>
                         <configuration>
-                            <destFile>${sonar.jacoco.reportPath}</destFile>
+                            <destFile>${sonar.coverage.jacoco.xmlReportPaths}</destFile>
                             <append>true</append>
                         </configuration>
                     </execution>
                             <goal>report</goal>
                         </goals>
                         <configuration>
-                            <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                            <dataFile>${sonar.coverage.jacoco.xmlReportPaths}</dataFile>
                         </configuration>
                     </execution>
                 </executions>
                                 <goal>prepare-agent</goal>
                             </goals>
                             <configuration>
-                                <destFile>${sonar.jacoco.reportPath}</destFile>
+                                <destFile>${sonar.coverage.jacoco.xmlReportPaths}</destFile>
                             </configuration>
                         </execution>
                         <execution>
                                 <goal>report</goal>
                             </goals>
                             <configuration>
-                                <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                                <dataFile>${sonar.coverage.jacoco.xmlReportPaths}</dataFile>
                             </configuration>
                         </execution>
                     </executions>
index 81589f1..8475658 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-reception</artifactId>
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644 (file)
index 0000000..43ca5b6
--- /dev/null
@@ -0,0 +1,3 @@
+/.tox
+/_build/*
+/__pycache__/*
diff --git a/docs/_static/css/ribbon.css b/docs/_static/css/ribbon.css
new file mode 100644 (file)
index 0000000..6008cb1
--- /dev/null
@@ -0,0 +1,63 @@
+.ribbon {
+  z-index: 1000;
+  background-color: #a00;
+  overflow: hidden;
+  white-space: nowrap;
+  position: fixed;
+  top: 25px;
+  right: -50px;
+  -webkit-transform: rotate(45deg);
+     -moz-transform: rotate(45deg);
+      -ms-transform: rotate(45deg);
+       -o-transform: rotate(45deg);
+          transform: rotate(45deg);
+  -webkit-box-shadow: 0 0 10px #888;
+     -moz-box-shadow: 0 0 10px #888;
+          box-shadow: 0 0 10px #888;
+
+}
+
+.ribbon a {
+  border: 1px solid #faa;
+  color: #fff;
+  display: block;
+  font: bold 81.25% 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  margin: 1px 0;
+  padding: 10px 50px;
+  text-align: center;
+  text-decoration: none;
+  text-shadow: 0 0 5px #444;
+  transition: 0.5s;
+}
+
+.ribbon a:hover {
+  background: #c11;
+  color: #fff;
+}
+
+
+/* override table width restrictions */
+@media screen and (min-width: 767px) {
+
+   .wy-table-responsive table td, .wy-table-responsive table th {
+      /* !important prevents the common CSS stylesheets from overriding
+         this as on RTD they are loaded after this stylesheet */
+      white-space: normal !important;
+   }
+
+   .wy-table-responsive {
+      overflow: visible !important;
+   }
+}
+
+@media screen and (max-width: 767px) {
+    .wy-table-responsive table td {
+        white-space: nowrap;
+    }
+}
+
+/* fix width of the screen */
+
+.wy-nav-content {
+    max-width: none;
+}
diff --git a/docs/_static/favicon.ico b/docs/_static/favicon.ico
new file mode 100755 (executable)
index 0000000..cb712eb
Binary files /dev/null and b/docs/_static/favicon.ico differ
diff --git a/docs/_static/logo_onap_2017.png b/docs/_static/logo_onap_2017.png
new file mode 100644 (file)
index 0000000..5d064f4
Binary files /dev/null and b/docs/_static/logo_onap_2017.png differ
index bab9649..8f40e8b 100644 (file)
@@ -1,40 +1,15 @@
-# -*- coding: utf-8 -*-
-# 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
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+from docs_conf.conf import *
 
-import os
-import sys
-
-BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
-
-sys.path.insert(0, ROOT)
-sys.path.insert(0, BASE_DIR)
-
-# -- General configuration ----------------------------------------------------
+branch = 'latest'
+master_doc = 'index'
 
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = [
-    'sphinx.ext.autodoc',
-    #'sphinx.ext.intersphinx'
+linkcheck_ignore = [
+    'http://localhost',
 ]
 
-# The suffix of source filenames.
-source_suffix = '.rst'
+intersphinx_mapping = {}
 
-# The master toctree document.
-master_doc = 'index'
+html_last_updated_fmt = '%d-%b-%y %H:%M'
 
-# General information about the project.
-project = u'MultiCloud Framework'
+def setup(app):
+    app.add_stylesheet("css/ribbon_onap.css")
diff --git a/docs/conf.yaml b/docs/conf.yaml
new file mode 100644 (file)
index 0000000..ab59281
--- /dev/null
@@ -0,0 +1,7 @@
+---
+project_cfg: onap
+project: onap
+
+# Change this to ReleaseBranchName to modify the header
+default-version: latest
+#
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
new file mode 100644 (file)
index 0000000..b3188dd
--- /dev/null
@@ -0,0 +1,15 @@
+tox
+Sphinx
+doc8
+docutils
+setuptools
+six
+sphinx_rtd_theme>=0.4.3
+sphinxcontrib-blockdiag
+sphinxcontrib-needs>=0.2.3
+sphinxcontrib-nwdiag
+sphinxcontrib-seqdiag
+sphinxcontrib-swaggerdoc
+sphinxcontrib-plantuml
+sphinx_bootstrap_theme
+lfdocs-conf
diff --git a/docs/tox.ini b/docs/tox.ini
new file mode 100644 (file)
index 0000000..edac8c3
--- /dev/null
@@ -0,0 +1,22 @@
+[tox]
+minversion = 1.6
+envlist = docs,
+skipsdist = true
+
+[testenv:docs]
+basepython = python3
+deps = -r{toxinidir}/requirements-docs.txt
+commands =
+    sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
+    echo "Generated docs available in {toxinidir}/_build/html"
+whitelist_externals =
+    echo
+    git
+    sh
+
+[testenv:docs-linkcheck]
+basepython = python3
+#deps = -r{toxinidir}/requirements-docs.txt
+commands = echo "Link Checking not enforced"
+#commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck
+whitelist_externals = echo
index 57b9106..d7a92f2 100644 (file)
@@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.5.1-SNAPSHOT"
-STAGING_VERSION="1.5.1-STAGING"
+VERSION="1.5.2-SNAPSHOT"
+STAGING_VERSION="1.5.2-STAGING"
 PROJECT="multicloud"
 IMAGE="framework"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
index d20e2d3..c9fbdee 100644 (file)
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework-broker</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.5.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework-broker</name>
     <description>multivim broker</description>
diff --git a/pom.xml b/pom.xml
index b83ca4c..1496d64 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.5.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework</name>
     <description>multicloud broker</description>
diff --git a/releases/container-1.5.1.yaml b/releases/container-1.5.1.yaml
new file mode 100644 (file)
index 0000000..74ca1b9
--- /dev/null
@@ -0,0 +1,10 @@
+distribution_type: 'container'
+container_release_tag: '1.5.1'
+project: 'multicloud-framework'
+log_dir: 'multicloud-framework-maven-docker-stage-master/259/'
+ref: e6a4b2a5809b359397730f2ae3517a3ffc5204a4
+containers:
+    - name: 'multicloud/framework'
+      version: '1.5.1'
+    - name: 'multicloud/framework-artifactbroker'
+      version: '1.5.1'
diff --git a/releases/maven-1.5.1.yaml b/releases/maven-1.5.1.yaml
new file mode 100644 (file)
index 0000000..9bcd4ce
--- /dev/null
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '1.5.1'
+project: 'multicloud-framework'
+log_dir: 'multicloud-framework-maven-stage-master/335/'
index f1ea5f1..0f4fbda 100644 (file)
@@ -19,7 +19,7 @@
 
 major=1
 minor=5
-patch=1
+patch=2
 
 base_version=${major}.${minor}.${patch}
 

© 2017 ONAP. Copyright © The Linux Foundation ®. All Rights Reserved.
The Linux Foundation has registered trademarks and uses trademarks.
For a list of trademarks of The Linux Foundation, please see our Trademark Usage page.
Linux is a registered trademark of Linus Torvalds.
Privacy Policy and Terms of Use