summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-05-01 17:24:47 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-01 17:24:47 +0000
commit89902149346f0ac1a616600f2564ae06b4888a9e (patch)
tree9dfd08fd7db3c832753ad4460406aa83044d7b85
parenta023d45c13d8cef09d3b8143eb86a42ed43aa721 (diff)
parent09945478595e8fc316e8b44367d458bfc4205b0d (diff)
Merge "Update pap repo"
-rw-r--r--LICENSE.txt4
-rw-r--r--README.md6
-rw-r--r--pom.xml4
-rw-r--r--version.properties4
4 files changed, 10 insertions, 8 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index 0b6bee52..6ec4ee51 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.
diff --git a/README.md b/README.md
index bb4ac0bd..3beab011 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
-This source repository contains the ONAP Policy Administration Backend 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 Administration Point Backend code.
To build it using Maven 3, run: mvn clean install
diff --git a/pom.xml b/pom.xml
index 162f14ce..e3a914d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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.pap</groupId>
<artifactId>pap</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 7f86aa15..a3ac0d9c 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}