S3 josm jar (#5810)

* test archive url

* maven version

* josm 19043 system scope

* testing pom and vendor jar

* update script to use local jar

Author: olearytd

hoot-josm/make-hoot-josm-java.sh

@@ -8,20 +8,34 @@ JOSM_ARTIFACT_ID=`awk -F '[<>]' '/<josm.artifactId>/{print $3}' pom.xml`
 JOSM_VERSION=`awk -F '[<>]' '/<josm.version>/{print $3}' pom.xml`
 JOSM_JAR=$JOSM_ARTIFACT_ID-$JOSM_VERSION.jar
 
-# Install a local josm jar if the version you want is not available from a repo. This needs to be 
-# done first time for each new version of a local jar only. Download the jar and install it with the 
-# mvn line below. You can check to see if your public josm jar is already installed by looking at 
+# Install a local josm jar if the version you want is not available from a repo. This needs to be
+# done first time for each new version of a local jar only. Download the jar and install it with the
+# mvn line below. You can check to see if your public josm jar is already installed by looking at
 # the contents of ~/.m2/repository/org/openstreetmap/josm/<JOSM_ARTIFACT_ID>/<JOSM_VERSION>.
 # mvn install:install-file -Dfile=<path-to-jar> -DgroupId=org.openstreetmap.josm -DartifactId=<ID> -Dversion=<version> -Dpackaging=jar -DgeneratePom=true
 
 # Build the hoot josm integration jar and copy over the josm jar.
 mvn -q package
 
-# In order for our monkey patching of the josm jar to work, we need to remove the josm jar signature 
+
+# In order for our monkey patching of the josm jar to work, we need to remove the josm jar signature
 # so we don't get a security error.
 DEP_DIR=target/dependency-jars
-zip -qd $DEP_DIR/$JOSM_JAR "META-INF/*.MF"
-# Rename the josm jar to match what's in the hoot config.
-mv $DEP_DIR/$JOSM_JAR $DEP_DIR/josm.jar
+SRC_JAR=$DEP_DIR/$JOSM_JAR
+if [ ! -f "$SRC_JAR" ]; then
+  # Fall back to the vendored system dependency location
+  SRC_JAR=vendor/$JOSM_JAR
+fi
+if [ ! -f "$SRC_JAR" ]; then
+  echo "ERROR: Could not find $JOSM_JAR in $DEP_DIR or vendor/. Make sure vendor/$JOSM_JAR exists for system-scoped builds." >&2
+  exit 1
+fi
+
+# Remove signature if present; ignore zip's 'Nothing to do' (exit 12)
+zip -qd "$SRC_JAR" "META-INF/*.MF" || [ $? -eq 12 ]
+
+# Ensure destination dir exists and copy as josm.jar for hoot config
+install -d "$DEP_DIR"
+cp -f "$SRC_JAR" "$DEP_DIR/josm.jar"
 
 cd $HOOT_HOME

hoot-josm/pom.xml

@@ -56,16 +56,20 @@
 
 	<dependencies>
     <dependency>
-    			<groupId>org.openstreetmap.josm</groupId>
-    			<artifactId>${josm.artifactId}</artifactId>
-    			<version>${josm.version}</version>
-		</dependency>
+      <groupId>org.openstreetmap.josm</groupId>
+      <artifactId>josm</artifactId>
+      <version>19043</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/vendor/josm-19043.jar</systemPath>
+    </dependency>
 	</dependencies>
 
 	<build>
 		<finalName>hoot-josm</finalName>
 		<plugins>
 
+
+
 			<!-- Set a compiler level -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>