From c1e0c9a7dcce8ce810d81ab377abddcc3334d781 Mon Sep 17 00:00:00 2001
From: kevinxu021 <kaihua.xu@esgyn.cn>
Date: Wed, 23 Jan 2019 19:40:45 +0800
Subject: [PATCH 1/3] optimize DCS Makefile

---
 dcs/Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dcs/Makefile b/dcs/Makefile
index 76c64b92d2..eaefeffa4b 100644
--- a/dcs/Makefile
+++ b/dcs/Makefile
@@ -26,24 +26,25 @@ BLD_TRAFODION_DCS_TARNAME           =dcs-$(TRAFODION_VER).tar.gz
 
 VFILE			    =trafodion-dcs.jar.versions
 GENVERS			    =./genvers
+java_files:=$(shell find src/main/java -name *.java*|grep -v Vproc.java)
 
 .NOTPARALLEL: all
 
-all: build_all
+all: target/dcs-$(TRAFODION_VER).jar
 
-build_all: build_chk
+target/dcs-$(TRAFODION_VER).jar: $(java_files)
+	$(GENVERS) > $(VFILE)
+	@if [ $(GENVERS) -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
+	@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
 	echo "$(MAVEN) site package -DskipTests"
 	echo "### For full Maven output, see file build_dcs.log"
 	set -o pipefail && $(MAVEN) site package -DskipTests | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
 	$(RM) $(VFILE)
 
-build_chk:
-	$(GENVERS) > $(VFILE)
-	@if [ $(GENVERS) -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
-	@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
-
-clean:
+mvn_clean:
 	-$(MAVEN) clean | grep ERROR
+
+clean: $(shell if [ -d target ]; then echo "mvn_clean"; fi)
 	$(RM) build_dcs.log
 	$(RM) $(VFILE)
 	$(RM) ../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_DCS_TARNAME)

From ffbb211bd4498e3c0020f6f30aa34801680ba4d4 Mon Sep 17 00:00:00 2001
From: kevinxu021 <kaihua.xu@esgyn.cn>
Date: Wed, 23 Jan 2019 19:54:52 +0800
Subject: [PATCH 2/3] support mvn compilation with jdk1.8

---
 core/conn/jdbcT4/Makefile |  2 +-
 core/conn/jdbcT4/pom.xml  | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/conn/jdbcT4/Makefile b/core/conn/jdbcT4/Makefile
index 5ded2ea1c6..ade92692b8 100644
--- a/core/conn/jdbcT4/Makefile
+++ b/core/conn/jdbcT4/Makefile
@@ -29,7 +29,7 @@ all: build_all
 build_all: target/jdbcT4-${TRAFODION_VER}.jar 
 
 target/jdbcT4-${TRAFODION_VER}.jar: $(java_files) LICENSE NOTICE
-	echo "$(MAVEN) package -DskipTests"
+	@echo "$(MAVEN) package -DskipTests"
 	set -o pipefail && $(MAVEN) install -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 -DskipTests | tee build_jdbct4.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
 	cp target/jdbcT4-${TRAFODION_VER}.jar ${TRAF_HOME}/export/lib
 	mkdir -p ../clients
diff --git a/core/conn/jdbcT4/pom.xml b/core/conn/jdbcT4/pom.xml
index 3af7fa6f48..fed1739a60 100644
--- a/core/conn/jdbcT4/pom.xml
+++ b/core/conn/jdbcT4/pom.xml
@@ -239,6 +239,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>
@@ -286,6 +295,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>

From 29e26e5148bea9e5b980755b4e1ed8b42d676708 Mon Sep 17 00:00:00 2001
From: kevinxu021 <kaihua.xu@esgyn.cn>
Date: Wed, 23 Jan 2019 20:27:45 +0800
Subject: [PATCH 3/3] support mvn compilation with jdk1.8

---
 dcs/Makefile |  4 ++--
 dcs/pom.xml  | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dcs/Makefile b/dcs/Makefile
index eaefeffa4b..3e66af0469 100644
--- a/dcs/Makefile
+++ b/dcs/Makefile
@@ -36,8 +36,8 @@ target/dcs-$(TRAFODION_VER).jar: $(java_files)
 	$(GENVERS) > $(VFILE)
 	@if [ $(GENVERS) -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
 	@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
-	echo "$(MAVEN) site package -DskipTests"
-	echo "### For full Maven output, see file build_dcs.log"
+	@echo "$(MAVEN) site package -DskipTests"
+	@echo "### For full Maven output, see file build_dcs.log"
 	set -o pipefail && $(MAVEN) site package -DskipTests | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
 	$(RM) $(VFILE)
 
diff --git a/dcs/pom.xml b/dcs/pom.xml
index 206e424489..e2cca0452c 100644
--- a/dcs/pom.xml
+++ b/dcs/pom.xml
@@ -129,8 +129,8 @@
         <version>2.5.1</version>
         <inherited>true</inherited>
         <configuration>
-            <source>1.7</source>
-            <target>1.7</target>
+		<source>${source.version}</source>
+		<target>${target.version}</target>
         </configuration>
     </plugin>
     <plugin>
@@ -527,6 +527,8 @@
     <surefire.skipSecondPart>true</surefire.skipSecondPart>
 	<surefire.firstPartGroups>org.trafodion.dcs.SmallTests</surefire.firstPartGroups>
 	<surefire.secondPartGroups>org.trafodion.dcs.MediumTests, org.trafodion.dcs.LargeTests</surefire.secondPartGroups>
+	<source.version>1.7</source.version>
+	<target.version>1.7</target.version>
   	
   </properties>
     
@@ -654,6 +656,17 @@
   <profiles>
     <!-- JDBC drivers needed for compile, but not site docs 
 	 This allows turning off dependency on command line (-P '!jdbc') -->
+    <profile>
+        <id>disable-javadoc-doclint</id>
+        <activation>
+            <jdk>[1.8,)</jdk>
+        </activation>
+        <properties>
+            <javadoc.opts>-Xdoclint:none</javadoc.opts>
+	    <source.version>1.8</source.version>
+	    <target.version>1.8</target.version>
+        </properties>
+    </profile>
     <profile>
       <id>jdbc</id>
       <activation>
@@ -742,6 +755,7 @@
         <version>${maven.javadoc.plugin.version}</version>
         <configuration>
           <docfilessubdirs>true</docfilessubdirs>
+	  <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
         <reportSets>
           <reportSet>