Author: lewismc
Date: Tue Apr 21 17:03:32 2015
New Revision: 1675156

URL: http://svn.apache.org/r1675156
Log:
Further improvements to Tika third party utility script

Modified:
    tika/tools/tika_ucar_sonatype.sh

Modified: tika/tools/tika_ucar_sonatype.sh
URL: 
http://svn.apache.org/viewvc/tika/tools/tika_ucar_sonatype.sh?rev=1675156&r1=1675155&r2=1675156&view=diff
==============================================================================
--- tika/tools/tika_ucar_sonatype.sh (original)
+++ tika/tools/tika_ucar_sonatype.sh Tue Apr 21 17:03:32 2015
@@ -30,48 +30,48 @@
 
 DEPENDENCY_VERSION="$1"
 JJ2000_VERSION="$2"
-UDUNITS_VERSION="$3"
-ARTIFACT_DIRECTORY="$4"
+ARTIFACT_DIRECTORY="$3"
+GPG_PASSPHRASE="$4"
 
 if [ "$DEPENDENCY_VERSION" = "" ]; then
-       echo "Missing dependency_version : tika_ucar_sonatype.sh 
<dependency_version> <jss2000_version> <udunits_version> <artifact_directory>"
+       echo "Missing dependency_version : tika_ucar_sonatype.sh 
<dependency_version> <jj2000_version> <artifact_directory> <gpg_passphrase>"
        exit -1;
 fi
 
 if [ "$JJ2000_VERSION" = "" ]; then
-echo "Missing dependency_version : tika_ucar_sonatype.sh <dependency_version> 
<jss2000_version> <udunits_version> <artifact_directory>"
-exit -1;
-fi
-
-if [ "$UDUNITS_VERSION" = "" ]; then
-echo "Missing dependency_version : tika_ucar_sonatype.sh <dependency_version> 
<jss2000_version> <udunits_version> <artifact_directory>"
-exit -1;
+    echo "Missing jj2000_version : tika_ucar_sonatype.sh <dependency_version> 
<jj2000_version> <artifact_directory> <gpg_passphrase>"
+    exit -1;
 fi
 
 if [ "$ARTIFACT_DIRECTORY" = "" ]; then
-       echo "Missing dependency_version : tika_ucar_sonatype.sh 
<dependency_version> <jss2000_version> <udunits_version> <artifact_directory>"
+       echo "Missing artifact_directory : tika_ucar_sonatype.sh 
<dependency_version> <jj2000_version> <artifact_directory> <gpg_passphrase>"
        exit -1;
 fi
 
+if [ "$GPG_PASSPHRASE" = "" ]; then
+echo "Missing gpg_passphrase : tika_ucar_sonatype.sh <dependency_version> 
<jj2000_version> <artifact_directory> <gpg_passphrase>"
+exit -1;
+fi
+
 # The UCAR release repository
 
UCAR=https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases/edu/ucar/
 # The array of dependencies we wish to grab and sign before staging
-dependency_array=(cdm grib netcdf4 thredds-parent httpservices)
+dependency_array=(cdm grib netcdf4 thredds-parent httpservices udunits)
 
 echo "Fetching UCAR artifact items for staging:"
 for item in ${dependency_array[*]}
 do
     printf "   %s\n" $item
-    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$item/$DEPENDENCY_VERSION/$item-$DEPENDENCY_VERSION-javadoc.jar"
-    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$item/$DEPENDENCY_VERSION/$item-$DEPENDENCY_VERSION-sources.jar"
-    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$item/$DEPENDENCY_VERSION/$item-$DEPENDENCY_VERSION-tests.jar"
-    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$item/$DEPENDENCY_VERSION/$item-$DEPENDENCY_VERSION.jar"
-    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$item/$DEPENDENCY_VERSION/$item-$DEPENDENCY_VERSION.pom"
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION-javadoc.jar 
-Dclassifier=javadoc
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION-sources.jar 
-Dclassifier=sources
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION-tests.jar
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.jar
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom
+    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$item/$DEPENDENCY_VERSION/$item-$DEPENDENCY_VERSION-javadoc.jar" 
--no-check-certificate
+    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$item/$DEPENDENCY_VERSION/$item-$DEPENDENCY_VERSION-sources.jar" 
--no-check-certificate
+    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$item/$DEPENDENCY_VERSION/$item-$DEPENDENCY_VERSION-tests.jar" 
--no-check-certificate
+    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$item/$DEPENDENCY_VERSION/$item-$DEPENDENCY_VERSION.jar" 
--no-check-certificate
+    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$item/$DEPENDENCY_VERSION/$item-$DEPENDENCY_VERSION.pom" 
--no-check-certificate
+    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION-javadoc.jar 
-Dclassifier=javadoc -Dgpg.passphrase=$GPG_PASSPHRASE
+    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION-sources.jar 
-Dclassifier=sources -Dgpg.passphrase=$GPG_PASSPHRASE
+    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION-tests.jar 
-Dgpg.passphrase=$GPG_PASSPHRASE
+    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.jar 
-Dgpg.passphrase=$GPG_PASSPHRASE
+    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$item-$DEPENDENCY_VERSION.pom 
-Dgpg.passphrase=$GPG_PASSPHRASE
 done
 
 # The jj2000 dependencies we wish to grab and sign before staging
@@ -79,25 +79,12 @@ jj2000_array=(jj2000)
 for jitem in ${jj2000_array[*]}
 do
     printf "   %s\n" $jitem
-    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$jitem/$JJ2000_VERSION/$jitem-$JJ2000_VERSION.pom"
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION-javadoc.jar 
-Dclassifier=javadoc
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION-sources.jar 
-Dclassifier=sources
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION-tests.jar
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.jar
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom
-done
-
-# The udunits dependencies we wish to grab and sign before staging
-udunits_array=(udunits)
-for uitem in ${udunits_array[*]}
-do
-    printf "   %s\n" $uitem
-    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$uitem/$UDUNITS_VERSION/$uitem-$UDUNITS_VERSION.pom"
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$uitem-$UDUNITS_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$uitem-$UDUNITS_VERSION-javadoc.jar 
-Dclassifier=javadoc
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$uitem-$UDUNITS_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$uitem-$UDUNITS_VERSION-sources.jar 
-Dclassifier=sources
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$uitem-$UDUNITS_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$uitem-$UDUNITS_VERSION-tests.jar
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$uitem-$UDUNITS_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$uitem-$UDUNITS_VERSION.jar
-    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$uitem-$UDUNITS_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$uitem-$UDUNITS_VERSION.pom
+    wget -P "$ARTIFACT_DIRECTORY" 
"${UCAR}$jitem/$JJ2000_VERSION/$jitem-$JJ2000_VERSION.pom" 
--no-check-certificate
+    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION-javadoc.jar 
-Dclassifier=javadoc -Dgpg.passphrase=$GPG_PASSPHRASE
+    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION-sources.jar 
-Dclassifier=sources -Dgpg.passphrase=$GPG_PASSPHRASE
+    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION-tests.jar 
-Dgpg.passphrase=$GPG_PASSPHRASE
+    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.jar 
-Dgpg.passphrase=$GPG_PASSPHRASE
+    mvn gpg:sign-and-deploy-file 
-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ 
-DrepositoryId=edu.ucar 
-DpomFile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom 
-Dfile="$ARTIFACT_DIRECTORY"$jitem-$JJ2000_VERSION.pom 
-Dgpg.passphrase=$GPG_PASSPHRASE
 done
 
 echo "FINISHED: Fetching and signing UCAR artifacts, please progress to 
https://wiki.apache.org/tika/ThirdPartySonaType#Staging";


Reply via email to