Skip to content
This repository was archived by the owner on Jun 7, 2021. It is now read-only.

[TRAFODION-3090]Isolated folder for trafodion-sql #1577

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

[TRAFODION-3090]Isolated folder for trafodion-sql #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
26c5c73
Isolated folder for trafodion-sql
May 23, 2018
fbb1cdb
Put the jars into one
May 29, 2018
a1e406e
refactor trx and tm project
May 30, 2018
0695f13
Rename sqlmid to trafodion_sql and add one more folder for java_src
May 30, 2018
a828c37
Move trafodion-sql after trx build
May 30, 2018
93d4e5e
deal with site error with jdk8
May 31, 2018
5d94beb
put doclint into profile for supoorting jdk7 and jdk8
May 31, 2018
3f862fa
fix rest doclint issue
Jun 1, 2018
30d2dcc
Isolated folder for trafodion-sql
May 23, 2018
107c779
Put the jars into one
May 29, 2018
3b548ee
refactor trx and tm project
May 30, 2018
e1fc544
Rename sqlmid to trafodion_sql and add one more folder for java_src
May 30, 2018
432e03b
Move trafodion-sql after trx build
May 30, 2018
71cbc90
deal with site error with jdk8
May 31, 2018
097bf00
put doclint into profile for supoorting jdk7 and jdk8
May 31, 2018
259187a
fix rest doclint issue
Jun 1, 2018
22d6c23
Merge branch 'isoTrafsql' of https://github.com/kevinxu021/incubator-…
Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ rpmbuild: rpmpackage
mv $(RPMROOT)/RPMS/$(ARCH)/$(PKG_PROD)*.rpm ../distribution/${OS_TYPE}${OS_MAJOR}/


eclipse: rest/.project dcs/.project sql/.project sqf/src/seatrans/hbase-trx/.project .project
eclipse: rest/.project dcs/.project sql/java_src/trafodion_sql/.project sqf/src/seatrans/hbase-trx/.project .project
@echo
@echo
@echo " Now you can import 5 projects in Eclipse:"
Expand All @@ -238,8 +238,8 @@ rest/.project:
dcs/.project:
cd ../dcs && $(MAVEN) eclipse:eclipse

sql/.project:
cd sql && $(MAVEN) eclipse:eclipse
sql/java_src/trafodion_sql/.project:
cd sql/java_src/trafodion_sql && $(MAVEN) eclipse:eclipse

sqf/src/seatrans/hbase-trx/.project:
cd sqf/src/seatrans/hbase-trx && $(MAVEN) eclipse:eclipse
Expand All @@ -251,12 +251,12 @@ sqf/src/seatrans/hbase-trx/.project:
eclipseclean:
$(RM) rest/.classpath rest/.project
$(RM) ../dcs/.classpath ../dcs/.project
$(RM) sql/.classpath sql/.project
$(RM) sql/java_src/trafodion_sql/.classpath sql/java_src/trafodion_sql/.project
$(RM) sqf/src/seatrans/hbase-trx/.classpath sqf/src/seatrans/hbase-trx/.project
$(RM) .cproject .project

trafinstall:
cd $(TRAF_HOME)/sql/scripts && install_traf_components

lib_mgmt: foundation
cd sql/lib_mgmt && $(MAKE) all
cd sql/lib_mgmt && $(MAKE) all | sed -e "s/$$/ ##(lib_mgmt)/";exit $${PIPESTATUS[0]}
13 changes: 13 additions & 0 deletions core/conn/jdbcT4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,15 @@
</plugins>
</build>
<profiles>
<profile>
<id>disable-javadoc-doclint</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<properties>
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
<profile>
<id>apache-release</id>
<activation>
Expand Down Expand Up @@ -260,6 +269,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
<docfilessubdirs>true</docfilessubdirs>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down
12 changes: 11 additions & 1 deletion core/rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,15 @@
</dependencies>

<profiles>
<profile>
<id>disable-javadoc-doclint</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<properties>
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
<!-- JDBC drivers needed for compile, but not site docs
This allows turning off dependency on command line (-P '!jdbc') -->
<profile>
Expand Down Expand Up @@ -639,7 +648,8 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.plugin.version}</version>
<configuration>
<docfilessubdirs>true</docfilessubdirs>
<docfilessubdirs>true</docfilessubdirs>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<reportSets>
<reportSet>
Expand Down
56 changes: 28 additions & 28 deletions core/sqf/src/seatrans/hbase-trx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,63 +43,63 @@ all: build_all
jdk_1_7_cdh54: build_chk_cdh54
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) CDH5.4
echo "$(MAVEN) package -DskipTests"
echo "$(MAVEN) install -DskipTests"
echo "### For full Maven output, see file build_trx.log"
set -o pipefail && $(MAVEN) -f pom.xml.cdh54 package install -DskipTests | tee -a build_trx.log
set -o pipefail && $(MAVEN) -f pom.xml -Pcdh5_4 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
mkdir -p $(TRAF_HOME)/export/lib
cp -pf target/$(BLD_HBASE_CDH54_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)

jdk_1_7_cdh55: build_chk_cdh55
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) CDH5.5
set -o pipefail && $(MAVEN) -f pom.xml.cdh55 package install -DskipTests | tee -a build_trx.log
set -o pipefail && $(MAVEN) -f pom.xml -Pcdh5_5 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
mkdir -p $(TRAF_HOME)/export/lib
cp -pf target/$(BLD_HBASE_CDH55_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)

jdk_1_7_cdh57: build_chk_cdh57
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) CDH5.7
set -o pipefail && $(MAVEN) -f pom.xml.cdh57 package install -DskipTests | tee -a build_trx.log
set -o pipefail && $(MAVEN) -f pom.xml -Pcdh5_7 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
mkdir -p $(TRAF_HOME)/export/lib
cp -pf target/$(BLD_HBASE_CDH57_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)

jdk_1_7_mapr: build_chk_mapr
set -o pipefail && $(MAVEN) -f pom.xml.mapr package -DskipTests | tee -a build_trx.log
set -o pipefail && $(MAVEN) -f pom.xml -Pmapr install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
mkdir -p $(TRAF_HOME)/export/lib
cp -pf target/$(BLD_HBASE_MAPR_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)

jdk_1_7_hdp: build_chk_hdp
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) HDP2.3
set -o pipefail && $(MAVEN) -f pom.xml.hdp package -DskipTests | tee -a build_trx.log
set -o pipefail && $(MAVEN) -f pom.xml -Phdp2_3 install -DskipTests | tee -a build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
mkdir -p $(TRAF_HOME)/export/lib
cp -pf target/$(BLD_HBASE_HDP_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)

jdk_1_7_apache10: build_chk_apache10
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) APACHE1.0
set -o pipefail && $(MAVEN) -f pom.xml.apache10 package -DskipTests | tee build_trx.log
set -o pipefail && $(MAVEN) -f pom.xml -Papache1_0 install -DskipTests | tee build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
mkdir -p $(TRAF_HOME)/export/lib
cp -pf target/$(BLD_HBASE_APACHE10_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)

jdk_1_7_apache11: build_chk_apache11
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) APACHE1.1
set -o pipefail && $(MAVEN) -f pom.xml.apache11 package -DskipTests | tee build_trx.log
set -o pipefail && $(MAVEN) -f pom.xml -Papache1_1 install -DskipTests | tee build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
mkdir -p $(TRAF_HOME)/export/lib
cp -pf target/$(BLD_HBASE_APACHE11_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)

jdk_1_7_apache12: build_chk_apache12
$(REINSTATE_ORIG)
$(UNCOMMENT_STRING) APACHE1.2
set -o pipefail && $(MAVEN) -f pom.xml.apache12 package -DskipTests | tee build_trx.log
set -o pipefail && $(MAVEN) -f pom.xml -Papache1_2 install -DskipTests | tee build_trx.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
mkdir -p $(TRAF_HOME)/export/lib
cp -pf target/$(BLD_HBASE_APACHE12_TRX_JARNAME) $(TRAF_HOME)/export/lib
$(RM) $(VFILE)
Expand Down Expand Up @@ -147,22 +147,22 @@ build_chk_hdp:
@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi

clean:
$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME)
$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME)
$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE12_TRX_JARNAME)
$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME)
$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME)
$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH57_TRX_JARNAME)
$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME)
$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME)
$(REINSTATE_ORIG)
-$(MAVEN) -f pom.xml.apache10 clean | grep ERROR
-$(MAVEN) -f pom.xml.apache11 clean | grep ERROR
-$(MAVEN) -f pom.xml.apache12 clean | grep ERROR
-$(MAVEN) -f pom.xml.cdh54 clean | grep ERROR
-$(MAVEN) -f pom.xml.cdh55 clean | grep ERROR
-$(MAVEN) -f pom.xml.cdh57 clean | grep ERROR
-$(MAVEN) -f pom.xml.mapr clean | grep ERROR
-$(MAVEN) -f pom.xml.hdp clean | grep ERROR
$(RM) build_trx.log
$(RM) $(VFILE)
-$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME)
-$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME)
-$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE12_TRX_JARNAME)
-$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME)
-$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME)
-$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH57_TRX_JARNAME)
-$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME)
-$(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME)
-$(REINSTATE_ORIG)
-$(MAVEN) -f pom.xml -Papache1_0 clean | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
-$(MAVEN) -f pom.xml -Papache1_1 clean | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
-$(MAVEN) -f pom.xml -Papache1_2 clean | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
-$(MAVEN) -f pom.xml -Pcdh5_4 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
-$(MAVEN) -f pom.xml -Pcdh5_5 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
-$(MAVEN) -f pom.xml -Pcdh5_7 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
#-$(MAVEN) -f pom.xml -Pmapr clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
-$(MAVEN) -f pom.xml -Phdp2_3 clean |grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'; exit $${PIPESTATUS[0]}
-$(RM) build_trx.log
-$(RM) $(VFILE)
Loading