diff --git a/adapter/adapter-api/pom.xml b/adapter/adapter-api/pom.xml
index 7b6400cc5..4f8289dac 100644
--- a/adapter/adapter-api/pom.xml
+++ b/adapter/adapter-api/pom.xml
@@ -1,75 +1,75 @@
4.0.0
SHRINE Adapter Client API
shrine-adapter-client-api
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-client
${project.version}
net.shrine
shrine-protocol
${project.version}
com.sun.jersey.jersey-test-framework
jersey-test-framework-http
${jersey-version}
test
com.sun.jersey.contribs
jersey-simple-server
${jersey-version}
test
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-client
${project.version}
test-jar
test
net.shrine
shrine-config
${project.version}
test-jar
test
diff --git a/adapter/adapter-service/pom.xml b/adapter/adapter-service/pom.xml
index 2e9430855..c1342b370 100644
--- a/adapter/adapter-service/pom.xml
+++ b/adapter/adapter-service/pom.xml
@@ -1,181 +1,181 @@
4.0.0
SHRINE Adapter
shrine-adapter-service
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
org.apache.maven.plugins
maven-jar-plugin
test-jar
org.squeryl
squeryl_${scala-major-version}
org.scala-lang
scalap
org.scala-lang
scalap
${scala-version}
net.shrine
shrine-auth
${project.version}
net.shrine
shrine-adapter-client-api
${project.version}
net.shrine
shrine-data-commons
${project.version}
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-crypto
${project.version}
test-jar
test
net.shrine
shrine-client
${project.version}
net.shrine
shrine-protocol
${project.version}
net.shrine
shrine-config
${project.version}
com.typesafe.slick
slick_2.11
${slick-version}
org.suecarter
freeslick_2.11
3.0.3.1
org.slf4j
slf4j-log4j12
${slf4j-version}
mysql
mysql-connector-java
com.sun.jersey.jersey-test-framework
jersey-test-framework-http
${jersey-version}
test
com.sun.jersey.contribs
jersey-simple-server
${jersey-version}
test
com.h2database
h2
test
org.easymock
easymock
test
org.springframework
spring-jdbc
test
net.shrine
shrine-util
${project.version}
test-jar
test
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-data-commons
${project.version}
test-jar
test
diff --git a/apps/dashboard-app/pom.xml b/apps/dashboard-app/pom.xml
index 8cfcbbe19..6d205ed18 100644
--- a/apps/dashboard-app/pom.xml
+++ b/apps/dashboard-app/pom.xml
@@ -1,173 +1,173 @@
shrine-base
net.shrine
- 1.20.0
+ 1.20.1
../../pom.xml
4.0.0
dashboard-app
Dashboard App
jar
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
com.github.eirslett
frontend-maven-plugin
0.0.23
src/main/js
install node and npm
install-node-and-npm
v0.10.33
2.7.4
npm install
npm
generate-resources
install
bower install
bower
install
grunt default
grunt
--no-color
io.spray
spray-routing_2.11
${spray-version}
io.spray
spray-servlet_2.11
${spray-version}
io.spray
spray-util_2.11
${spray-version}
io.spray
spray-testkit_2.11
${spray-version}
test
com.typesafe.akka
akka-actor_2.11
${akka-version}
com.typesafe.akka
akka-slf4j_2.11
${akka-version}
com.typesafe.akka
akka-testkit_2.11
${akka-testkit-version}
test
org.json4s
json4s-native_2.11
${json4s-version}
com.typesafe.slick
slick_2.11
${slick-version}
org.slf4j
slf4j-log4j12
${slf4j-version}
com.h2database
h2
${h2-version}
test
net.shrine
shrine-protocol
${project.version}
net.shrine
shrine-client
${project.version}
net.shrine
shrine-crypto
${project.version}
test-jar
test
net.shrine
shrine-auth
${project.version}
mysql
mysql-connector-java
${mysql-version}
diff --git a/apps/dashboard-app/src/main/js/pom.xml b/apps/dashboard-app/src/main/js/pom.xml
index f5887b48a..1fc9461ca 100644
--- a/apps/dashboard-app/src/main/js/pom.xml
+++ b/apps/dashboard-app/src/main/js/pom.xml
@@ -1,92 +1,92 @@
shrine-base
net.shrine
- 1.20.0-SNAPSHOT
+ 1.20.1-SNAPSHOT
4.0.0
net.shrine
dashboard-app-client
pom
com.github.eirslett
frontend-maven-plugin
0.0.23
install node and npm
install-node-and-npm
v0.10.33
2.7.4
npm install
npm
generate-resources
install
bower install
bower
install
grunt default
grunt
--no-color
diff --git a/apps/dashboard-war/pom.xml b/apps/dashboard-war/pom.xml
index 6c1f69608..0be113d40 100644
--- a/apps/dashboard-war/pom.xml
+++ b/apps/dashboard-war/pom.xml
@@ -1,38 +1,38 @@
shrine-base
net.shrine
- 1.20.0
+ 1.20.1
../../pom.xml
4.0.0
dashboard-war
Dashboard War
war
org.apache.maven.plugins
maven-war-plugin
shrine-dashboard
net.shrine
dashboard-app
${project.version}
org.slf4j
slf4j-log4j12
${slf4j-version}
runtime
diff --git a/apps/proxy/pom.xml b/apps/proxy/pom.xml
index 708d477ac..53701af26 100644
--- a/apps/proxy/pom.xml
+++ b/apps/proxy/pom.xml
@@ -1,53 +1,53 @@
4.0.0
SHRINE Proxy
shrine-proxy
war
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-client
${project.version}
net.shrine
shrine-protocol
${project.version}
javax.servlet
javax.servlet-api
provided
src/main/scala
src/test/scala
shrine-proxy
net.alchim31.maven
scala-maven-plugin
diff --git a/apps/shrine-app/pom.xml b/apps/shrine-app/pom.xml
index 73c3ff294..490a27319 100644
--- a/apps/shrine-app/pom.xml
+++ b/apps/shrine-app/pom.xml
@@ -1,108 +1,108 @@
shrine-base
net.shrine
- 1.20.0
+ 1.20.1
../../pom.xml
4.0.0
shrine-app
SHRINE App
jar
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-config
${project.version}
net.shrine
shrine-hms-core
${project.version}
net.shrine
shrine-service
${project.version}
net.shrine
shrine-broadcaster-aggregator
${project.version}
net.shrine
shrine-broadcaster-service
${project.version}
net.shrine
shrine-adapter-service
${project.version}
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-ont-support
${project.version}
net.shrine
shrine-crypto
${project.version}
test-jar
test
net.shrine
shrine-protocol
${project.version}
test-jar
test
net.shrine
shrine-config
${project.version}
test-jar
test
net.shrine
shrine-broadcaster-aggregator
${project.version}
test-jar
test
net.shrine
shrine-client
${project.version}
test-jar
test
diff --git a/apps/steward-app/pom.xml b/apps/steward-app/pom.xml
index 9f519b7fb..a80b9dfad 100644
--- a/apps/steward-app/pom.xml
+++ b/apps/steward-app/pom.xml
@@ -1,187 +1,187 @@
shrine-base
net.shrine
- 1.20.0
+ 1.20.1
../../pom.xml
4.0.0
steward-app
Steward App
jar
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
com.github.eirslett
frontend-maven-plugin
0.0.23
src/main/js
install node and npm
install-node-and-npm
v0.10.33
2.7.4
npm install
npm
generate-resources
install
bower install
bower
install
grunt default
grunt
--no-color
io.spray
spray-routing_2.11
${spray-version}
io.spray
spray-servlet_2.11
${spray-version}
io.spray
spray-util_2.11
${spray-version}
io.spray
spray-testkit_2.11
${spray-version}
test
com.typesafe.akka
akka-actor_2.11
${akka-version}
com.typesafe.akka
akka-slf4j_2.11
${akka-version}
com.typesafe.akka
akka-testkit_2.11
${akka-testkit-version}
test
org.json4s
json4s-native_2.11
${json4s-version}
com.typesafe.slick
slick_2.11
${slick-version}
org.suecarter
freeslick_2.11
3.0.3.1
org.slf4j
slf4j-log4j12
${slf4j-version}
com.h2database
h2
${h2-version}
test
net.shrine
shrine-protocol
${project.version}
net.shrine
shrine-client
${project.version}
net.shrine
shrine-crypto
${project.version}
test-jar
test
net.shrine
shrine-auth
${project.version}
mysql
mysql-connector-java
${mysql-version}
diff --git a/apps/steward-app/src/main/js/pom.xml b/apps/steward-app/src/main/js/pom.xml
index 4280d983b..18c1fc420 100644
--- a/apps/steward-app/src/main/js/pom.xml
+++ b/apps/steward-app/src/main/js/pom.xml
@@ -1,92 +1,92 @@
shrine-base
net.shrine
- 1.20.0-SNAPSHOT
+ 1.20.1-SNAPSHOT
4.0.0
net.shrine
steward-client
pom
com.github.eirslett
frontend-maven-plugin
0.0.23
install node and npm
install-node-and-npm
v0.10.33
2.7.4
npm install
npm
generate-resources
install
bower install
bower
install
grunt default
grunt
--no-color
diff --git a/apps/steward-war/pom.xml b/apps/steward-war/pom.xml
index d1403bd60..d8d001fc8 100644
--- a/apps/steward-war/pom.xml
+++ b/apps/steward-war/pom.xml
@@ -1,44 +1,44 @@
shrine-base
net.shrine
- 1.20.0
+ 1.20.1
../../pom.xml
4.0.0
steward
Steward War
war
org.apache.maven.plugins
maven-war-plugin
steward
net.shrine
steward-app
${project.version}
com.h2database
h2
1.4.185
test
org.slf4j
slf4j-log4j12
${slf4j-version}
runtime
diff --git a/apps/war/pom.xml b/apps/war/pom.xml
index da63143cb..8b2f2fbc9 100644
--- a/apps/war/pom.xml
+++ b/apps/war/pom.xml
@@ -1,59 +1,59 @@
4.0.0
SHRINE War
shrine-war
war
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-app
${project.version}
net.shrine
shrine-adapter-service
${project.version}
javax.servlet
javax.servlet-api
provided
com.sun.jersey
jersey-servlet
net.shrine
shrine-adapter-service
${project.version}
test-jar
test
shrine-cell
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
diff --git a/commons/auth/pom.xml b/commons/auth/pom.xml
index b2b006fdf..764a86620 100644
--- a/commons/auth/pom.xml
+++ b/commons/auth/pom.xml
@@ -1,98 +1,98 @@
4.0.0
SHRINE Auth*
shrine-auth
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
net.shrine
shrine-protocol
${project.version}
com.typesafe.akka
akka-actor_2.11
2.3.8
org.json4s
json4s-native_2.11
3.2.11
io.spray
spray-client_2.11
1.3.3
io.spray
spray-routing_2.11
1.3.3
io.spray
spray-servlet_2.11
1.3.3
io.spray
spray-util_2.11
1.3.3
io.spray
spray-testkit_2.11
1.3.3
test
com.typesafe.akka
akka-slf4j_2.11
2.3.8
com.typesafe.akka
akka-testkit_2.11
2.3.11
test
net.shrine
shrine-client
${project.version}
net.shrine
shrine-test-commons
${project.version}
test-jar
test
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
diff --git a/commons/client/pom.xml b/commons/client/pom.xml
index 245c4f5f5..d5492bfe4 100644
--- a/commons/client/pom.xml
+++ b/commons/client/pom.xml
@@ -1,69 +1,69 @@
4.0.0
SHRINE Client
shrine-client
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-protocol
${project.version}
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-crypto
${project.version}
test-jar
test
net.shrine
shrine-config
${project.version}
com.sun.jersey
jersey-client
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
org.apache.maven.plugins
maven-jar-plugin
test-jar
diff --git a/commons/config/pom.xml b/commons/config/pom.xml
index ea8dd9106..4f8764175 100644
--- a/commons/config/pom.xml
+++ b/commons/config/pom.xml
@@ -1,57 +1,57 @@
4.0.0
SHRINE Config
shrine-config
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.sf.opencsv
opencsv
com.typesafe
config
net.shrine
shrine-util
${project.version}
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
org.apache.maven.plugins
maven-jar-plugin
test-jar
diff --git a/commons/crypto/pom.xml b/commons/crypto/pom.xml
index da29b5e82..dbf9c4d91 100644
--- a/commons/crypto/pom.xml
+++ b/commons/crypto/pom.xml
@@ -1,53 +1,53 @@
4.0.0
SHRINE Crypto
shrine-crypto
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-protocol
${project.version}
net.shrine
shrine-config
${project.version}
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
org.apache.maven.plugins
maven-jar-plugin
test-jar
diff --git a/commons/data-commons/pom.xml b/commons/data-commons/pom.xml
index 17d56f456..642f7046a 100644
--- a/commons/data-commons/pom.xml
+++ b/commons/data-commons/pom.xml
@@ -1,79 +1,79 @@
4.0.0
SHRINE Data Access Classes
shrine-data-commons
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
org.apache.maven.plugins
maven-jar-plugin
test-jar
net.shrine
shrine-test-commons
${project.version}
test-jar
test
org.squeryl
squeryl_${scala-major-version}
org.scala-lang
scalap
org.scala-lang
scalap
${scala-version}
net.shrine
shrine-protocol
${project.version}
org.springframework
spring-jdbc
test
com.h2database
h2
test
diff --git a/commons/ont-support/pom.xml b/commons/ont-support/pom.xml
index 704f709e6..65147ec2a 100644
--- a/commons/ont-support/pom.xml
+++ b/commons/ont-support/pom.xml
@@ -1,64 +1,64 @@
4.0.0
SHRINE Ontology Support
shrine-ont-support
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-protocol
${project.version}
net.shrine
shrine-util
${project.version}
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-crypto
${project.version}
test-jar
test
net.shrine
shrine-config
${project.version}
net.shrine
shrine-client
${project.version}
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
diff --git a/commons/protocol-query/pom.xml b/commons/protocol-query/pom.xml
index ae5348304..6aae485c1 100644
--- a/commons/protocol-query/pom.xml
+++ b/commons/protocol-query/pom.xml
@@ -1,58 +1,58 @@
4.0.0
SHRINE Query Protocol
shrine-protocol-query
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.liftweb
lift-json_${scala-major-version}
org.scala-lang
scalap
org.scala-lang
scalap
${scala-version}
net.shrine
shrine-util
${project.version}
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
diff --git a/commons/protocol/pom.xml b/commons/protocol/pom.xml
index 9f66cb389..abeb651ae 100644
--- a/commons/protocol/pom.xml
+++ b/commons/protocol/pom.xml
@@ -1,87 +1,87 @@
4.0.0
SHRINE Protocol
shrine-protocol
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
net.shrine
shrine-protocol-query
${project.version}
net.shrine
shrine-util
${project.version}
net.shrine
shrine-util
${project.version}
test-jar
test
net.shrine
shrine-config
${project.version}
net.liftweb
lift-json_${scala-major-version}
org.easymock
easymock
test
net.shrine
shrine-test-commons
${project.version}
test-jar
test
src/main/scala
src/test/scala
src/main/resources
true
shrine-versions.properties
net.alchim31.maven
scala-maven-plugin
net.alchim31.maven
scala-maven-plugin
org.apache.maven.plugins
maven-jar-plugin
test-jar
diff --git a/commons/test-commons/pom.xml b/commons/test-commons/pom.xml
index 0085723ef..fa1fb1405 100644
--- a/commons/test-commons/pom.xml
+++ b/commons/test-commons/pom.xml
@@ -1,49 +1,49 @@
4.0.0
SHRINE Test Commons
shrine-test-commons
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
com.sun.jersey
jersey-client
test
com.sun.jersey.jersey-test-framework
jersey-test-framework-http
${jersey-version}
test
src/test/scala
org.apache.maven.plugins
maven-jar-plugin
test-jar
net.alchim31.maven
scala-maven-plugin
diff --git a/commons/util/pom.xml b/commons/util/pom.xml
index c075dec42..6633012dd 100644
--- a/commons/util/pom.xml
+++ b/commons/util/pom.xml
@@ -1,85 +1,85 @@
4.0.0
SHRINE Utility Code
shrine-util
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
org.apache.commons
commons-email
1.2
net.liftweb
lift-json_${scala-major-version}
org.scala-lang
scalap
org.scala-lang
scalap
${scala-version}
log4j
log4j
net.shrine
shrine-test-commons
${project.version}
test-jar
test
src/main/scala
src/test/scala
src/main/resources
true
shrine-versions.properties
net.alchim31.maven
scala-maven-plugin
org.apache.maven.plugins
maven-jar-plugin
2.6
test-jar
diff --git a/hms-support/hms-core/pom.xml b/hms-support/hms-core/pom.xml
index 5118b2daa..096b428cf 100644
--- a/hms-support/hms-core/pom.xml
+++ b/hms-support/hms-core/pom.xml
@@ -1,63 +1,63 @@
net.shrine
shrine-hms-support
- 1.20.0
+ 1.20.1
4.0.0
shrine-hms-core
SHRINE HMS Support (Core Classes)
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-auth
${project.version}
net.shrine
shrine-protocol
${project.version}
net.shrine
shrine-client
${project.version}
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-crypto
${project.version}
test-jar
test
org.easymock
easymock
test
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
diff --git a/hms-support/pom.xml b/hms-support/pom.xml
index 6ad979dee..402c8be17 100644
--- a/hms-support/pom.xml
+++ b/hms-support/pom.xml
@@ -1,16 +1,16 @@
4.0.0
SHRINE HMS Support
shrine-hms-support
pom
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
hms-core
diff --git a/hub/broadcaster-aggregator/pom.xml b/hub/broadcaster-aggregator/pom.xml
index c657d8056..4fa2361ff 100644
--- a/hub/broadcaster-aggregator/pom.xml
+++ b/hub/broadcaster-aggregator/pom.xml
@@ -1,162 +1,162 @@
4.0.0
SHRINE Broadcaster Aggregator
shrine-broadcaster-aggregator
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
src/main/scala
src/test/scala
org.codehaus.mojo
tomcat-maven-plugin
1.0-beta-1
net.alchim31.maven
scala-maven-plugin
org.apache.maven.plugins
maven-jar-plugin
test-jar
net.shrine
shrine-adapter-client-api
${project.version}
net.shrine
shrine-client
${project.version}
net.shrine
shrine-protocol
${project.version}
net.shrine
shrine-data-commons
${project.version}
mysql
mysql-connector-java
net.shrine
shrine-util
${project.version}
test-jar
test
net.shrine
shrine-crypto
${project.version}
test-jar
test
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-data-commons
${project.version}
test-jar
test
net.shrine
shrine-config
${project.version}
test-jar
test
com.sun.jersey.jersey-test-framework
jersey-test-framework-http
${jersey-version}
test
com.sun.jersey.contribs
jersey-simple-server
${jersey-version}
test
com.h2database
h2
test
org.easymock
easymock
test
org.springframework
spring-jdbc
test
org.codehaus.mojo
findbugs-maven-plugin
2.3.1
Max
org.codehaus.mojo
cobertura-maven-plugin
2.3
org.apache.maven.plugins
maven-checkstyle-plugin
2.5
org.apache.maven.plugins
maven-pmd-plugin
2.4
1.6
diff --git a/hub/broadcaster-service/pom.xml b/hub/broadcaster-service/pom.xml
index f293abf31..edc3e3f28 100644
--- a/hub/broadcaster-service/pom.xml
+++ b/hub/broadcaster-service/pom.xml
@@ -1,149 +1,149 @@
4.0.0
SHRINE Broadcast Service
shrine-broadcaster-service
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
com.sun.jersey
jersey-server
net.shrine
shrine-broadcaster-aggregator
${project.version}
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-client
${project.version}
net.shrine
shrine-adapter-client-api
${project.version}
net.shrine
shrine-protocol
${project.version}
net.shrine
shrine-data-commons
${project.version}
log4j
log4j
com.sun.jersey.jersey-test-framework
jersey-test-framework-http
${jersey-version}
test
com.sun.jersey.contribs
jersey-simple-server
${jersey-version}
test
com.h2database
h2
test
org.easymock
easymock
test
org.springframework
spring-jdbc
test
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-data-commons
${project.version}
test-jar
test
org.codehaus.mojo
findbugs-maven-plugin
2.3.1
Max
org.codehaus.mojo
cobertura-maven-plugin
2.3
org.apache.maven.plugins
maven-checkstyle-plugin
2.5
org.apache.maven.plugins
maven-pmd-plugin
2.4
1.6
diff --git a/install/pom.xml b/install/pom.xml
index 0470578cf..ca2988b3e 100644
--- a/install/pom.xml
+++ b/install/pom.xml
@@ -1,35 +1,35 @@
4.0.0
SHRINE Install Scripts
shrine-install-scripts
pom
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
shrine-install-scripts
org.apache.maven.plugins
maven-assembly-plugin
src/main/assembly/assembly.xml
make-assembly
package
single
diff --git a/integration/pom.xml b/integration/pom.xml
index 821b8f506..5387e9642 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -1,119 +1,119 @@
4.0.0
SHRINE Integration Tests
shrine-integration-tests
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-crypto
${project.version}
test-jar
test
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-data-commons
${project.version}
test-jar
test
net.shrine
shrine-protocol
${project.version}
test
net.shrine
shrine-adapter-service
${project.version}
test
net.shrine
shrine-adapter-service
${project.version}
test-jar
test
net.shrine
shrine-adapter-client-api
${project.version}
test
net.shrine
shrine-broadcaster-aggregator
${project.version}
test
net.shrine
shrine-service
${project.version}
test
net.shrine
shrine-broadcaster-service
${project.version}
test
com.h2database
h2
test
org.slf4j
slf4j-log4j12
test
org.springframework
spring-jdbc
test
com.sun.jersey.jersey-test-framework
jersey-test-framework-http
${jersey-version}
test
com.sun.jersey.contribs
jersey-simple-server
${jersey-version}
test
diff --git a/pom.xml b/pom.xml
index af141b75a..b15ff1ef0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,361 +1,361 @@
4.0.0
SHRINE
net.shrine
shrine-base
pom
- 1.20.0
+ 1.20.1
UTF-8
4.1.6.RELEASE
2.6.2
2.11.7
2.11
4.12
1.7.12
1.2.17
1.19
2.2.5
3.2.0
0.9.6-RC3
1.2.1
1.4.185
3.3.1
5.1.35
2.3
3.0.1
0.9.5
1.3.3
2.3.8
2.3.11
3.2.11
3.0.0
apps/dashboard-app
apps/dashboard-war
apps/steward-app
apps/steward-war
apps/proxy
apps/shrine-app
apps/war
qep/service
hub/broadcaster-aggregator
hub/broadcaster-service
adapter/adapter-api
adapter/adapter-service
hms-support
tools
commons/util
commons/auth
commons/protocol-query
commons/data-commons
commons/protocol
commons/crypto
commons/client
commons/config
commons/ont-support
commons/test-commons
install
integration
shrine-webclient
net.alchim31.maven
scala-maven-plugin
${scala-maven-plugin-version}
compile
testCompile
incremental
true
-XX:+AggressiveOpts
-XX:CompileThreshold=500
-XX:+UseFastAccessorMethods
-XX:+UseStringCache
-XX:+OptimizeStringConcat
-XX:+TieredCompilation
-XX:+UseConcMarkSweepGC
-XX:+DoEscapeAnalysis
-server
-Xms64m
-Xmx1024m
-XX:MaxPermSize=384m
${scala-version}
-Xcheckinit
-unchecked
-deprecation
-Xlint:adapted-args,inaccessible,infer-any,missing-interpolator,private-shadow,type-parameter-shadow,unsound-match
maven-compiler-plugin
1.6
org.codehaus.mojo
buildnumber-maven-plugin
1.1
org.apache.maven.plugins
maven-jar-plugin
2.4
org.apache.maven.plugins
maven-war-plugin
2.1.1
org.codehaus.mojo
buildnumber-maven-plugin
validate
create
{0,date,yyyy-MM-dd HH:mm:ss}
(not available)
org.apache.maven.plugins
maven-jar-plugin
true
${buildNumber}
${scmBranch}
${timestamp}
org.apache.maven.plugins
maven-war-plugin
true
${buildNumber}
${scmBranch}
${timestamp}
org.apache.tomcat.maven
tomcat7-maven-plugin
2.2
true
true
true
true
http://shrine-dev1.catalyst:6060/shrine/rest/happy
scm:svn:https://open.med.harvard.edu/svn/shrine/trunk/code
scm:svn:https://open.med.harvard.edu/svn/shrine/trunk/code
https://open.med.harvard.edu/svn/shrine/trunk/code
CBMI-Nexus
https://repo.open.med.harvard.edu/nexus/content/groups/public/
com.typesafe
config
${typesafe-config-version}
log4j
log4j
${log4j-version}
org.springframework
spring-jdbc
${spring.version}
test
com.h2database
h2
${h2-version}
test
org.easymock
easymock
${easymock-version}
test
org.slf4j
slf4j-log4j12
${slf4j-version}
test
mysql
mysql-connector-java
${mysql-version}
net.sf.opencsv
opencsv
${opencsv-version}
net.liftweb
lift-json_${scala-major-version}
${lift-version}
com.sun.jersey
jersey-server
${jersey-version}
com.sun.jersey
jersey-servlet
${jersey-version}
com.sun.jersey
jersey-client
${jersey-version}
org.squeryl
squeryl_${scala-major-version}
${squeryl-version}
javax.servlet
javax.servlet-api
${servlet-api-version}
provided
org.scala-lang
scala-library
${scala-version}
junit
junit
${junit-version}
test
org.scalatest
scalatest_${scala-major-version}
${scalatest-version}
test
org.scala-lang
scala-actors
org.scala-lang
scala-reflect
org.scala-lang
scala-actors
${scala-version}
test
org.scala-lang
scala-reflect
${scala-version}
nexus
Nexus Repo
https://repo.open.med.harvard.edu/nexus/content/repositories/snapshots
false
nexus
Nexus Repo
https://repo.open.med.harvard.edu/nexus/content/repositories/releases
diff --git a/qep/service/pom.xml b/qep/service/pom.xml
index 7f05520f9..fbe3b501a 100644
--- a/qep/service/pom.xml
+++ b/qep/service/pom.xml
@@ -1,208 +1,208 @@
4.0.0
SHRINE Service
shrine-service
jar
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
../../pom.xml
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
false
org.squeryl
squeryl_${scala-major-version}
org.scala-lang
scalap
org.scala-lang
scalap
${scala-version}
com.sun.jersey
jersey-server
com.sun.jersey
jersey-client
net.shrine
shrine-auth
${project.version}
net.shrine
shrine-broadcaster-aggregator
${project.version}
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-client
${project.version}
net.shrine
shrine-adapter-client-api
${project.version}
net.shrine
shrine-protocol
${project.version}
net.shrine
shrine-data-commons
${project.version}
com.typesafe.slick
slick_2.11
${slick-version}
org.suecarter
freeslick_2.11
3.0.3.1
org.slf4j
slf4j-log4j12
${slf4j-version}
mysql
mysql-connector-java
log4j
log4j
com.sun.jersey.jersey-test-framework
jersey-test-framework-http
${jersey-version}
test
com.sun.jersey.contribs
jersey-simple-server
${jersey-version}
test
com.h2database
h2
test
org.easymock
easymock
test
org.springframework
spring-jdbc
test
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-data-commons
${project.version}
test-jar
test
net.shrine
shrine-config
${project.version}
test-jar
test
org.codehaus.mojo
findbugs-maven-plugin
2.3.1
Max
org.codehaus.mojo
cobertura-maven-plugin
2.3
org.apache.maven.plugins
maven-checkstyle-plugin
2.5
org.apache.maven.plugins
maven-pmd-plugin
2.4
1.6
diff --git a/shrine-webclient/pom.xml b/shrine-webclient/pom.xml
index 7cb2cd957..bc432592c 100644
--- a/shrine-webclient/pom.xml
+++ b/shrine-webclient/pom.xml
@@ -1,42 +1,42 @@
4.0.0
SHRINE Web Client
shrine-webclient
pom
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
1.5
2.4
maven-assembly-plugin
${assembly-plugin-version}
assembly
package
single
src/main/assembly/assembly.xml
diff --git a/shrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js b/shrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js
index 8c804e527..3620980d0 100644
--- a/shrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js
+++ b/shrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js
@@ -1,308 +1,341 @@
/**
* Created by ben on 10/13/15.
*/
var $hrine = window.$hrine = {};
$hrine.EnhancedError =
(function(){
var EnhancedError = {},
config = config || {
//@TODO:
};
/**
*
* @returns {{}}
*/
function simulateI2b2Obj() {
var self = {},
errorObject = {
summary: "SHRINE Failed to Start",
description: "The SHRINE software is not running at the queried" +
" site. This error must be corrected at the queried site.Check network status or contact your local SHRINE administrator. For faster assistance, expand this window and provide all text below this line to your local SHRINE administrator.",
details: "There is a fatal syntax error in the remote site's" +
" shrine.conf or another .conf file. The remote site admin should check to make sure that there are no stray/missing quotes or brackets, and that URLs are entered correctly.",
codec: ""
};
self.errorObject = errorObject;
self.dispDIV = document.getElementById('infoQueryStatusText');
self.dispDIV.innerHTML =
'
';
//which hospital
self.dispDIV.innerHTML +=
' Error Summary:
';
self.dispDIV.innerHTML += "
" +
"" + errorObject.summary + "";
return self;
}
/**
* Scope for error dialog.
*/
EnhancedError.createErrorDialogue = function (container, errorObjects) {
var anchors, btnExpand, btnContract, errorData, i2b2Obj;
//default error.
if(!container || !errorObjects) {
i2b2Obj = simulateI2b2Obj();
container = i2b2Obj.dispDIV;
errorObjects = [i2b2Obj.errorObject];
}
//this sets up the events.
anchors = container.getElementsByClassName('query-error-anchor');
//something's wrong captain, abandon ship!
if(!anchors.length|| !errorObjects.length) {
return;
}
addAnchorEvents();
function expandErrorDetailDiv (ev) {
var errorDetailDiv = $('errorDetailDiv');
btnExpand.style.display = 'none';
btnContract.style.display = 'inline';
errorDetailDiv.innerHTML = getExpandedHtml();
}
function retractErrorDetailDiv (ev) {
var errorDetailDiv = $('errorDetailDiv');
btnExpand.style.display = 'inline';
btnContract.style.display = 'none';
errorDetailDiv.innerHTML = getRetractedHtml();
}
- function onClick(event) {
- event.preventDefault();
-
- errorData = event.currentTarget.__errorData__;
+ function onClick(evt) {
+ //ie logic.
+ var currentTarget = (evt.currentTarget !== undefined)?
+ evt.currentTarget : evt.srcElement.parentElement.parentElement;
+ errorData = currentTarget.__errorData__;
btnExpand = document.getElementById('btnExpandErrorDetail');
btnContract = document.getElementById('btnContractErrorDetail');
// -- add event listeners for expand and contract as well --//
- btnExpand.addEventListener('click', expandErrorDetailDiv, false);
- btnContract.addEventListener('click', retractErrorDetailDiv, false);
+ addEventListener(btnExpand, 'click', expandErrorDetailDiv, false);
+ addEventListener(btnContract,'click', retractErrorDetailDiv, false);
showErrorDetail(errorData);
}
/**
*
* @param errorData
* @returns {string}
*/
function getRetractedHtml () {
var wikiBaseUrl = (i2b2.hive.cfg.wikiBaseUrl || 'https://open.med.harvard.edu/wiki/display/SHRINE/');
if(wikiBaseUrl.lastIndexOf('/') !== wikiBaseUrl.length -1){
wikiBaseUrl += '/';
}
var retractedHtml = '
Summary:
'+
'
' + errorData.summary + '
' +
'
Description:
'+
'
' + errorData.description + '
' +
'
';
return retractedHtml;
}
/**
*
* @param errorData
* @returns {string}
*/
function getExpandedHtml () {
var expandedHtml = getRetractedHtml() +
'
' +
'
Copy the text below and paste it in an email to your site administrator for a faster response.
' +
'
' +
'
Technical Details:
' + errorData.details + '
' +
'
Codec:
' + errorData.codec + '
' +
'
Stamp:
' + errorData.stamp + '
' +
'
Stack Trace Name:
' + errorData.exception.name + '
' +
'
Stack Trace Message:
' + errorData.exception.message + '
' +
'
Stack Trace Details:
' + errorData.exception.stackTrace + '
';
return expandedHtml;
}
/**
*
* @param detailObj
*/
function showErrorDetail(detailObj) {
var handleCancel = function() {
this.cancel();
removeAllEvents();
retractErrorDetailDiv();
}
var dialogErrorDetail = new YAHOO.widget.SimpleDialog("dialogErrorDetail", {
width: "820px",
fixedcenter: true,
constraintoviewport: true,
modal: true,
zindex: 700,
buttons: [ {
text: "Done",
handler: handleCancel,
isDefault: true
}]
});
dialogErrorDetail._doClose = function (e) {
- e.preventDefault();
this.cancel();
removeAllEvents();
retractErrorDetailDiv();
}
$('dialogErrorDetail').show();
dialogErrorDetail.validate = function(){
return true;
};
dialogErrorDetail.render(document.body);
// / display the dialoge
dialogErrorDetail.center();
dialogErrorDetail.show();
$('errorDetailDiv').innerHTML = getRetractedHtml();
}
function addAnchorEvents () {
var el, length = anchors.length;
// -- will need to iterate over these once they are created and add event listeners.
for(var i = 0; i < length; i ++) {
var el = anchors[i];
el.__errorData__ = errorObjects[i];
- el.addEventListener('click', onClick, false);
+ addEventListener(el, 'click', onClick, false);
}
}
function removeAllEvents () {
- btnExpand.removeEventListener('click', expandErrorDetailDiv);
- btnContract.removeEventListener('click', retractErrorDetailDiv);
+ removeEventListener(btnExpand, 'click', expandErrorDetailDiv);
+ removeEventListener(btnContract, 'click', retractErrorDetailDiv);
}
}
/**
* Parse problem node.
* @param qriNode
* @returns {{exception: {}}}
*/
EnhancedError.parseProblem = function (qriNode) {
var details,
problem = {
exception: {}
};
problem.codec = grabXmlNodeData(qriNode, 'descendant-or-self::query_status_type/problem/codec');
problem.summary = grabXmlNodeData(qriNode, 'descendant-or-self::query_status_type/problem/summary');
problem.description = grabXmlNodeData(qriNode, 'descendant-or-self::query_status_type/problem/description');
problem.stamp = grabXmlNodeData(qriNode, 'descendant-or-self::query_status_type/problem/stamp');
//unescape embedded html.
details = i2b2.h.XPath(qriNode, 'descendant-or-self::query_status_type/problem/details')
//funky stuff goin' on...get outta here!
if(!details.length) {
problem.exception.name = problem.exception.message = problem.stackTrace =
problem.codec = problem.summary = 'An unexpected error has occurred.';
}
//error format as expected.
else{
- problem.details = details[0].innerHTML.unescapeHTML().replace(/(<([^>]+)>)/ig,"");
+ var innerHTML = (details[0].xml !== undefined)?
+ details[0].xml : details[0].innerHTML;
+ problem.details = innerHTML.unescapeHTML().replace(/(<([^>]+)>)/ig,"");
problem.exception.name = grabXmlNodeData(qriNode, 'descendant-or-self::query_status_type/problem/details/exception/name');
problem.exception.message = grabXmlNodeData(qriNode, 'descendant-or-self::query_status_type/problem/details/exception/message');
problem.exception.stackTrace = parseErrorException(qriNode);
}
return problem;
}
/**
* Replace all
and with
tags.
* @param node
* @returns {*}
*/
function parseErrorException(node) {
+ var innerHTML = (node.xml !== undefined)? node.xml : node.innerHTML;
+
//no exception, abandon ship!
- if(node.innerHTML.indexOf('') == -1){
+ if(innerHTML.indexOf('') == -1){
return '';
}
var content, startIdx, endIdx;
//fish out the problem section.
- content = node.innerHTML.split('')
+ content = innerHTML.split('')
.join()
.split('')
.join();
//fish out the first stack trace.
startIdx = content.indexOf('') + 12;
endIdx = content.indexOf('');
content = content.substring(startIdx, endIdx);
//remove all line tags and replace with line break.
content = content.split('')
.join('')
.split('')
.join()
//remove all exception tags
.split('')
.join('
')
.split('')
.join()
//remove all stacktrace tags
.split('')
.join('
')
.split('')
.join()
//remove all message tags.
.split('')
.join('
')
.split('')
.join();
return content;
}
/**
* Grab data for node, return empty string if none.
* @param node
* @param xPathString
* @returns {string}
*/
function grabXmlNodeData(node, xPathString){
var nodeVal = i2b2.h.XPath(node, xPathString);
- return (nodeVal.length)? nodeVal[0].innerHTML : '';
+ return (nodeVal.length)? nodeVal[0].firstChild.nodeValue : '';
+ }
+
+ /**
+ *
+ * @param el
+ * @param event
+ * @param callback
+ */
+ function addEventListener(el, event, callback) {
+
+ if(el.addEventListener !== undefined) {
+ el.addEventListener(event, callback, false);
+ } else {
+ el.attachEvent('on' + event, callback)
+ }
+ }
+
+ /**
+ *
+ * @param el
+ * @param event
+ * @param callback
+ */
+ function removeEventListener(el, event, callback) {
+ if(el.removeEventListener !== undefined) {
+ el.removeEventListener(event, callback);
+ } else {
+ el.detachEvent('on' + event, callback);
+ }
}
return EnhancedError;
})();
\ No newline at end of file
diff --git a/tools/batch-querier/pom.xml b/tools/batch-querier/pom.xml
index db497827d..2dd2c8c44 100644
--- a/tools/batch-querier/pom.xml
+++ b/tools/batch-querier/pom.xml
@@ -1,87 +1,87 @@
4.0.0
SHRINE Query Automation Utility
shrine-batch-querier-utility
jar
net.shrine
shrine-tools
- 1.20.0
+ 1.20.1
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-client
${project.version}
net.shrine
shrine-utility-commons
${project.version}
net.shrine
shrine-utility-commons
${project.version}
test-jar
test
net.shrine
shrine-test-commons
${project.version}
test-jar
test
org.rogach
scallop_${scala-major-version}
${scallop-version}
net.sf.opencsv
opencsv
com.typesafe
config
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
maven-assembly-plugin
shrine-batch-querier-${project.version}
false
diff --git a/tools/mapping-automation/pom.xml b/tools/mapping-automation/pom.xml
index 05929fb36..63ec2d52f 100644
--- a/tools/mapping-automation/pom.xml
+++ b/tools/mapping-automation/pom.xml
@@ -1,86 +1,86 @@
4.0.0
SHRINE Term Mapping Automation Utilities
shrine-mapping-automation
jar
net.shrine
shrine-tools
- 1.20.0
+ 1.20.1
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-config
${project.version}
net.shrine
shrine-ont-support
${project.version}
net.shrine
shrine-utility-commons
${project.version}
net.shrine
shrine-utility-commons
${project.version}
test-jar
test
org.rogach
scallop_${scala-major-version}
${scallop-version}
net.sf.opencsv
opencsv
com.typesafe
config
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
maven-assembly-plugin
shrine-mapping-tools-${project.version}
false
diff --git a/tools/monitor/pom.xml b/tools/monitor/pom.xml
index a45132805..1cadbb261 100644
--- a/tools/monitor/pom.xml
+++ b/tools/monitor/pom.xml
@@ -1,91 +1,91 @@
4.0.0
SHRINE Monitor Utilities
shrine-monitor-utilities
jar
net.shrine
shrine-tools
- 1.20.0
+ 1.20.1
ant
ant-javamail
1.6.5
net.shrine
shrine-broadcaster-aggregator
${project.version}
net.shrine
shrine-config
${project.version}
org.codehaus.groovy.modules.http-builder
http-builder
0.5.1
org.codehaus.groovy
groovy
org.codehaus.gmaven.runtime
gmaven-runtime-1.7
1.3
mysql
mysql-connector-java
com.h2database
h2
test
net.sf.opencsv
opencsv
org.apache.commons
commons-email
1.2
org.codehaus.gmaven
gmaven-plugin
maven-assembly-plugin
shrine-monitor-${project.version}.zip
false
diff --git a/tools/pom.xml b/tools/pom.xml
index b0cef35fd..8a5be0622 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -1,80 +1,80 @@
4.0.0
SHRINE Tools
shrine-tools
pom
net.shrine
shrine-base
- 1.20.0
+ 1.20.1
1.5
2.4
monitor
utility-commons
scanner
batch-querier
mapping-automation
net.shrine
shrine-protocol
${project.version}
org.codehaus.gmaven
gmaven-plugin
${gmaven-plugin-version}
compile
testCompile
true
true
true
maven-assembly-plugin
${assembly-plugin-version}
assembly
package
single
src/main/assembly/assembly.xml
diff --git a/tools/scanner/pom.xml b/tools/scanner/pom.xml
index 4919e73f7..712b193fc 100644
--- a/tools/scanner/pom.xml
+++ b/tools/scanner/pom.xml
@@ -1,104 +1,104 @@
4.0.0
SHRINE Scanner Utility
shrine-scanner-utility
jar
net.shrine
shrine-tools
- 1.20.0
+ 1.20.1
net.shrine
shrine-test-commons
${project.version}
test-jar
test
net.shrine
shrine-ont-support
${project.version}
net.shrine
shrine-hms-core
${project.version}
net.shrine
shrine-config
${project.version}
net.shrine
shrine-crypto
${project.version}
net.shrine
shrine-utility-commons
${project.version}
net.shrine
shrine-utility-commons
${project.version}
test-jar
test
org.rogach
scallop_${scala-major-version}
${scallop-version}
net.sf.opencsv
opencsv
com.typesafe
config
net.shrine
shrine-broadcaster-aggregator
${project.version}
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
maven-assembly-plugin
shrine-scanner-${project.version}
false
diff --git a/tools/utility-commons/pom.xml b/tools/utility-commons/pom.xml
index 7d554e36c..9efd8203f 100644
--- a/tools/utility-commons/pom.xml
+++ b/tools/utility-commons/pom.xml
@@ -1,65 +1,65 @@
4.0.0
SHRINE Common Classes for Utilities
shrine-utility-commons
jar
net.shrine
shrine-tools
- 1.20.0
+ 1.20.1
net.shrine
shrine-test-commons
${project.version}
test-jar
test
org.rogach
scallop_${scala-major-version}
${scallop-version}
net.sf.opencsv
opencsv
com.typesafe
config
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
org.apache.maven.plugins
maven-jar-plugin
test-jar