diff options
author | Carlos Sanchez Gonzalez <carlos@apache.org> | 2007-07-12 18:11:46 +0000 |
---|---|---|
committer | Carlos Sanchez Gonzalez <carlos@apache.org> | 2007-07-12 18:11:46 +0000 |
commit | 77458d992ea10616d7958c82bae322b4e78068d1 (patch) | |
tree | 4207b5224ebc45cf46174a55cd1079e42b0159e1 /maven-meeper/src/bin/bundle-upload/deploy-bundle | |
parent | 2f9c465abbb3965aa463cddc84c631492b40f3f4 (diff) | |
download | archiva-77458d992ea10616d7958c82bae322b4e78068d1.tar.gz archiva-77458d992ea10616d7958c82bae322b4e78068d1.zip |
Only put stuff in MAven 1 if it is maven 1 to avoid problems later during the m1->m2 conversion
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@555707 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'maven-meeper/src/bin/bundle-upload/deploy-bundle')
-rwxr-xr-x | maven-meeper/src/bin/bundle-upload/deploy-bundle | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/maven-meeper/src/bin/bundle-upload/deploy-bundle b/maven-meeper/src/bin/bundle-upload/deploy-bundle index d8a45369d..f6910be2b 100755 --- a/maven-meeper/src/bin/bundle-upload/deploy-bundle +++ b/maven-meeper/src/bin/bundle-upload/deploy-bundle @@ -147,10 +147,13 @@ BUNDLE=tmp.jar 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 @@ BUNDLE=tmp.jar 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 @@ BUNDLE=tmp.jar 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 @@ BUNDLE=tmp.jar 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 |