From 5353218aca650bd2a52946c1f112733afa6f5b55 Mon Sep 17 00:00:00 2001 From: highstreetherbert Date: Wed, 12 May 2021 18:58:18 +0200 Subject: Place version properties in root pom ccsdk related versions Issue-ID: SDNC-1522 Signed-off-by: highstreetherbert Change-Id: Iff7d56586997e85b19879e426785cf5387b654f4 Signed-off-by: highstreetherbert Former-commit-id: 5bccac3337bb3ca27b3777c8e3f3dc3ec706eaee --- installation/admportal/pom.xml | 2 +- installation/ansible-server/pom.xml | 2 +- installation/dmaap-listener/pom.xml | 2 +- installation/pom.xml | 2 -- installation/sdnc-web/pom.xml | 1 - installation/sdnc/pom.xml | 3 +-- installation/ueb-listener/pom.xml | 2 +- platform-logic/setup/pom.xml | 4 ---- pom.xml | 13 +++++++++++++ 9 files changed, 18 insertions(+), 13 deletions(-) diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index b8256a6e..f70ebb05 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -23,7 +23,7 @@ onap/admportal-sdnc-image ${project.version} ${maven.build.timestamp} - 0.7-STAGING-latest + ${ccsdk.docker.ubuntu.version} yyyyMMdd'T'HHmmss'Z' diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 9d2fec21..b4f9d0dc 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -23,7 +23,7 @@ onap/sdnc-ansible-server-image ${project.version} ${maven.build.timestamp} - 1.0-STAGING-latest + ${ccsdk.docker.ansible.server.version} ${https_proxy} yyyyMMdd'T'HHmmss'Z' diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index fc3f4923..75490cdd 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -23,7 +23,7 @@ onap/sdnc-dmaap-listener-image ${project.version} ${maven.build.timestamp} - 1.1.1 + ${ccsdk.docker.alpine.j11.version} ${https_proxy} yyyyMMdd'T'HHmmss'Z' diff --git a/installation/pom.xml b/installation/pom.xml index d5fcd4d2..2d9e254c 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -26,10 +26,8 @@ installation - yyyyMMdd'T'HHmmss'Z' ${maven.build.timestamp} - 1.0.1 UTF-8 UTF-8 diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 6c063a50..5da89768 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -20,7 +20,6 @@ docker.io/bitnami/nginx:1.16-debian-9 onap/sdnc-web-image ${project.version} - 1.2.0-SNAPSHOT ${maven.build.timestamp} ${https_proxy} yyyyMMdd'T'HHmmss'Z' diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index ac943ddb..74231066 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -24,8 +24,7 @@ onap/sdnc-image ${project.version} ${maven.build.timestamp} - 2.2.0-SNAPSHOT - 1.2-SNAPSHOT-latest + ${ccsdk.docker.odlsli.alpine.version} org.onap.sdnc.p12 8443 diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 1119d3f7..b488302d 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -23,7 +23,7 @@ onap/sdnc-ueb-listener-image ${project.version} ${maven.build.timestamp} - 1.1.1 + ${ccsdk.docker.alpine.j11.version} ${https_proxy} deploy yyyyMMdd'T'HHmmss'Z' diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index 80862fc5..58416b7c 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -16,10 +16,6 @@ sdnc-oam :: platform-logic :: ${project.artifactId} Copies base ONAP platform-logic - - 1.2.0-SNAPSHOT - - diff --git a/pom.xml b/pom.xml index 0a937f79..ed4b3b84 100755 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,19 @@ AT&T + + + 1.2.0-SNAPSHOT + ${ccsdk.distribution.version} + ${project.version} + + + 1.1.1 + 1.2-SNAPSHOT-latest + 1.0-STAGING-latest + 0.7-STAGING-latest + + platform-logic data-migrator -- cgit 1.2.3-korg ghlight .mo { color: #ae81ff } /* Literal.Number.Oct */ .highlight .sa { color: #e6db74 } /* Literal.String.Affix */ .highlight .sb { color: #e6db74 } /* Literal.String.Backtick */ .highlight .sc { color: #e6db74 } /* Literal.String.Char */ .highlight .dl { color: #e6db74 } /* Literal.String.Delimiter */ .highlight .sd { color: #e6db74 } /* Literal.String.Doc */ .highlight .s2 { color: #e6db74 } /* Literal.String.Double */ .highlight .se { color: #ae81ff } /* Literal.String.Escape */ .highlight .sh { color: #e6db74 } /* Literal.String.Heredoc */ .highlight .si { color: #e6db74 } /* Literal.String.Interpol */ .highlight .sx { color: #e6db74 } /* Literal.String.Other */ .highlight .sr { color: #e6db74 } /* Literal.String.Regex */ .highlight .s1 { color: #e6db74 } /* Literal.String.Single */ .highlight .ss { color: #e6db74 } /* Literal.String.Symbol */ .highlight .bp { color: #f8f8f2 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #a6e22e } /* Name.Function.Magic */ .highlight .vc { color: #f8f8f2 } /* Name.Variable.Class */ .highlight .vg { color: #f8f8f2 } /* Name.Variable.Global */ .highlight .vi { color: #f8f8f2 } /* Name.Variable.Instance */ .highlight .vm { color: #f8f8f2 } /* Name.Variable.Magic */ .highlight .il { color: #ae81ff } /* Literal.Number.Integer.Long */ } @media (prefers-color-scheme: light) { .highlight .hll { background-color: #ffffcc } .highlight .c { color: #888888 } /* Comment */ .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ }
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj