Return-Path: X-Original-To: apmail-trafodion-commits-archive@www.apache.org Delivered-To: apmail-trafodion-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 67E28186B5 for ; Fri, 30 Oct 2015 15:46:37 +0000 (UTC) Received: (qmail 16955 invoked by uid 500); 30 Oct 2015 15:46:37 -0000 Delivered-To: apmail-trafodion-commits-archive@trafodion.apache.org Received: (qmail 16928 invoked by uid 500); 30 Oct 2015 15:46:37 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 16919 invoked by uid 99); 30 Oct 2015 15:46:37 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Oct 2015 15:46:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id DABD1C8465 for ; Fri, 30 Oct 2015 15:46:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.199 X-Spam-Level: X-Spam-Status: No, score=-0.199 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RP_MATCHES_RCVD=-1, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id NkPFfEUb5lbp for ; Fri, 30 Oct 2015 15:46:21 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 84FE8215F9 for ; Fri, 30 Oct 2015 15:46:20 +0000 (UTC) Received: (qmail 15055 invoked by uid 99); 30 Oct 2015 15:46:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Oct 2015 15:46:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 950C2DFBAA; Fri, 30 Oct 2015 15:46:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbirdsall@apache.org To: commits@trafodion.incubator.apache.org Date: Fri, 30 Oct 2015 15:46:19 -0000 Message-Id: <568501c032b84b39a6efe69417b12cfe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-trafodion git commit: Change release version from 1.3 to 2.0 Repository: incubator-trafodion Updated Branches: refs/heads/master 0abb3b6ca -> 955a0c018 Change release version from 1.3 to 2.0 The release1.3 branch is created. This will now distinguish the master branch as preparing for 2.0 release. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fedfa7ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fedfa7ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fedfa7ad Branch: refs/heads/master Commit: fedfa7ad53f12a50bc3cf5e604bc2c2e346fdc3c Parents: af7809d Author: Steve Varnau Authored: Thu Oct 29 00:01:45 2015 +0000 Committer: Steve Varnau Committed: Thu Oct 29 00:01:45 2015 +0000 ---------------------------------------------------------------------- core/rest/pom.xml | 6 +++--- core/sqf/sqenvcom.sh | 4 ++-- dcs/pom.xml | 8 ++++---- .../src/test/java/org/trafodion/jdbc_test/TestCat.java | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fedfa7ad/core/rest/pom.xml ---------------------------------------------------------------------- diff --git a/core/rest/pom.xml b/core/rest/pom.xml index 6e66499..201c8e9 100644 --- a/core/rest/pom.xml +++ b/core/rest/pom.xml @@ -33,7 +33,7 @@ org.trafodion rest jar - 1.3.0 + 2.0.0 rest http://wiki.trafodion.org @@ -401,7 +401,7 @@ 2.5.3 1.3.5 1.1.1 - 1.3.0 + 2.0.0 1.6 @@ -416,7 +416,7 @@ 1.5 - 1.3.0 + 2.0.0 ${project.artifactId}-${project.version} http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fedfa7ad/core/sqf/sqenvcom.sh ---------------------------------------------------------------------- diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh index ea9e28a..80a9980 100644 --- a/core/sqf/sqenvcom.sh +++ b/core/sqf/sqenvcom.sh @@ -32,8 +32,8 @@ #Product version (Trafodion or derivative product) export TRAFODION_VER_PROD="Apache Trafodion" # Trafodion version (also update file ../sql/common/copyright.h) -export TRAFODION_VER_MAJOR=1 -export TRAFODION_VER_MINOR=3 +export TRAFODION_VER_MAJOR=2 +export TRAFODION_VER_MINOR=0 export TRAFODION_VER_UPDATE=0 export TRAFODION_VER="${TRAFODION_VER_MAJOR}.${TRAFODION_VER_MINOR}.${TRAFODION_VER_UPDATE}" http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fedfa7ad/dcs/pom.xml ---------------------------------------------------------------------- diff --git a/dcs/pom.xml b/dcs/pom.xml index 257ea0b..4f8e3e4 100644 --- a/dcs/pom.xml +++ b/dcs/pom.xml @@ -34,7 +34,7 @@ org.trafodion dcs jar - 1.3.0 + 2.0.0 dcs http://wiki.trafodion.org @@ -484,8 +484,8 @@ 2.5.3 1.3.5 1.1.1 - 1.3.0 - 1.3.0 + 2.0.0 + 2.0.0 1.6 @@ -502,7 +502,7 @@ 2.5.3 - 1.3.0 + 2.0.0 ${project.artifactId}-${project.version} http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fedfa7ad/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java ---------------------------------------------------------------------- diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java index 4e4fed5..795f6cf 100644 --- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java +++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestCat.java @@ -606,7 +606,7 @@ public class TestCat Connection connection = Utils.getUserConnection(); String s = connection.getMetaData().getDatabaseProductVersion(); System.out.println((new StringBuilder()).append("DB product version : ").append(s).toString()); - assertEquals("DB Product Version", "1.3", s); + assertEquals("DB Product Version", "2.0", s); connection.close(); System.out.println("JDBC Get DB product version : Passed"); } @@ -627,7 +627,7 @@ public class TestCat { Connection connection = Utils.getUserConnection(); int i = connection.getMetaData().getDatabaseMajorVersion(); - assertEquals("DB major Version", 1L, i); + assertEquals("DB major Version", 2L, i); connection.close(); System.out.println("JDBC Get DB major version : Passed"); } @@ -648,7 +648,7 @@ public class TestCat { Connection connection = Utils.getUserConnection(); int i = connection.getMetaData().getDatabaseMinorVersion(); - assertEquals("DB Minor Version", 3L, i); + assertEquals("DB Minor Version", 0L, i); connection.close(); System.out.println("JDBC Get DB minor version : Passed"); }