diff --git a/adapter/adapter-api/pom.xml b/adapter/adapter-api/pom.xml
index 908f083f6..8580ca967 100644
--- a/adapter/adapter-api/pom.xml
+++ b/adapter/adapter-api/pom.xml
@@ -1,74 +1,74 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Adapter Client API</name>
<artifactId>shrine-adapter-client-api</artifactId>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Test Scoped dependencies -->
<!-- For Jersey's in-process web server JAX-RS testing framework -->
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-http</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-simple-server</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- End Test Scoped dependencies -->
</dependencies>
</project>
diff --git a/adapter/adapter-service/pom.xml b/adapter/adapter-service/pom.xml
index b2a847c6c..8d5877aeb 100644
--- a/adapter/adapter-service/pom.xml
+++ b/adapter/adapter-service/pom.xml
@@ -1,180 +1,180 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Adapter</name>
<artifactId>shrine-adapter-service</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.squeryl</groupId>
<artifactId>squeryl_${scala-major-version}</artifactId>
<exclusions>
<!-- Exclude scalap, because it pulls in an old version of scala-compiler -->
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Replace older transitive dependency pulled in by Squeryl -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
<version>${scala-version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-auth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-client-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.slick</groupId>
<artifactId>slick_2.11</artifactId>
<version>${slick-version}</version>
</dependency>
<dependency>
<groupId>org.suecarter</groupId>
<artifactId>freeslick_2.11</artifactId>
<version>${freeslick-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!--Test scoped dependencies below this comment -->
<!-- Test Scoped dependencies -->
<!-- For Jersey's in-process web server JAX-RS testing framework -->
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-http</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-simple-server</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-util</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/apps/dashboard-app/pom.xml b/apps/dashboard-app/pom.xml
index 5ec74e0e0..78b14b7c8 100644
--- a/apps/dashboard-app/pom.xml
+++ b/apps/dashboard-app/pom.xml
@@ -1,200 +1,200 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>shrine-base</artifactId>
<groupId>net.shrine</groupId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dashboard-app</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<name>Dashboard App</name>
<packaging>jar</packaging>
<build>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<!-- NB! Set <version> to the latest released version of frontend-maven-plugin, like in README.md -->
<version>0.0.23</version>
<!-- point to front end -->
<configuration>
<workingDirectory>src/main/js</workingDirectory>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v0.10.33</nodeVersion>
<npmVersion>2.7.4</npmVersion>
<!-- <downloadRoot>https://catalyst-artifacts.s3.amazonaws.com/</downloadRoot>-->
</configuration>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<!-- optional: default phase is "generate-resources" -->
<phase>generate-resources</phase>
<configuration>
<!-- optional: The default argument is actually
"install", so unless you need to run some other npm command,
you can remove this whole <configuration> section.
-->
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<id>bower install</id>
<goals>
<goal>bower</goal>
</goals>
<configuration>
<!-- optional: The default argument is actually
"install", so unless you need to run some other bower command,
you can remove this whole <configuration> section.
-->
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<id>grunt default</id>
<goals>
<goal>grunt</goal>
</goals>
<configuration>
<arguments>--no-color</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-routing_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-servlet_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-util_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-testkit_2.11</artifactId>
<version>${spray-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.11</artifactId>
<version>${akka-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-slf4j_2.11</artifactId>
<version>${akka-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.11</artifactId>
<version>${akka-testkit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-native_2.11</artifactId>
<version>${json4s-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.slick</groupId>
<artifactId>slick_2.11</artifactId>
<version>${slick-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-utility-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-auth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-version}</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.6.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-client-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>${typesafe-config-version}</version>
</dependency>
</dependencies>
</project>
diff --git a/apps/dashboard-war/pom.xml b/apps/dashboard-war/pom.xml
index 7d80d15fc..9b6c48779 100644
--- a/apps/dashboard-war/pom.xml
+++ b/apps/dashboard-war/pom.xml
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>shrine-base</artifactId>
<groupId>net.shrine</groupId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dashboard-war</artifactId>
<name>Dashboard War</name>
<packaging>war</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>shrine-dashboard</warName>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>dashboard-app</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
diff --git a/apps/meta-app/pom.xml b/apps/meta-app/pom.xml
index 8bcfadbdb..187eb1d67 100644
--- a/apps/meta-app/pom.xml
+++ b/apps/meta-app/pom.xml
@@ -1,92 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>shrine-base</artifactId>
<groupId>net.shrine</groupId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>meta-app</artifactId>
<name>MetaData App</name>
<packaging>jar</packaging>
<build>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-utility-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-routing_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-servlet_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-util_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-testkit_2.11</artifactId>
<version>${spray-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.11</artifactId>
<version>${akka-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-slf4j_2.11</artifactId>
<version>${akka-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.11</artifactId>
<version>${akka-testkit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-native_2.11</artifactId>
<version>${json4s-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>${typesafe-config-version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-version}</version>
</dependency>
</dependencies>
</project>
diff --git a/apps/meta-war/pom.xml b/apps/meta-war/pom.xml
index bbc53520b..b220fdf11 100644
--- a/apps/meta-war/pom.xml
+++ b/apps/meta-war/pom.xml
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>shrine-base</artifactId>
<groupId>net.shrine</groupId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>meta-war</artifactId>
<name>MetaData War</name>
<packaging>war</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>shrine-metadata</warName>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>meta-app</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
diff --git a/apps/proxy/pom.xml b/apps/proxy/pom.xml
index b321acb33..d5def78e9 100644
--- a/apps/proxy/pom.xml
+++ b/apps/proxy/pom.xml
@@ -1,52 +1,52 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Proxy</name>
<artifactId>shrine-proxy</artifactId>
<packaging>war</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<finalName>shrine-proxy</finalName>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
diff --git a/apps/shrine-app/pom.xml b/apps/shrine-app/pom.xml
index 33c3227ea..9465a0020 100644
--- a/apps/shrine-app/pom.xml
+++ b/apps/shrine-app/pom.xml
@@ -1,118 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>shrine-base</artifactId>
<groupId>net.shrine</groupId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shrine-app</artifactId>
<name>SHRINE App</name>
<packaging>jar</packaging>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-hms-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-qep</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-broadcaster-aggregator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-broadcaster-service</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-service</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-ont-support</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-broadcaster-aggregator</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-native_2.11</artifactId>
<version>${json4s-version}</version>
</dependency>
</dependencies>
</project>
diff --git a/apps/steward-app/pom.xml b/apps/steward-app/pom.xml
index 968bfbc4f..08fcb2149 100644
--- a/apps/steward-app/pom.xml
+++ b/apps/steward-app/pom.xml
@@ -1,177 +1,177 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>shrine-base</artifactId>
<groupId>net.shrine</groupId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>steward-app</artifactId>
<name>Steward App</name>
<packaging>jar</packaging>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<!-- https://github.com/eirslett/frontend-maven-plugin -->
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<!-- NB! Set <version> to the latest released version of frontend-maven-plugin, like in README.md -->
<version>1.0</version>
<!-- point it to JS -->
<configuration>
<workingDirectory>src/main/js</workingDirectory>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v6.2.2</nodeVersion>
<npmVersion>3.10.3</npmVersion>
</configuration>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<!-- optional: default phase is "generate-resources" -->
<phase>generate-resources</phase>
</execution>
<execution>
<id>bower install</id>
<goals>
<goal>bower</goal>
</goals>
</execution>
<execution>
<id>gulp test and build</id>
<goals>
<goal>gulp</goal>
</goals>
<configuration>
<arguments>--no-color</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-routing_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-servlet_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-util_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-testkit_2.11</artifactId>
<version>${spray-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.11</artifactId>
<version>${akka-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-slf4j_2.11</artifactId>
<version>${akka-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.11</artifactId>
<version>${akka-testkit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-native_2.11</artifactId>
<version>${json4s-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.slick</groupId>
<artifactId>slick_2.11</artifactId>
<version>${slick-version}</version>
</dependency>
<dependency>
<groupId>org.suecarter</groupId>
<artifactId>freeslick_2.11</artifactId>
<version>${freeslick-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-email</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-auth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-version}</version>
</dependency>
</dependencies>
</project>
diff --git a/apps/steward-war/pom.xml b/apps/steward-war/pom.xml
index b229dae27..ce8740c74 100644
--- a/apps/steward-war/pom.xml
+++ b/apps/steward-war/pom.xml
@@ -1,43 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>shrine-base</artifactId>
<groupId>net.shrine</groupId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>steward</artifactId>
<name>Steward War</name>
<packaging>war</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>steward</warName>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>steward-app</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
diff --git a/apps/war/pom.xml b/apps/war/pom.xml
index aca2ea3da..b2008863a 100644
--- a/apps/war/pom.xml
+++ b/apps/war/pom.xml
@@ -1,58 +1,58 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE War</name>
<artifactId>shrine-war</artifactId>
<packaging>war</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-app</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-service</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-service</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>shrine-cell</finalName>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
diff --git a/commons/auth/pom.xml b/commons/auth/pom.xml
index 9c95099b7..a3a081048 100644
--- a/commons/auth/pom.xml
+++ b/commons/auth/pom.xml
@@ -1,97 +1,97 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Auth*</name>
<artifactId>shrine-auth</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.11</artifactId>
<version>${akka-version}</version>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-native_2.11</artifactId>
<version>${json4s-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-client_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-routing_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-servlet_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-util_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-testkit_2.11</artifactId>
<version>${spray-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-slf4j_2.11</artifactId>
<version>${akka-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.11</artifactId>
<version>${akka-version}</version>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>net.shrine</groupId>
<artifactId>steward</artifactId>
<version>${project.version}</version>
</dependency>
-->
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
diff --git a/commons/client/pom.xml b/commons/client/pom.xml
index f50883011..5f7b6f598 100644
--- a/commons/client/pom.xml
+++ b/commons/client/pom.xml
@@ -1,68 +1,68 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Client</name>
<artifactId>shrine-client</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
diff --git a/commons/config/pom.xml b/commons/config/pom.xml
index 0c32ee071..c9fb371a4 100644
--- a/commons/config/pom.xml
+++ b/commons/config/pom.xml
@@ -1,56 +1,56 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Config</name>
<artifactId>shrine-config</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- For reading CSV data -->
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-util</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
diff --git a/commons/crypto/pom.xml b/commons/crypto/pom.xml
index 6fd855138..1d5dde24f 100644
--- a/commons/crypto/pom.xml
+++ b/commons/crypto/pom.xml
@@ -1,58 +1,58 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Crypto</name>
<artifactId>shrine-crypto</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncy-castle-version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
diff --git a/commons/data-commons/pom.xml b/commons/data-commons/pom.xml
index 0db045728..2b8f80271 100644
--- a/commons/data-commons/pom.xml
+++ b/commons/data-commons/pom.xml
@@ -1,87 +1,87 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Data Access Classes</name>
<artifactId>shrine-data-commons</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.suecarter</groupId>
<artifactId>freeslick_2.11</artifactId>
<version>${freeslick-version}</version>
</dependency>
<dependency>
<groupId>org.squeryl</groupId>
<artifactId>squeryl_${scala-major-version}</artifactId>
<exclusions>
<!-- Exclude scalap, because it pulls in an old version of scala-compiler -->
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Replace older transitive dependency pulled in by Squeryl -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
<version>${scala-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/commons/email/pom.xml b/commons/email/pom.xml
index 98c5642e1..07a6f4368 100644
--- a/commons/email/pom.xml
+++ b/commons/email/pom.xml
@@ -1,71 +1,71 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Email</name>
<artifactId>shrine-email</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-native_2.11</artifactId>
<version>${json4s-version}</version>
</dependency>
<dependency>
<groupId>me.lessis</groupId>
<artifactId>courier_2.11</artifactId>
<version>0.1.3</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jvnet.mock-javamail</groupId>
<artifactId>mock-javamail</artifactId>
<version>1.9</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
diff --git a/commons/ont-support/pom.xml b/commons/ont-support/pom.xml
index d1460f2f5..aee9b0db6 100644
--- a/commons/ont-support/pom.xml
+++ b/commons/ont-support/pom.xml
@@ -1,63 +1,63 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Ontology Support</name>
<artifactId>shrine-ont-support</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
diff --git a/commons/protocol-query/pom.xml b/commons/protocol-query/pom.xml
index d9c33b077..295bbb77a 100644
--- a/commons/protocol-query/pom.xml
+++ b/commons/protocol-query/pom.xml
@@ -1,57 +1,57 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Query Protocol</name>
<artifactId>shrine-protocol-query</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-json_${scala-major-version}</artifactId>
<exclusions>
<!-- Exclude scalap, because it pulls in an old version of scala-compiler -->
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Replace older transitive dependency pulled in by Lift-Json -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
<version>${scala-version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-util</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
diff --git a/commons/protocol/pom.xml b/commons/protocol/pom.xml
index 306e02cd8..00d1f13bc 100644
--- a/commons/protocol/pom.xml
+++ b/commons/protocol/pom.xml
@@ -1,91 +1,91 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Protocol</name>
<artifactId>shrine-protocol</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol-query</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-util</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-json_${scala-major-version}</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>shrine-versions.properties</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
diff --git a/commons/test-commons/pom.xml b/commons/test-commons/pom.xml
index 404a85faf..af2b4a6e1 100644
--- a/commons/test-commons/pom.xml
+++ b/commons/test-commons/pom.xml
@@ -1,48 +1,48 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Test Commons</name>
<artifactId>shrine-test-commons</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-http</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
diff --git a/commons/util/pom.xml b/commons/util/pom.xml
index c8615510d..8ff8df3bc 100644
--- a/commons/util/pom.xml
+++ b/commons/util/pom.xml
@@ -1,102 +1,102 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Utility Code</name>
<artifactId>shrine-util</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>com.typesafe.slick</groupId>
<artifactId>slick_2.11</artifactId>
<version>${slick-version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-httpx_2.11</artifactId>
<version>${spray-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.6.4</version>
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-json_${scala-major-version}</artifactId>
<exclusions>
<!-- Exclude scalap, because it pulls in an old version of scala-compiler -->
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Replace older transitive dependency pulled in by Lift-Json -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
<version>${scala-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-native_2.11</artifactId>
<version>${json4s-version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>shrine-versions.properties</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
diff --git a/hms-support/hms-core/pom.xml b/hms-support/hms-core/pom.xml
index 4ef2088a3..528b32d88 100644
--- a/hms-support/hms-core/pom.xml
+++ b/hms-support/hms-core/pom.xml
@@ -1,62 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-hms-support</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shrine-hms-core</artifactId>
<name>SHRINE HMS Support (Core Classes)</name>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-auth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
diff --git a/hms-support/pom.xml b/hms-support/pom.xml
index 5976a12f1..224a5700c 100644
--- a/hms-support/pom.xml
+++ b/hms-support/pom.xml
@@ -1,15 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE HMS Support</name>
<artifactId>shrine-hms-support</artifactId>
<packaging>pom</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<modules>
<module>hms-core</module>
</modules>
</project>
diff --git a/hub/broadcaster-aggregator/pom.xml b/hub/broadcaster-aggregator/pom.xml
index 200a92bf5..2aa93dc57 100644
--- a/hub/broadcaster-aggregator/pom.xml
+++ b/hub/broadcaster-aggregator/pom.xml
@@ -1,161 +1,161 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Broadcaster Aggregator</name>
<artifactId>shrine-broadcaster-aggregator</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
<version>1.0-beta-1</version>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-client-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- Test Scoped dependencies -->
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-util</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- For Jersey's in-process web server JAX-RS testing framework -->
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-http</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-simple-server</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<effort>Max</effort>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.4</version>
<configuration>
<targetJdk>1.6</targetJdk>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
diff --git a/hub/broadcaster-service/pom.xml b/hub/broadcaster-service/pom.xml
index 100c613e9..64862bba8 100644
--- a/hub/broadcaster-service/pom.xml
+++ b/hub/broadcaster-service/pom.xml
@@ -1,148 +1,148 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Broadcast Service</name>
<artifactId>shrine-broadcaster-service</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-broadcaster-aggregator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-client-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<!-- Test Scoped dependencies -->
<!-- For Jersey's in-process web server JAX-RS testing framework -->
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-http</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-simple-server</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<effort>Max</effort>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.4</version>
<configuration>
<targetJdk>1.6</targetJdk>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
diff --git a/install/pom.xml b/install/pom.xml
index c848fa448..7629d8c86 100644
--- a/install/pom.xml
+++ b/install/pom.xml
@@ -1,34 +1,34 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Install Scripts</name>
<artifactId>shrine-install-scripts</artifactId>
<packaging>pom</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<build>
<finalName>shrine-install-scripts</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
diff --git a/integration/pom.xml b/integration/pom.xml
index 020d7c581..396fe0aba 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -1,127 +1,127 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Integration Tests</name>
<artifactId>shrine-integration-tests</artifactId>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-service</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-service</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-client-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-broadcaster-aggregator</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-qep</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-broadcaster-service</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-http</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-simple-server</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/com.typesafe.slick/slick-hikaricp_2.11 -->
<dependency>
<groupId>com.typesafe.slick</groupId>
<artifactId>slick-hikaricp_2.11</artifactId>
<version>${slick-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index dab0c47b1..5afb50503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,387 +1,387 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE</name>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
<packaging>pom</packaging>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<!-- -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>4.2.5.RELEASE</spring.version>
<lift-version>2.6.2</lift-version> <!-- todo where do we use lift? If it's the json library, shift to json4s -->
<scala-version>2.11.8</scala-version>
<scala-major-version>2.11</scala-major-version>
<junit-version>4.12</junit-version>
<slf4j-version>1.7.18</slf4j-version>
<log4j-version>1.2.17</log4j-version> <!-- todo log4j 1 is EOL. Use something else. -->
<jersey-version>1.19</jersey-version> <!-- todo jersey moved into glassfish. Need to update all its dependencies-->
<scalatest-version>2.2.6</scalatest-version>
<scala-maven-plugin-version>3.2.2</scala-maven-plugin-version>
<squeryl-version>0.9.6-RC4</squeryl-version>
<typesafe-config-version>1.2.1</typesafe-config-version> <!-- 1.3.0 compiled with JDK 8-->
<h2-version>1.4.191</h2-version>
<easymock-version>3.4</easymock-version>
<mysql-version>5.1.38</mysql-version>
<opencsv-version>2.3</opencsv-version>
<servlet-api-version>3.0.1</servlet-api-version><!-- for tomcat 8, you can go to 3.1.0 -->
<scallop-version>0.9.5</scallop-version><!-- Tried 1.0.0 and got compile errors todo revist next pass -->
<spray-version>1.3.3</spray-version>
<akka-version>2.3.14</akka-version><!-- 2.4.0 compiled with JDK 8 -->
<akka-testkit-version>2.4.0</akka-testkit-version>
<json4s-version>3.3.0</json4s-version>
<slick-version>3.1.1</slick-version>
<freeslick-version>3.1.1.1</freeslick-version>
<bouncy-castle-version>1.55</bouncy-castle-version>
</properties>
<!-- -->
<modules>
<module>apps/meta-app</module>
<module>apps/meta-war</module>
<module>apps/dashboard-app</module>
<module>apps/dashboard-war</module>
<module>apps/steward-app</module>
<module>apps/steward-war</module>
<module>apps/proxy</module>
<module>apps/shrine-app</module>
<module>apps/war</module>
<module>qep/service</module>
<module>hub/broadcaster-aggregator</module>
<module>hub/broadcaster-service</module>
<module>adapter/adapter-api</module>
<module>adapter/adapter-service</module>
<module>hms-support</module>
<module>tools</module>
<module>commons/util</module>
<module>commons/email</module>
<module>commons/auth</module>
<module>commons/protocol-query</module>
<module>commons/data-commons</module>
<module>commons/protocol</module>
<module>commons/crypto</module>
<module>commons/client</module>
<module>commons/config</module>
<module>commons/ont-support</module>
<module>commons/test-commons</module>
<module>install</module>
<module>integration</module>
<module>shrine-webclient</module>
</modules>
<!-- -->
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>${scala-maven-plugin-version}</version>
<executions>
<!-- Allows Java and Scala code to be compiled together and call each other -->
<execution>
<id>compile</id>
<goals>
<goal>compile</goal>
</goals>
<phase>compile</phase>
</execution>
<execution>
<id>test-compile</id>
<goals>
<goal>testCompile</goal>
</goals>
<phase>test-compile</phase>
</execution>
<execution>
<phase>process-resources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
<configuration>
<!-- NB: recompileMode must be set to 'incremental' to get Zinc support; just
setting useZincServer to true won't do it :( -->
<recompileMode>incremental</recompileMode>
<useZincServer>true</useZincServer>
<jvmArgs>
<jvmArg>-XX:+AggressiveOpts</jvmArg>
<jvmArg>-XX:CompileThreshold=500</jvmArg>
<jvmArg>-XX:+UseFastAccessorMethods</jvmArg>
<jvmArg>-XX:+UseStringCache</jvmArg>
<jvmArg>-XX:+OptimizeStringConcat</jvmArg>
<jvmArg>-XX:+TieredCompilation</jvmArg>
<jvmArg>-XX:+UseConcMarkSweepGC</jvmArg>
<jvmArg>-XX:+DoEscapeAnalysis</jvmArg>
<jvmArg>-server</jvmArg>
<jvmArg>-Xms64m</jvmArg>
<jvmArg>-Xmx1024m</jvmArg>
<jvmArg>-XX:MaxPermSize=384m</jvmArg>
</jvmArgs>
<scalaVersion>${scala-version}</scalaVersion>
<args>
<arg>-Xcheckinit</arg>
<arg>-unchecked</arg>
<arg>-deprecation</arg>
<arg>-Xlint:adapted-args,inaccessible,infer-any,missing-interpolator,private-shadow,type-parameter-shadow,unsound-match</arg>
<!--<arg>-Xfatal-warnings</arg>-->
</args>
<source>7</source>
<target>7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>7</source>
<target>7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<!-- use explicit version because 1.0-beta-4 came with borked checksums -->
<version>1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!-- This creates properties ${timestamp} and ${buildNumber} (the SCM
revision number) -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<timestampFormat>{0,date,yyyy-MM-dd HH:mm:ss}</timestampFormat>
<revisionOnScmFailure>(not available)</revisionOnScmFailure>
</configuration>
</plugin>
<!-- Add versioning information to jars and wars -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<SCM-Revision>${buildNumber}</SCM-Revision>
<SCM-Branch>${scmBranch}</SCM-Branch>
<buildDate>${timestamp}</buildDate>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<SCM-Revision>${buildNumber}</SCM-Revision>
<SCM-Branch>${scmBranch}</SCM-Branch>
<buildDate>${timestamp}</buildDate>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
<configuration>
<useTestClasspath>true</useTestClasspath>
<systemProperties>
<shrine.steward.gruntWatch>true</shrine.steward.gruntWatch>
<shrine.steward.database.createTablesOnStart>true</shrine.steward.database.createTablesOnStart>
<shrine.dashboard.gruntWatch>true</shrine.dashboard.gruntWatch>
<shrine.dashboard.happyBaseUrl>http://shrine-dev1.catalyst:6060/shrine/rest/happy</shrine.dashboard.happyBaseUrl>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
<!-- -->
<scm>
<developerConnection>scm:git:https://open.med.harvard.edu/stash/scm/shrine/shrine.git</developerConnection>
</scm>
<!-- -->
<repositories>
<!-- <repository> <id>CBMI-Nexus</id> <url>https://repo.open.med.harvard.edu/nexus/content/groups/public/</url>
<snapshots> <enabled>true</enabled> </snapshots> <releases> <enabled>true</enabled>
</releases> </repository> -->
</repositories>
<!-- -->
<pluginRepositories>
<pluginRepository>
<id>CBMI-Nexus</id>
<url>https://repo.open.med.harvard.edu/nexus/content/groups/public/</url>
</pluginRepository>
</pluginRepositories>
<!-- -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>${typesafe-config-version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easymock-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-version}</version>
</dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>${opencsv-version}</version>
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-json_${scala-major-version}</artifactId>
<version>${lift-version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.squeryl</groupId>
<artifactId>squeryl_${scala-major-version}</artifactId>
<version>${squeryl-version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet-api-version}</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncy-castle-version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<!-- -->
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala-major-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
<exclusions>
<!-- Exclude old (Scala 2.10.0) transitive dependencies -->
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-actors</artifactId>
</exclusion>
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Re-add transitive dependencies for ScalaTest with up-to-date Scala
versions -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-actors</artifactId>
<version>${scala-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
<version>${scala-version}</version>
</dependency>
</dependencies>
<!-- -->
<distributionManagement>
<snapshotRepository>
<id>nexus</id>
<name>Nexus Repo</name>
<url>https://repo.open.med.harvard.edu/nexus/content/repositories/snapshots</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
<repository>
<id>nexus</id>
<name>Nexus Repo</name>
<url>https://repo.open.med.harvard.edu/nexus/content/repositories/releases</url>
</repository>
</distributionManagement>
</project>
diff --git a/qep/service/pom.xml b/qep/service/pom.xml
index 18ec39e50..444fc26f9 100644
--- a/qep/service/pom.xml
+++ b/qep/service/pom.xml
@@ -1,218 +1,218 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Service</name>
<artifactId>shrine-qep</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<configuration>
<useTestClasspath>false</useTestClasspath>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.squeryl</groupId>
<artifactId>squeryl_${scala-major-version}</artifactId>
<exclusions>
<!-- Exclude scalap, because it pulls in an old version of scala-compiler -->
<exclusion>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Replace older transitive dependency pulled in by Squeryl -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
<version>${scala-version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-auth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-broadcaster-aggregator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-client-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-hms-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.slick</groupId>
<artifactId>slick_2.11</artifactId>
<version>${slick-version}</version>
</dependency>
<dependency>
<groupId>org.suecarter</groupId>
<artifactId>freeslick_2.11</artifactId>
<version>${freeslick-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<!-- Test Scoped dependencies -->
<!-- For Jersey's in-process web server JAX-RS testing framework -->
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-http</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-simple-server</artifactId>
<version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-util</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<effort>Max</effort>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.4</version>
<configuration>
<targetJdk>1.6</targetJdk>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
diff --git a/shrine-webclient/pom.xml b/shrine-webclient/pom.xml
index a4976c48f..f8856c899 100644
--- a/shrine-webclient/pom.xml
+++ b/shrine-webclient/pom.xml
@@ -1,41 +1,41 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Web Client</name>
<artifactId>shrine-webclient</artifactId>
<packaging>pom</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<properties>
<gmaven-plugin-version>1.5</gmaven-plugin-version>
<assembly-plugin-version>2.4</assembly-plugin-version>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${assembly-plugin-version}</version>
<executions>
<execution>
<id>assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
diff --git a/tools/adapter-queries-to-qep/pom.xml b/tools/adapter-queries-to-qep/pom.xml
index a3d0a237f..1018662a5 100644
--- a/tools/adapter-queries-to-qep/pom.xml
+++ b/tools/adapter-queries-to-qep/pom.xml
@@ -1,57 +1,57 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Copy Adapter Queries to QEP</name>
<artifactId>adapter-queries-to-qep</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-tools</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-data-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-adapter-service</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-qep</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>adapter-queries-to-qep-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</plugin>
</plugins>
</build>
</project>
diff --git a/tools/batch-querier/pom.xml b/tools/batch-querier/pom.xml
index 427c7e56e..669407e48 100644
--- a/tools/batch-querier/pom.xml
+++ b/tools/batch-querier/pom.xml
@@ -1,86 +1,86 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Query Automation Utility</name>
<artifactId>shrine-batch-querier-utility</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-tools</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-utility-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-utility-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- For command-line argument parsing -->
<dependency>
<groupId>org.rogach</groupId>
<artifactId>scallop_${scala-major-version}</artifactId>
<version>${scallop-version}</version>
</dependency>
<!-- For writing CSV data -->
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
</dependency>
<!-- For config file loading -->
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>shrine-batch-querier-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</plugin>
</plugins>
</build>
</project>
diff --git a/tools/jersey-http-client-tool/pom.xml b/tools/jersey-http-client-tool/pom.xml
index 9f4b8f8e9..df545c3d1 100644
--- a/tools/jersey-http-client-tool/pom.xml
+++ b/tools/jersey-http-client-tool/pom.xml
@@ -1,41 +1,41 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Jersey Http Client Tool</name>
<artifactId>jersey-http-client-test</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-tools</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-client</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>jersey-http-client-tool-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</plugin>
</plugins>
</build>
</project>
diff --git a/tools/mapping-automation/pom.xml b/tools/mapping-automation/pom.xml
index f0f4fb954..e606bf34c 100644
--- a/tools/mapping-automation/pom.xml
+++ b/tools/mapping-automation/pom.xml
@@ -1,85 +1,85 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Term Mapping Automation Utilities</name>
<artifactId>shrine-mapping-automation</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-tools</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-ont-support</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-utility-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-utility-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- For command-line argument parsing -->
<dependency>
<groupId>org.rogach</groupId>
<artifactId>scallop_${scala-major-version}</artifactId>
<version>${scallop-version}</version>
</dependency>
<!-- For writing CSV data -->
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
</dependency>
<!-- For config file loading -->
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>shrine-mapping-tools-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</plugin>
</plugins>
</build>
</project>
diff --git a/tools/monitor/pom.xml b/tools/monitor/pom.xml
index 5c4d043a9..8228a31e0 100644
--- a/tools/monitor/pom.xml
+++ b/tools/monitor/pom.xml
@@ -1,90 +1,90 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Monitor Utilities</name>
<artifactId>shrine-monitor-utilities</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-tools</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-javamail</artifactId>
<version>1.6.5</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-broadcaster-aggregator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy.modules.http-builder</groupId>
<artifactId>http-builder</artifactId>
<version>0.5.1</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.gmaven.runtime</groupId>
<artifactId>gmaven-runtime-1.7</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>shrine-monitor-${project.version}.zip</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</plugin>
</plugins>
</build>
</project>
diff --git a/tools/pom.xml b/tools/pom.xml
index 311feffeb..3481e03b9 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -1,81 +1,81 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Tools</name>
<artifactId>shrine-tools</artifactId>
<packaging>pom</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-base</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<properties>
<gmaven-plugin-version>1.5</gmaven-plugin-version>
<assembly-plugin-version>2.4</assembly-plugin-version>
</properties>
<modules>
<module>jersey-http-client-tool</module>
<module>monitor</module>
<module>utility-commons</module>
<module>scanner</module>
<module>batch-querier</module>
<module>adapter-queries-to-qep</module>
<module>mapping-automation</module>
</modules>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-protocol</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>${gmaven-plugin-version}</version>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<debug>true</debug>
<verbose>true</verbose>
<stacktrace>true</stacktrace>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${assembly-plugin-version}</version>
<executions>
<execution>
<id>assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
diff --git a/tools/scanner/pom.xml b/tools/scanner/pom.xml
index 681a95c82..513694d18 100644
--- a/tools/scanner/pom.xml
+++ b/tools/scanner/pom.xml
@@ -1,103 +1,103 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Scanner Utility</name>
<artifactId>shrine-scanner-utility</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-tools</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-ont-support</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-hms-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-utility-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-utility-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- For command-line argument parsing -->
<dependency>
<groupId>org.rogach</groupId>
<artifactId>scallop_${scala-major-version}</artifactId>
<version>${scallop-version}</version>
</dependency>
<!-- For writing CSV data -->
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
</dependency>
<!-- For config file loading -->
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
</dependency>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-broadcaster-aggregator</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>shrine-scanner-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</plugin>
</plugins>
</build>
</project>
diff --git a/tools/utility-commons/pom.xml b/tools/utility-commons/pom.xml
index 9562fac5c..b8b12f0d6 100644
--- a/tools/utility-commons/pom.xml
+++ b/tools/utility-commons/pom.xml
@@ -1,64 +1,64 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>SHRINE Common Classes for Utilities</name>
<artifactId>shrine-utility-commons</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>net.shrine</groupId>
<artifactId>shrine-tools</artifactId>
- <version>1.22.5.1-SNAPSHOT</version>
+ <version>1.22.6-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>net.shrine</groupId>
<artifactId>shrine-test-commons</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- For command-line argument parsing -->
<dependency>
<groupId>org.rogach</groupId>
<artifactId>scallop_${scala-major-version}</artifactId>
<version>${scallop-version}</version>
</dependency>
<!-- For writing CSV data -->
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
</dependency>
<!-- For config file loading -->
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>