summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md6
-rw-r--r--checkstyle/pom.xml3
-rw-r--r--dependencies-clm/pom.xml4
-rw-r--r--dependencies/pom.xml4
-rw-r--r--license/pom.xml3
-rw-r--r--oparent-python/pom.xml18
-rw-r--r--oparent/pom.xml7
-rw-r--r--pom.xml4
-rw-r--r--version.properties4
9 files changed, 39 insertions, 14 deletions
diff --git a/README.md b/README.md
index a507773..848f933 100644
--- a/README.md
+++ b/README.md
@@ -12,3 +12,9 @@ ONAP O-Parent provides common default settings for all the projects participatin
All projects participating in simultaneous release will inherit defaults from O-Parent.
+
+elalto branch 2.X will continue to be used for Java 8/Java 9 dependencies
+master branch 3.X will be used for JAva 11 dependencies
+
+Projects should refer to either the 2.X release Java 8/9 or 3.X release as appropriate.
+
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index ff71c36..3e367da 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016-2017 Huawei Technologies Co., Ltd.
+ Modifications copyright (C) 2019 AT&T Intellectual Property
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>version</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>checkstyle</artifactId>
diff --git a/dependencies-clm/pom.xml b/dependencies-clm/pom.xml
index 5965479..c8ba954 100644
--- a/dependencies-clm/pom.xml
+++ b/dependencies-clm/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2018 AT&T Technologies and others.
+ Copyright (c) 2018-2019 AT&T Technologies and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../oparent</relativePath>
</parent>
<artifactId>dependencies-clm</artifactId>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index f82c5e1..0acfb6c 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2018 AT&T Technologies and others.
+ Copyright (c) 2018-2019 AT&T Technologies and others.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>version</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>dependencies</artifactId>
diff --git a/license/pom.xml b/license/pom.xml
index b01b991..108fc07 100644
--- a/license/pom.xml
+++ b/license/pom.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016-2017 Huawei Technologies Co., Ltd.
+ Modifications copyright (C) 2019 AT&T Intellectual Property
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>version</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>onap-license</artifactId>
diff --git a/oparent-python/pom.xml b/oparent-python/pom.xml
index 5b7b3b6..e44df8f 100644
--- a/oparent-python/pom.xml
+++ b/oparent-python/pom.xml
@@ -1,10 +1,26 @@
<?xml version="1.0"?>
+<!--
+ Copyright (c) 2016-2018 Huawei Technologies Co., Ltd.
+ Modifications copyright (C) 2017-2019 AT&T Intellectual Property
+
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../oparent</relativePath>
</parent>
<packaging>pom</packaging>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index ea5a479..ec1c865 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016-2017 Huawei Technologies Co., Ltd.
+ Modifications copyright (C) 2019 AT&T Intellectual Property
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>version</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>oparent</artifactId>
@@ -278,7 +279,7 @@
<dependency>
<groupId>org.onap.oparent</groupId>
<artifactId>dependencies</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -424,7 +425,7 @@
<dependency>
<groupId>org.onap.oparent</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
diff --git a/pom.xml b/pom.xml
index 894e4c0..5366244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016-2018 Huawei Technologies Co., Ltd.
- Modifications copyright (C) 2017 AT&T Intellectual Property
+ Modifications copyright (C) 2017-2019 AT&T Intellectual Property
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
<name>oparent</name>
<groupId>org.onap.oparent</groupId>
<artifactId>version</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<!-- oparent tools -->
diff --git a/version.properties b/version.properties
index cd49622..ddc6dd8 100644
--- a/version.properties
+++ b/version.properties
@@ -3,8 +3,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_version=2
-minor_version=2
+major_version=3
+minor_version=0
patch_version=0
base_version=${major_version}.${minor_version}.${patch_version}