You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2015/10/10 05:36:37 UTC
[1/2] incubator-trafodion git commit: Fixed minor issues with version
and make dependencies
Repository: incubator-trafodion
Updated Branches:
refs/heads/master ff6d16188 -> 39d9c2975
Fixed minor issues with version and make dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/25796bc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/25796bc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/25796bc6
Branch: refs/heads/master
Commit: 25796bc65ef552037b8df3b66ea148f34be382c1
Parents: e0b3c6b
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Oct 9 20:14:28 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Oct 9 20:14:28 2015 +0000
----------------------------------------------------------------------
Makefile | 4 ++--
core/Makefile | 4 ++--
core/rest/pom.xml | 2 +-
.../src/main/java/org/trafodion/rest/util/VersionInfo.java | 2 +-
core/sqf/sql/scripts/install_local_hadoop | 8 ++++----
dcs/pom.xml | 2 +-
dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/25796bc6/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index a2df63f..e02f71b 100644
--- a/Makefile
+++ b/Makefile
@@ -28,11 +28,11 @@ all:
@echo "Building all Trafodion components"
cd core && $(MAKE) all
-package: all
+package:
@echo "Packaging Trafodion components"
cd core && $(MAKE) package
-package-all: package
+package-all:
@echo "Packaging all Trafodion components"
cd core && $(MAKE) package-all
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/25796bc6/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 2981ec8..28df509 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -73,7 +73,7 @@ jdbc_jar: verhdr
-DgroupId=org.trafodion.jdbc.t4.T4Driver -DartifactId=t4driver -Dversion="$$TRAFODION_VER" \
-Dpackaging=jar -DgeneratePom=true | sed -e "s/$$/ ##(JDBCT4)/";exit $${PIPESTATUS[0]}
-dcs: verhdr jdbc_jar
+dcs: jdbc_jar jdbc_type2_jar
cd ../dcs && $(MAKE) 2>&1 | sed -e "s/$$/ ##(DCS)/" ; exit $${PIPESTATUS[0]}
ndcs: jdbc_jar foundation
@@ -84,7 +84,7 @@ ci: trafci
trafci: jdbc_jar
cd conn/trafci && $(ANT) dist 2>&1 | sed -e "s/$$/ ##(TRAFCI)/" ; exit $${PIPESTATUS[0]}
-jdbc_type2_jar: ndcs
+jdbc_type2_jar: verhdr foundation
cd conn/jdbc_type2 && $(ANT) 2>&1 | sed -e "s/$$/ ##(JDBC_TYPE2)/" ; exit $${PIPESTATUS[0]}
cd conn/jdbc_type2 && $(MAKE) 2>&1 | sed -e "s/$$/ ##(JDBC_TYPE2)/" ; exit $${PIPESTATUS[0]}
$(MAVEN) install:install-file -Dfile=conn/jdbc_type2/dist/jdbcT2.jar \
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/25796bc6/core/rest/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest/pom.xml b/core/rest/pom.xml
index 14b3243..8396584 100644
--- a/core/rest/pom.xml
+++ b/core/rest/pom.xml
@@ -202,7 +202,7 @@
</dependencies>
<configuration>
<additionalClasspathElements>
- <additionalClasspathElement>${basedir}/target/test-classes/hpt4jdbc-1.5.0.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-classes/jdbcT4.jar</additionalClasspathElement>
</additionalClasspathElements>
<includes>
<include>${integrationtest.include}</include>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/25796bc6/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
----------------------------------------------------------------------
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java b/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
index 24e7a58..f2ce7b1 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/VersionInfo.java
@@ -93,7 +93,7 @@ public class VersionInfo {
static String[] versionReport() {
return new String[] {
"Rest " + getVersion(),
- "Subversion " + getUrl() + " -r " + getRevision(),
+ "Revision " + getRevision(),
"Compiled by " + getUser() + " on " + getDate()
};
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/25796bc6/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop
index 490901f..23feb08 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -471,10 +471,10 @@ else
MY_DCS_MASTER_PORT=`expr $MY_START_PORT + 172`
MY_DCS_MASTER_INFO_PORT=`expr $MY_START_PORT + 181`
MY_DCS_SERVER_INFO_PORT=`expr $MY_START_PORT + 182`
- MY_REST_SERVER_PORT=`expr $MY_START_PORT + 183`
- MY_REST_SERVER_SECURE_PORT=`expr $MY_START_PORT + 184`
- MY_DB_MGR_PORT=`expr $MY_START_PORT + 185`
- MY_DB_MGR_SECURE_PORT=`expr $MY_START_PORT + 186`
+ MY_REST_SERVER_PORT=`expr $MY_START_PORT + 193`
+ MY_REST_SERVER_SECURE_PORT=`expr $MY_START_PORT + 194`
+ MY_DB_MGR_PORT=`expr $MY_START_PORT + 195`
+ MY_DB_MGR_SECURE_PORT=`expr $MY_START_PORT + 196`
fi
# handle ports in the range of 50000 to 50199
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/25796bc6/dcs/pom.xml
----------------------------------------------------------------------
diff --git a/dcs/pom.xml b/dcs/pom.xml
index 7b2f6b3..7baeb9e 100644
--- a/dcs/pom.xml
+++ b/dcs/pom.xml
@@ -332,7 +332,7 @@
</dependencies>
<configuration>
<additionalClasspathElements>
- <additionalClasspathElement>${basedir}/target/test-classes/hpt4jdbc-1.5.0.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-classes/jdbcT4.jar</additionalClasspathElement>
</additionalClasspathElements>
<includes>
<include>${integrationtest.include}</include>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/25796bc6/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java b/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
index 75958f6..69df3d8 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java
@@ -91,7 +91,7 @@ public class VersionInfo {
static String[] versionReport() {
return new String[] {
"Dcs " + getVersion(),
- "Subversion " + getUrl() + " -r " + getRevision(),
+ "Revision " + getRevision(),
"Compiled by " + getUser() + " on " + getDate()
};
}
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1517] PR-113
make dependencies for dcs was incorrect
Posted by ar...@apache.org.
Merge [TRAFODION-1517] PR-113 make dependencies for dcs was incorrect
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/39d9c297
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/39d9c297
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/39d9c297
Branch: refs/heads/master
Commit: 39d9c297527f918e02767e305e821bbe961fbea5
Parents: ff6d161 25796bc
Author: Arvind Narain <ar...@apache.org>
Authored: Sat Oct 10 03:34:33 2015 +0000
Committer: Arvind Narain <ar...@apache.org>
Committed: Sat Oct 10 03:34:33 2015 +0000
----------------------------------------------------------------------
Makefile | 4 ++--
core/Makefile | 4 ++--
core/rest/pom.xml | 2 +-
.../src/main/java/org/trafodion/rest/util/VersionInfo.java | 2 +-
core/sqf/sql/scripts/install_local_hadoop | 8 ++++----
dcs/pom.xml | 2 +-
dcs/src/main/java/org/trafodion/dcs/util/VersionInfo.java | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/39d9c297/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------