Merge pull request #1809 from TexasDigitalLibrary/4.2.2_staging

4.2.2 staging

README.md

@@ -66,7 +66,7 @@ $ mvn clean spring-boot:run -Dproduction
 $ mvn clean package -DskipTests -Dproduction -Dassets.uri=file:/opt/vireo/ -Dconfig.uri=file:/opt/vireo/config/
 ```
 
-If build succeeds, you should have both a `vireo-4.2.1.war` and a `vireo-4.2.1-install.zip` in the `target/` directory. When building for production required static assets are copied into the packaged war file and the index.html template is optimized for production. For development a symlink is used to allow the application to access required static assets.
+If build succeeds, you should have both a `vireo-4.2.2.war` and a `vireo-4.2.2-install.zip` in the `target/` directory. When building for production required static assets are copied into the packaged war file and the index.html template is optimized for production. For development a symlink is used to allow the application to access required static assets.
 
 #### Apache Reverse Proxy Config
 
@@ -117,7 +117,7 @@ Unzip package into preferred directory (or any directory you choose):
 
 ```bash
 $ cd /opt/vireo
-$ unzip vireo-4.2.1-install.zip
+$ unzip vireo-4.2.2-install.zip
 ```
 
 ### Directory Structure of installed package
@@ -190,13 +190,13 @@ ln -s /opt/vireo/webapp /opt/tomcat/webapps/ROOT
 Copy war file into Tomcat webapps directory (your location may vary -- this is an example):
 
 ```bash
-$ cp ~/vireo-4.2.1.war /usr/local/tomcat/webapps/vireo.war
+$ cp ~/vireo-4.2.2.war /usr/local/tomcat/webapps/vireo.war
 ```
 
 or as root:
 
 ```bash
-$ cp ~/vireo-4.2.1.war /usr/local/tomcat/webapps/ROOT.war
+$ cp ~/vireo-4.2.2.war /usr/local/tomcat/webapps/ROOT.war
 ```
 
 **if not specifying assets.uri during build the assets will be stored under the vireo webapp's classpath, /opt/tomcat/webapps/vireo/WEB-INF/classes**
@@ -209,7 +209,7 @@ $ cp ~/vireo-4.2.1.war /usr/local/tomcat/webapps/ROOT.war
 ## Running WAR as a stand-alone Spring Boot application
 
 ```bash
-java -jar target/vireo-4.2.1.war
+java -jar target/vireo-4.2.2.war
 ```
 
 <div align="right">(<a href="#readme-top">back to top</a>)</div>

build/appConfig.js.template

@@ -1,6 +1,6 @@
 var appConfig = {
 
-    'version': '4.2.1',
+    'version': '4.2.2',
 
     'allowAnonymous': true,
     'anonymousRole': 'ROLE_ANONYMOUS',

example.env

@@ -4,7 +4,7 @@
 ##############################
 
 IMAGE_HOST=127.0.0.1
-IMAGE_VERSION=4.2.1
+IMAGE_VERSION=4.2.2
 SERVICE_PROJECT=tdl
 SERVICE_PATH=vireo
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "vireo",
   "private": false,
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "Vireo 4",
   "homepage": "https://github.com/TexasDigitalLibrary/Vireo",
   "repository": {

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>org.tdl</groupId>
   <artifactId>vireo</artifactId>
-  <version>4.2.1</version>
+  <version>4.2.2</version>
 
   <name>Vireo</name>
   <description>Vireo Thesis and Dissertation Submission System</description>
@@ -166,6 +166,18 @@
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>com.io7m.xom</groupId>
+      <artifactId>xom</artifactId>
+      <version>1.2.10</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>org.swordapp</groupId>
       <artifactId>sword-common</artifactId>
@@ -187,6 +199,10 @@
           <groupId>commons-httpclient</groupId>
           <artifactId>commons-httpclient</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>xom</groupId>
+          <artifactId>xom</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>