You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2015/10/26 15:54:28 UTC
[3/4] incubator-trafodion git commit: Trafodion-1560 -- Improve
script that sets up tools needed for Trafodion build
Trafodion-1560 -- Improve script that sets up tools needed for Trafodion build
fixed review comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/42abc598
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/42abc598
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/42abc598
Branch: refs/heads/master
Commit: 42abc5983845b06cb6b8fadcea869801d467998e
Parents: 476b218
Author: Roberta Marton <ro...@esgyn.com>
Authored: Sat Oct 24 00:15:45 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Sat Oct 24 00:15:45 2015 +0000
----------------------------------------------------------------------
core/rest/pom.xml | 2 +-
core/sqf/sqenvcom.sh | 2 +-
dcs/pom.xml | 2 +-
install/traf_tools_setup.sh | 7 +++++--
pom.xml | 2 +-
5 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/42abc598/core/rest/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest/pom.xml b/core/rest/pom.xml
index d167b89..6e66499 100644
--- a/core/rest/pom.xml
+++ b/core/rest/pom.xml
@@ -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.2.0</package.version>
+ <package.version>1.3.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/42abc598/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 87b5e5a..ea9e28a 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -482,7 +482,7 @@ else
cd $MY_SQROOT/sql/scripts
install_local_hadoop [-p <port option>]
- source ./install_traf_components
+ install_traf_components
configure Trafodion and start the processes
HAVE FUN!
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/42abc598/dcs/pom.xml
----------------------------------------------------------------------
diff --git a/dcs/pom.xml b/dcs/pom.xml
index a15638a..257ea0b 100644
--- a/dcs/pom.xml
+++ b/dcs/pom.xml
@@ -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.2.0</package.version>
+ <package.version>1.3.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/42abc598/install/traf_tools_setup.sh
----------------------------------------------------------------------
diff --git a/install/traf_tools_setup.sh b/install/traf_tools_setup.sh
index ff2140f..ca0e092 100755
--- a/install/traf_tools_setup.sh
+++ b/install/traf_tools_setup.sh
@@ -66,6 +66,9 @@ function Usage {
# function: downloadSource - downloads and un-tars the requested file
# $1 - tar file to download
# $2 - directory where source is untarred
+#
+# Suggestion: instead use a single argument $1 and figure out the name of the
+# file to extract with basename $1
# -----------------------------------------------------------------------------
function downloadSource
{
@@ -395,7 +398,7 @@ echo " *********************************************************** " | tee -a $L
# -----------------------------------------------------------------------------
# install maven, if version 3 or greater not available already
#MAVEN_VERSION=`mvn --version 2>/dev/null | grep 'Apache Maven' | cut -f 3 -d ' '`
-#if [[ ! "$MAVEN_VERSION" =~ "3." ]]; then
+if [[ ! "$MAVEN_VERSION" =~ "3." ]]; then
cd $BASEDIR
echo
echo "INFO: Installing Maven on $(date)" | tee -a $LOGFILE
@@ -410,7 +413,7 @@ echo " *********************************************************** " | tee -a $L
fi
echo "INFO: Maven installation complete" | tee -a $LOGFILE
echo " *********************************************************** " | tee -a $LOGFILE
-#fi
+fi
echo
echo "INFO: Completed tools build on $(date)" | tee -a $LOGFILE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/42abc598/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc3eef2..eaf9a63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<groupId>org.apache.trafodion</groupId>
<artifactId>trafodion</artifactId>
- <version>1.1.0</version>
+ <version>1.3.0</version>
<packaging>pom</packaging>
<name>Apache Trafodion</name>
<description>Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or operational workloads on Hadoop.</description>