trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [1/2] incubator-trafodion git commit: Change release version from 1.3 to 2.0
Date Fri, 30 Oct 2015 15:46:19 GMT
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 <svarnau@apache.org>
Authored: Thu Oct 29 00:01:45 2015 +0000
Committer: Steve Varnau <svarnau@apache.org>
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 @@
   <groupId>org.trafodion</groupId>
   <artifactId>rest</artifactId>
   <packaging>jar</packaging>
-  <version>1.3.0</version>
+  <version>2.0.0</version>
   <name>rest</name>
   <url>http://wiki.trafodion.org</url>
   
@@ -401,7 +401,7 @@
   	<jython-standalone.version>2.5.3</jython-standalone.version>
   	<jettison.version>1.3.5</jettison.version>
   	<displaytag.version>1.1.1</displaytag.version>
-  	<jdbct4.version>1.3.0</jdbct4.version>
+  	<jdbct4.version>2.0.0</jdbct4.version>
    	
     <!-- Plugin Dependencies -->
     <maven.antrun.plugin.version>1.6</maven.antrun.plugin.version>
@@ -416,7 +416,7 @@
     <build.helper.maven.plugin.version>1.5</build.helper.maven.plugin.version>
 
     <!-- also must update this when we bump version -->
-    <package.version>1.3.0</package.version>
+    <package.version>2.0.0</package.version>
   	<final.name>${project.artifactId}-${project.version}</final.name>
   	
   	<!-- Test inclusion patterns used by failsafe configuration -->

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 @@
   <groupId>org.trafodion</groupId>
   <artifactId>dcs</artifactId>
   <packaging>jar</packaging>
-  <version>1.3.0</version>
+  <version>2.0.0</version>
   <name>dcs</name>
   <url>http://wiki.trafodion.org</url>
   
@@ -484,8 +484,8 @@
   	<jython-standalone.version>2.5.3</jython-standalone.version>
   	<jettison.version>1.3.5</jettison.version>
   	<displaytag.version>1.1.1</displaytag.version>
-    <jdbct4.version>1.3.0</jdbct4.version>
-    <jdbct2.version>1.3.0</jdbct2.version>
+    <jdbct4.version>2.0.0</jdbct4.version>
+    <jdbct2.version>2.0.0</jdbct2.version>
     
     <!-- Plugin Dependencies -->
     <maven.antrun.plugin.version>1.6</maven.antrun.plugin.version>
@@ -502,7 +502,7 @@
     <maven.assembly.plugin.version>2.5.3</maven.assembly.plugin.version>
 
     <!-- also must update this when we bump version -->
-    <package.version>1.3.0</package.version>
+    <package.version>2.0.0</package.version>
   	<final.name>${project.artifactId}-${project.version}</final.name>
   	
   	<!-- Test inclusion patterns used by failsafe configuration -->

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");
         }


Mime
View raw message