You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ca...@apache.org on 2007/07/12 20:11:47 UTC

svn commit: r555707 - /maven/archiva/trunk/maven-meeper/src/bin/bundle-upload/deploy-bundle

Author: carlos
Date: Thu Jul 12 11:11:46 2007
New Revision: 555707

URL: http://svn.apache.org/viewvc?view=rev&rev=555707
Log:
Only put stuff in MAven 1 if it is maven 1 to avoid problems later during the m1->m2 conversion

Modified:
    maven/archiva/trunk/maven-meeper/src/bin/bundle-upload/deploy-bundle

Modified: maven/archiva/trunk/maven-meeper/src/bin/bundle-upload/deploy-bundle
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/bundle-upload/deploy-bundle?view=diff&rev=555707&r1=555706&r2=555707
==============================================================================
--- maven/archiva/trunk/maven-meeper/src/bin/bundle-upload/deploy-bundle (original)
+++ maven/archiva/trunk/maven-meeper/src/bin/bundle-upload/deploy-bundle Thu Jul 12 11:11:46 2007
@@ -147,10 +147,13 @@
 
   mkdir -p ${m2dir}
 
-  mkdir -p $REPODIR/${groupId}/poms
-  cp -i ${artifactId}-${version}.pom $REPODIR/${groupId}/poms
-  if [ ! -z "${maven2}" ]
+  if [ -z "${maven2}" ]
   then
+    # Maven 1
+    mkdir -p $REPODIR/${groupId}/poms
+    cp -i ${artifactId}-${version}.pom $REPODIR/${groupId}/poms
+  else
+    # Maven 2
     cp -i ${artifactId}-${version}.pom ${m2dir}
     md5sum  ${m2dir}/${artifactId}-${version}.pom > ${m2dir}/${artifactId}-${version}.pom.md5
     sha1sum ${m2dir}/${artifactId}-${version}.pom > ${m2dir}/${artifactId}-${version}.pom.sha1
@@ -165,8 +168,14 @@
     cp -i ${artifactId}-${version}.jar $REPODIR/${groupId}/plugins
   else
     echo "Deploying JAR ..."
-    mkdir -p $REPODIR/${groupId}/jars
-    cp -i ${artifactId}-${version}.jar $REPODIR/${groupId}/jars
+
+    if [ -z "${maven2}" ]
+    then
+      # Maven 1
+      mkdir -p $REPODIR/${groupId}/jars
+      cp -i ${artifactId}-${version}.jar $REPODIR/${groupId}/jars
+    fi
+
     cp -i ${artifactId}-${version}.jar ${m2dir}
     if [ -f ${m2dir}/${artifactId}-${version}.jar ]
     then
@@ -178,8 +187,8 @@
   if [ -f ${artifactId}-${version}-sources.jar ]
   then
     echo "Deploying Java sources ..."
-    mkdir -p $REPODIR/${groupId}/java-sources
-    cp -i ${artifactId}-${version}-sources.jar $REPODIR/${groupId}/java-sources
+    #mkdir -p $REPODIR/${groupId}/java-sources
+    #cp -i ${artifactId}-${version}-sources.jar $REPODIR/${groupId}/java-sources
     cp -i ${artifactId}-${version}-sources.jar ${m2dir}
     md5sum  ${m2dir}/${artifactId}-${version}-sources.jar > ${m2dir}/${artifactId}-${version}-sources.jar.md5
     sha1sum ${m2dir}/${artifactId}-${version}-sources.jar > ${m2dir}/${artifactId}-${version}-sources.jar.sha1
@@ -190,8 +199,8 @@
   if [ -f ${artifactId}-${version}-javadoc.jar ]
   then
     echo "Deploying Javadocs ..."
-    mkdir -p $REPODIR/${groupId}/javadoc
-    cp -i ${artifactId}-${version}-javadoc.jar $REPODIR/${groupId}/javadoc
+    #mkdir -p $REPODIR/${groupId}/javadoc
+    #cp -i ${artifactId}-${version}-javadoc.jar $REPODIR/${groupId}/javadoc
     cp -i ${artifactId}-${version}-javadoc.jar ${m2dir}
     md5sum  ${m2dir}/${artifactId}-${version}-javadoc.jar > ${m2dir}/${artifactId}-${version}-javadoc.jar.md5
     sha1sum ${m2dir}/${artifactId}-${version}-javadoc.jar > ${m2dir}/${artifactId}-${version}-javadoc.jar.sha1