Repository: incubator-trafodion Updated Branches: refs/heads/master 1b87aa695 -> 7b25750c4
Bump release number to 2.1 on master branch The 2.0 release is now on side branch. Also fix a parallel-build bug when multiple commands were copying the same files to same destination. Fix is to make file pattern specific to each build task. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d6c14120 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d6c14120 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d6c14120 Branch: refs/heads/master Commit: d6c14120f564dc81c165e869ec3b0f61bac01979 Parents: 1edc994 Author: Steve Varnau <[email protected]> Authored: Thu Apr 21 23:11:38 2016 +0000 Committer: Steve Varnau <[email protected]> Committed: Thu Apr 21 23:15:37 2016 +0000 ---------------------------------------------------------------------- core/sqf/sqenvcom.sh | 2 +- core/sql/nskgmake/Makerules.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6c14120/core/sqf/sqenvcom.sh ---------------------------------------------------------------------- diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh index 7e864f7..406f1b6 100644 --- a/core/sqf/sqenvcom.sh +++ b/core/sqf/sqenvcom.sh @@ -33,7 +33,7 @@ export TRAFODION_VER_PROD="Apache Trafodion" # Trafodion version (also update file ../sql/common/copyright.h) export TRAFODION_VER_MAJOR=2 -export TRAFODION_VER_MINOR=0 +export TRAFODION_VER_MINOR=1 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/d6c14120/core/sql/nskgmake/Makerules.mk ---------------------------------------------------------------------- diff --git a/core/sql/nskgmake/Makerules.mk b/core/sql/nskgmake/Makerules.mk index d9eee93..a04527a 100755 --- a/core/sql/nskgmake/Makerules.mk +++ b/core/sql/nskgmake/Makerules.mk @@ -278,17 +278,17 @@ mavenbuild: $(MY_SQROOT)/export/include/SCMBuildJava.sh 1.0.1 >../src/main/resources/trafodion-sql.jar.mf # run maven set -o pipefail && cd ..; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - cp -pf ../target/trafodion-sql-*.jar $(MY_SQROOT)/export/lib + cp -pf ../target/trafodion-sql-[0-9]*.jar $(MY_SQROOT)/export/lib # Java files get built through Maven mavenbuild_apache: set -o pipefail && cd ..; $(MAVEN) -f pom.xml.apache package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - cp -pf ../target/*.jar $(MY_SQROOT)/export/lib + cp -pf ../target/trafodion-sql-apache*.jar $(MY_SQROOT)/export/lib # Java files get built through Maven mavenbuild_hdp: set -o pipefail && cd ..; $(MAVEN) -f pom.xml.hdp package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' - cp -pf ../target/*.jar $(MY_SQROOT)/export/lib + cp -pf ../target/trafodion-sql-hdp*.jar $(MY_SQROOT)/export/lib # This is where the top-level is declared to build everything. buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) mavenbuild mavenbuild_hdp mavenbuild_apache
