Package in libs

netarchivesuite · Feb 3, 2021 · 4ca1257 · 4ca1257
1 parent fffd21b
commit 4ca1257
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/hadoop-uber-jar-invoker/src/main/assembly/assembly.xml b/hadoop-uber-jar-invoker/src/main/assembly/assembly.xml
@@ -18,7 +18,7 @@
     </files>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>.</outputDirectory>
+            <outputDirectory>libs/</outputDirectory>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
     </dependencySets>

diff --git a/hadoop-uber-jar-invoker/src/main/resources/run.sh b/hadoop-uber-jar-invoker/src/main/resources/run.sh
@@ -6,16 +6,16 @@ clusterUser=${1:-nat-$USER}
 kerberosPrincipal=${clusterUser}@KBHPC.KB.DK
 
 export CLASSPATH=\
-$SCRIPT_DIR/hadoop-uber-jar-${project.version}-shaded.jar:\
+$SCRIPT_DIR/libs/hadoop-uber-jar-${project.version}-shaded.jar:\
 $HOME/projects/narchive-invoker/integrationTest/src/test/hadoopConf:\
-$SCRIPT_DIR/*:\
+$SCRIPT_DIR/libs/*:\
 $CLASSPATH;
 
 java \
  -Dsettings.common.hadoop.mapred.metadataExtractionJob.inputDir=/user/${clusterUser}/input \
  -Dsettings.common.hadoop.mapred.metadataExtractionJob.outputDir=/user/${clusterUser}/output \
  -Dsettings.common.hadoop.kerberos.principal=${kerberosPrincipal} \
  -Dsettings.common.hadoop.kerberos.keytab=$HOME/${clusterUser}.keytab \
- -Dsettings.common.hadoop.mapred.hadoopUberJar=$SCRIPT_DIR/hadoop-uber-jar-${project.version}-shaded.jar \
+ -Dsettings.common.hadoop.mapred.hadoopUberJar=$SCRIPT_DIR/libs/hadoop-uber-jar-${project.version}-shaded.jar \
  MetadataIndexingApplication /user/${clusterUser}/9385-metadata-1.warc.gz