Merge branch 'release/3.1'

pom.xml

@@ -341,6 +341,8 @@
               <archive>
                 <manifest>
                   <mainClass>edu.illinois.library.cantaloupe.StandaloneEntry</mainClass>
+                  <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                  <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                 </manifest>
               </archive>
               <packagingExcludes>WEB-INF/lib/javax.servlet-api-*.jar</packagingExcludes>

src/main/java/edu/illinois/library/cantaloupe/Application.java

@@ -22,9 +22,9 @@ public static String getVersion() {
         String className = clazz.getSimpleName() + ".class";
         URL classUrl = clazz.getResource(className);
         if (classUrl != null) {
-            String classPath = clazz.getResource(className).toString();
-            if (classPath.startsWith("jar")) {
-                String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1) +
+            String classPath = classUrl.toString();
+            if (classPath.startsWith("file")) {
+                String manifestPath = classPath.substring(0, classPath.lastIndexOf("/WEB-INF")) +
                         "/META-INF/MANIFEST.MF";
                 try {
                     Manifest manifest = new Manifest(new URL(manifestPath).openStream());

website/manual/3.1/developers.html

@@ -69,7 +69,7 @@ <h3 id="Releasing">Releasing</h3>
   <li>Merge into "release/vX.X"</li>
   <li>Update the version in <span class="filename">pom.xml</span> and commit this change</li>
   <li>Merge into "master"</li>
-  <li>Create the release .zip archive with <code>mvn package</code></li>
+  <li>Create the release .zip archive with <code>mvn clean; mvn package</code></li>
   <li>Check that the .zip archive is as expected</li>
   <li>Tag the release: <code>git tag -a v{version} -m 'Tag v{version}'</code></li>
   <li>Push the code: <code>git push origin master; git push origin release/x.x; git push --tags</code></li>