diff options
author | Pamela Dragosh <pdragosh@research.att.com> | 2018-05-01 17:24:28 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-05-01 17:24:28 +0000 |
commit | 78748f53a4cbb866decf21ce14bc7c382f161331 (patch) | |
tree | 02d928b9f75a6fb75ccca8eb4c4114641734374b | |
parent | 8f98d5ca27d3efb38c6bd35a6fe6e9275a0a3b49 (diff) | |
parent | 3235647eec85e20b856d9af3e4df2b3eb740b65c (diff) |
Merge "Update gui repo"
-rw-r--r-- | LICENSE.txt | 4 | ||||
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | pom.xml | 4 | ||||
-rw-r--r-- | version.properties | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index 0b6bee5..6ec4ee5 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright © 2017 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 AT&T Intellectual Property. 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. @@ -12,5 +12,3 @@ 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. - -ECOMP is a trademark and service mark of AT&T Intellectual Property. @@ -1,3 +1,7 @@ -This source repository contains the ONAP Policy GUI code. The settings file only needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment. +Copyright 2017-2018 AT&T Intellectual Property. All rights reserved. +This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE +Full license text at https://creativecommons.org/licenses/by/4.0/legalcode + +This source repository contains the ONAP Policy GUI code. To build it using Maven 3, run: mvn clean install @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - Drools PDP ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. 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. @@ -31,7 +31,7 @@ <groupId>org.onap.policy.gui</groupId> <artifactId>gui</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> diff --git a/version.properties b/version.properties index 7f86aa1..a3ac0d9 100644 --- a/version.properties +++ b/version.properties @@ -2,8 +2,8 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major=1 -minor=1 +major=2 +minor=0 patch=0 base_version=${major}.${minor}.${patch} |