resolving conflict

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@1140 71c3de6d-444a-0410-be80-ed276b4c234a

publish-javadoc.sh

@@ -3,15 +3,13 @@
 # publish Hudson javadoc and deploy that into the java.net CVS repository
 # 
 
-# generate javadoc
-cd core
-mvn -o javadoc:javadoc
-cd ..
-
-cd ../../www/javadoc
+pushd ../../../www/javadoc
 cvs update -Pd
+popd
+
+cp -R target/checkout/core/target/site/apidocs/* ../../../www/javadoc
 
-cp -R ../../hudson/main/core/target/site/apidocs/* .
+cd ../../../www/javadoc
 
 # ignore everything under CVS, then
 # ignore all files that are already in CVS, then