jaf fix build script and documentation build.

Signed-off-by: [email protected] <[email protected]>
jakartaee · Apr 9, 2021 · 4314ebe · 4314ebe
1 parent 3ef29ae
commit 4314ebe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/docker/build_activationtck.sh b/docker/build_activationtck.sh
@@ -21,11 +21,6 @@ echo "export MAVEN_HOME=$MAVEN_HOME"
 echo "export PATH=$PATH"
 
 
-if [[ "$JDK" == "JDK11" || "$JDK" == "jdk11" ]];then
-  export JAVA_HOME=${JDK11_HOME}
-  export PATH=$JAVA_HOME/bin:$PATH
-fi
-
 export TS_HOME=$WORKSPACE
 sed -i "s#^TS_HOME=.*#TS_HOME=$TS_HOME#g" $TS_HOME/lib/ts.jte
 sed -i "s#^JAVA_HOME=.*#JAVA_HOME=$JAVA_HOME#g" $TS_HOME/lib/ts.jte
@@ -56,7 +51,6 @@ which mvn
 mvn -version
 
 export ANT_OPTS="-DTS_HOME=$WORKSPACE -DJAVA_HOME=$JAVA_HOME -DJARPATH=$WORKSPACE"
-export JAVA_HOME=$JDK11_HOME
 export PATH="$JAVA_HOME/bin:$PATH"
 
 if [[ "$LICENSE" == "EFTL" || "$LICENSE" == "eftl" ]]; then

diff --git a/release.xml b/release.xml
@@ -49,7 +49,7 @@
 
     <target name="mvn">
         <exec dir="${basedir}/docs/ug" executable="mvn">
-            <arg line="-B"/>
+            <arg line="-B -V -Dmaven.repo.local=${ts.home}/.m2/repository"/>
         </exec>
     </target>