summaryrefslogtreecommitdiffstats
path: root/common-app-api/pom.xml
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2020-08-04 14:16:00 +0200
committersebdet <sebastien.determe@intl.att.com>2020-09-08 13:45:31 +0200
commit30670accb070b20c1c770d1ebbd6d72e24fee2db (patch)
tree8ddb5d70500aa1b3baa4e262de411e8394e22e6a /common-app-api/pom.xml
parenta8a96339680fa1c4df5577285442e902b5637631 (diff)
Upgrade to java 11
MOve SDC to Java 11, this is one of the PR to move to Jdk 11, jenkins will have to be changed as well Issue-ID: SDC-2725 Change-Id: I85f13f14ba8004f6e9656093a837465a2e4af3e1 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Signed-off-by: xuegao <xg353y@intl.att.com> Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'common-app-api/pom.xml')
-rw-r--r--common-app-api/pom.xml25
1 files changed, 25 insertions, 0 deletions
diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 39be0353af..ee5f412249 100644
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -268,6 +268,31 @@
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <excludes>
+ <exclude>**/*.zip</exclude>
+ </excludes>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources/zip</directory>
+ <includes>
+ <include>**.zip</include>
+ </includes>
+ <filtering>false</filtering>
+ <targetPath>zip</targetPath>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources/zip-slip</directory>
+ <includes>
+ <include>**.zip</include>
+ </includes>
+ <filtering>false</filtering>
+ <targetPath>zip-slip</targetPath>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>com.github.sylvainlaurent.maven</groupId>
highlight .py { color: #f8f8f2 } /* Name.Property */ .highlight .nt { color: #f92672 } /* Name.Tag */ .highlight .nv { color: #f8f8f2 } /* Name.Variable */ .highlight .ow { color: #f92672 } /* Operator.Word */ .highlight .w { color: #f8f8f2 } /* Text.Whitespace */ .highlight .mb { color: #ae81ff } /* Literal.Number.Bin */ .highlight .mf { color: #ae81ff } /* Literal.Number.Float */ .highlight .mh { color: #ae81ff } /* Literal.Number.Hex */ .highlight .mi { color: #ae81ff } /* Literal.Number.Integer */ .highlight .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 */ }
{
    "vf-module": [{
        "vf-module-id": ${vf.vf-module-id},
        "vf-module-data": {
            "sdnc-request-header": {
                "svc-request-id": ${vf.vf-module-data.sdnc-request-header.svc-request-id},
                "svc-action": ${vf.vf-module-data.sdnc-request-header.svc-action},
                "svc-notification-url": ${vf.vf-module-data.sdnc-request-header.svc-notification-url}
            },
            "request-information": {
                "request-id": ${vf.vf-module-data.request-information.request-id},
                "request-action": ${vf.vf-module-data.request-information.request-action},
                "source": ${vf.vf-module-data.request-information.source},
                "notification-url": ${vf.vf-module-data.request-information.notification-url},
                "order-number": ${vf.vf-module-data.request-information.order-number},
                "order-version": ${vf.vf-module-data.request-information.order-version}
            },
            "service-information": {
                "service-id": ${vf.vf-module-data.service-information.service-id},
                "subscription-service-type": ${vf.vf-module-data.service-information.subscription-service-type},
                "onap-model-information": {
                    "model-invariant-uuid": ${vf.vf-module-data.service-information.onap-model-information.model-invariant-uuid},
                    "model-customization-uuid": ${vf.vf-module-data.service-information.onap-model-information.model-customization-uuid},
                    "model-uuid": ${vf.vf-module-data.service-information.onap-model-information.model-uuid},
                    "model-version": ${vf.vf-module-data.service-information.onap-model-information.model-version},
                    "model-name": ${vf.vf-module-data.service-information.onap-model-information.model-name}
                },
                "service-instance-id": ${vf.vf-module-data.service-information.service-instance-id},
                "global-customer-id": ${vf.vf-module-data.service-information.global-customer-id},
                "subscriber-name": ${vf.vf-module-data.service-information.subscriber-name}
            },
            "vnf-information": {
                "vnf-id": ${vf.vf-module-data.vnf-information.vnf-id},
                "vnf-type": ${vf.vf-module-data.vnf-information.vnf-type},
                "vnf-name": ${vf.vf-module-data.vnf-information.vnf-name},
                "onap-model-information": {
                    "model-invariant-uuid": ${vf.vf-module-data.vnf-information.onap-model-information.model-invariant-uuid},
                    "model-customization-uuid": ${vf.vf-module-data.vnf-information.onap-model-information.model-customization-uuid},
                    "model-uuid": ${vf.vf-module-data.vnf-information.onap-model-information.model-uuid},
                    "model-version": ${vf.vf-module-data.vnf-information.onap-model-information.model-version},
                    "model-name": ${vf.vf-module-data.vnf-information.onap-model-information.model-name}
                }
            },
            "vf-module-information": {
                "vf-module-id": ${vf.vf-module-data.vf-module-information.vf-module-id},
                "vf-module-type": ${vf.vf-module-data.vf-module-information.vf-module-type},
                "onap-model-information": {
                    "model-invariant-uuid": ${vf.vf-module-data.vf-module-information.onap-model-information.model-invariant-uuid},
                    "model-customization-uuid": ${vf.vf-module-data.vf-module-information.onap-model-information.model-customization-uuid},
                    "model-uuid": ${vf.vf-module-data.vf-module-information.onap-model-information.model-uuid},
                    "model-version": ${vf.vf-module-data.vf-module-information.onap-model-information.model-version},
                    "model-name": ${vf.vf-module-data.vf-module-information.onap-model-information.model-name}
                }
            },
            "vf-module-request-input": {
                "request-version": ${vf.vf-module-data.vf-module-request-input.request-version},
                "vf-module-name": ${vf.vf-module-data.vf-module-request-input.vf-module-name},
                "tenant": ${vf.vf-module-data.vf-module-request-input.tenant},
                "aic-cloud-region": ${vf.vf-module-data.vf-module-request-input.aic-cloud-region},
                "aic-clli": ${vf.vf-module-data.vf-module-request-input.aic-clli},
                "vf-module-input-parameters": {
                    "param": [
        ${repeat:vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length:
                        {
                            "name": ${vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[${1}].name},
                            "value": ${vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[${1}].value}
                        },
        }
                    ]
                }
            },
            "vf-module-topology": {
                "vf-module-topology-identifier": {
                    "vf-module-id": ${vf.vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id},
                    "vf-module-name": ${vf.vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-name},
                    "vf-module-type": ${vf.vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-type}
                },
                "onap-model-information": {
                    "model-invariant-uuid": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-invariant-uuid},
                    "model-customization-uuid": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-customization-uuid},
                    "model-uuid": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-uuid},
                    "model-version": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-version},
                    "model-name": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-name}
                },
                "vf-module-parameters": {
                    "param": [
        ${repeat:vf.vf-module-data.vf-module-topology.vf-module-parameters.param_length:
                        {
                            "name": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].name},
                            "value": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].value},
                            "resource-resolution-data": {
                                "resource-key": [
                ${repeat:vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.resource-key_length:
                                    {
                                        "name": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.resource-key[${2}].name},
                                        "value": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.resource-key[${2}].value}
                                    },
                }
                                ],
                                "status": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.status},
                                "capability-name": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.capability-name}
                            },
                        },
        }
                    ]
                },
                "tenant": ${vf.vf-module-data.vf-module-topology.tenant},
                "aic-cloud-region": ${vf.vf-module-data.vf-module-topology.aic-cloud-region},
                "aic-clli": ${vf.vf-module-data.vf-module-topology.aic-clli},
                "sdnc-generated-cloud-resources": ${vf.vf-module-data.vf-module-topology.sdnc-generated-cloud-resources}
            },
            "vf-module-level-oper-status": {
                "order-status": ${vf.vf-module-data.vf-module-level-oper-status.order-status},
                "last-rpc-action": ${vf.vf-module-data.vf-module-level-oper-status.last-rpc-action},
                "last-action": ${vf.vf-module-data.vf-module-level-oper-status.last-action},
                "last-svc-request-id": ${vf.vf-module-data.vf-module-level-oper-status.last-svc-request-id},
                "last-order-status": ${vf.vf-module-data.vf-module-level-oper-status.last-order-status},
                "create-timestamp": ${vf.vf-module-data.vf-module-level-oper-status.create-timestamp},
                "modify-timestamp": ${vf.vf-module-data.vf-module-level-oper-status.modify-timestamp}
            }
        }
    }]
}