diff --git a/pom.xml b/pom.xml
index 92849514a7b9d86556c147253ca7fbc9c79591b0..5434b674c381edf8d7d713f30a840edaaea9de3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,582 +1,564 @@
 <?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">
-        <modelVersion>4.0.0</modelVersion>
-        <groupId>info.textgrid.services</groupId>
-        <artifactId>aggregator</artifactId>
-        <version>1.4.12-SNAPSHOT</version>
-        <packaging>war</packaging>
-        <name>TextGrid Aggregator Service</name>
+	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">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>info.textgrid.services</groupId>
+	<artifactId>aggregator</artifactId>
+	<version>1.4.13-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<name>TextGrid Aggregator Service</name>
 
-        <developers>
-                <developer>
-                        <id>vitt</id>
-                        <name>Thorsten Vitt</name>
-                        <email>thorsten.vitt@uni-wuerzburg.de</email>
-                        <url>http://www.thorstenvitt.de/</url>
-                        <organization>Universität Würzburg</organization>
-                        <organizationUrl>http://www.germanistik.uni-wuerzburg.de/lehrstuehle/computerphilologie</organizationUrl>
-                </developer>
-        </developers>
+	<developers>
+		<developer>
+			<id>vitt</id>
+			<name>Thorsten Vitt</name>
+			<email>thorsten.vitt@uni-wuerzburg.de</email>
+			<url>http://www.thorstenvitt.de/</url>
+			<organization>Universität Würzburg</organization>
+			<organizationUrl>http://www.germanistik.uni-wuerzburg.de/lehrstuehle/computerphilologie</organizationUrl>
+		</developer>
+	</developers>
 
-        <properties>
-                <commons-io-version>2.4</commons-io-version>
-                <link-rewriter-version>0.4.1-SNAPSHOT</link-rewriter-version>
-                <saxon-version>9.5.1-5</saxon-version> <!-- XXX mind dependency from epubcheck -->
-                <cxf-version>2.7.11</cxf-version>
-                <confclient-version>1.4.0</confclient-version>
-                <tgsearch-version>3.4.0-SNAPSHOT</tgsearch-version>
-                <tgcrud-version>2.6.0</tgcrud-version>
-                <guava-version>15.0</guava-version>
-                <junit-version>4.11</junit-version>
-                <spring-version>3.2.2.RELEASE</spring-version>
-                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	<properties>
+		<commons-io-version>2.4</commons-io-version>
+		<link-rewriter-version>0.4.1-RELEASE</link-rewriter-version>
+		<saxon-version>9.5.1-5</saxon-version> <!-- XXX mind dependency from epubcheck -->
+		<cxf-version>2.7.11</cxf-version>
+		<confclient-version>1.4.0</confclient-version>
+		<tgsearch-version>3.6.2</tgsearch-version>
+		<tgcrud-version>2.6.0</tgcrud-version>
+		<guava-version>15.0</guava-version>
+		<junit-version>4.11</junit-version>
+		<spring-version>3.2.2.RELEASE</spring-version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-                <!-- The following properties are used for configuring the
-                     web service and can be overridden in profiles -->
-                <aggregator.endpoint.published>http://localhost:13000/aggregator</aggregator.endpoint.published>
-                <aggregator.textgridrep.default>https://www.textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
-                <aggregator.textgridrep.dev>https://www.textgridlab.org/dev/confserv</aggregator.textgridrep.dev>
-                <aggregator.classifier/>
-        </properties>
+		<!-- The following properties are used for configuring the web service 
+			and can be overridden in profiles -->
+		<aggregator.endpoint.published>http://localhost:13000/aggregator</aggregator.endpoint.published>
+		<aggregator.textgridrep.default>https://www.textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
+		<aggregator.textgridrep.dev>https://www.textgridlab.org/dev/confserv</aggregator.textgridrep.dev>
+		<aggregator.classifier />
+	</properties>
 
-        <repositories>
-                <repository>
-                        <id>nexus.dariah</id>
-                        <name>DARIAH Nexus Public Repository</name>
-                        <url>https://ci.de.dariah.eu/nexus/content/groups/public</url>
-                        <releases>
-                                <enabled>true</enabled>
-                        </releases>
-                        <snapshots>
-                                <enabled>true</enabled>
-                        </snapshots>
-                </repository>
-                <repository>
-                        <id>dh.nexus.releases</id>
-                        <name>Cophi Nexus Releases</name>
-                        <url>http://dev.digital-humanities.de/nexus/content/repositories/releases</url>
-                        <releases>
-                                <enabled>true</enabled>
-                        </releases>
-                        <snapshots>
-                                <enabled>false</enabled>
-                        </snapshots>
-                </repository>
-                <repository>
-                        <id>dh.nexus.snapshots</id>
-                        <name>Cophi Nexus snapshots</name>
-                        <url>http://dev.digital-humanities.de/nexus/content/repositories/snapshots</url>
-                        <releases>
-                                <enabled>true</enabled>
-                        </releases>
-                        <snapshots>
-                                <enabled>true</enabled>
-                        </snapshots>
-                </repository>
-        </repositories>
-        
-        <distributionManagement>
-        	<!--
-		    <repository>
-        	      <id>internal</id>
-        	      <url>http://dev.digital-humanities.de/nexus/content/repositories/releases</url>
-        	    </repository>
-        	    <snapshotRepository>
-        	      <id>snapshots</id>
-        	      <url>http://dev.digital-humanities.de/nexus/content/repositories/snapshots</url>
-        	    </snapshotRepository>
-		    -->
-        	<repository>
-        	  <id>nexus.releases</id>
-        	  <url>https://ci.de.dariah.eu/nexus/content/repositories/releases</url>
-        	</repository>
-        	<snapshotRepository>
-        	  <id>nexus.snapshots</id>
-        	  <url>https://ci.de.dariah.eu/nexus/content/repositories/snapshots</url>
-        	</snapshotRepository>
-        </distributionManagement>
+	<repositories>
+		<repository>
+			<id>maven-dariah-public</id>
+			<name>GWDG Nexus DARIAH-DE Repository</name>
+			<url> https://nexus.gwdg.de/repository/maven-dariah-public/</url>
+		</repository>
+		<repository>
+			<id>dh.nexus.releases</id>
+			<name>Cophi Nexus Releases</name>
+			<url>http://dev.digital-humanities.de/nexus/content/repositories/releases</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>dh.nexus.snapshots</id>
+			<name>Cophi Nexus snapshots</name>
+			<url>http://dev.digital-humanities.de/nexus/content/repositories/snapshots</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 
-        <dependencies>
-                <dependency>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                        <version>${junit-version}</version>
-                        <scope>test</scope>
-                </dependency>
-                <dependency>
-                        <groupId>com.google.guava</groupId>
-                        <artifactId>guava</artifactId>
-                        <version>${guava-version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>info.textgrid.middleware</groupId>
-                        <artifactId>tgcrud-client</artifactId>
-                        <version>${tgcrud-version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>info.textgrid.middleware</groupId>
-                        <artifactId>tgsearch-client</artifactId>
-                        <version>${tgsearch-version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>info.textgrid.middleware</groupId>
-                        <artifactId>confclient</artifactId>
-                        <version>${confclient-version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-                        <version>${cxf-version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>net.sf.saxon</groupId>
-                        <artifactId>Saxon-HE</artifactId>
-                        <version>${saxon-version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>info.textgrid.utils</groupId>
-                        <artifactId>link-rewriter-core</artifactId>
-                        <version>${link-rewriter-version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                        <version>${commons-io-version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-transports-http</artifactId>
-                        <version>${cxf-version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-management</artifactId>
-                        <version>${cxf-version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-web</artifactId>
-                        <version>${spring-version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                        <version>2.5</version>
-                </dependency>
-                <dependency>
-                	<groupId>com.ibm.icu</groupId>
-                	<artifactId>icu4j</artifactId>
-                	<version>51.1</version>
-                </dependency>
-                <dependency>
-                	<groupId>org.idpf</groupId>
-                	<artifactId>epubcheck</artifactId>
-                	<version>4.0.0-alpha11</version>
-                	<scope>test</scope>
-                </dependency>
-                <dependency>
-                	<groupId>xmlunit</groupId>
-                	<artifactId>xmlunit</artifactId>
-                	<version>1.5</version>
-                	<scope>test</scope>
-                </dependency>
-                <dependency>
-                	<groupId>org.apache.cxf</groupId>
-                	<artifactId>cxf-rt-rs-security-cors</artifactId>
-                	<version>${cxf-version}</version>
-                </dependency>
-        </dependencies>
+	<distributionManagement>
+		<snapshotRepository>
+			<id>maven-dariah-public</id>
+			<name>GWDG Nexus DARIAH-DE Repository</name>
+			<url>https://nexus.gwdg.de/repository/maven-dariah-public/</url>
+		</snapshotRepository>
+		<repository>
+			<id>maven-dariah-public</id>
+			<name>GWDG Nexus DARIAH-DE Repository</name>
+			<url>https://nexus.gwdg.de/repository/maven-dariah-public/</url>
+		</repository>
+	</distributionManagement>
 
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit-version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>info.textgrid.middleware</groupId>
+			<artifactId>tgcrud-client</artifactId>
+			<version>${tgcrud-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>info.textgrid.middleware</groupId>
+			<artifactId>tgsearch-client</artifactId>
+			<version>${tgsearch-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>info.textgrid.middleware</groupId>
+			<artifactId>confclient</artifactId>
+			<version>${confclient-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
+			<version>${cxf-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.saxon</groupId>
+			<artifactId>Saxon-HE</artifactId>
+			<version>${saxon-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>info.textgrid.utils</groupId>
+			<artifactId>link-rewriter-core</artifactId>
+			<version>${link-rewriter-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons-io-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<version>${cxf-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-management</artifactId>
+			<version>${cxf-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${spring-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.ibm.icu</groupId>
+			<artifactId>icu4j</artifactId>
+			<version>51.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.idpf</groupId>
+			<artifactId>epubcheck</artifactId>
+			<version>4.0.0-alpha11</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>xmlunit</groupId>
+			<artifactId>xmlunit</artifactId>
+			<version>1.5</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-rs-security-cors</artifactId>
+			<version>${cxf-version}</version>
+		</dependency>
+	</dependencies>
 
-        <build>
-                <pluginManagement>
-                        <plugins>
-                                <plugin>
-                                        <groupId>org.apache.tomcat.maven</groupId>
-                                        <artifactId>tomcat6-maven-plugin</artifactId>
-                                        <version>2.1</version>
-                                        <executions>
-                                                <execution>
-                                                  <id>default-cli</id>
-                                                  <goals>
-                                                  <goal>run</goal>
-                                                  </goals>
-                                                  <configuration>
-                                                  <port>13000</port>
-                                                  <path>/aggregator</path>
-                                                  <useSeparateTomcatClassLoader>false</useSeparateTomcatClassLoader>
-                                                  </configuration>
-                                                </execution>
-                                        </executions>
-                                </plugin>
-                                <plugin>
-                                        <groupId>org.apache.maven.plugins</groupId>
-                                        <artifactId>maven-compiler-plugin</artifactId>
-                                        <configuration>
-                                                <source>1.7</source>
-                                                <target>1.7</target>
-                                        </configuration>
-                                </plugin>
-                                <plugin>
-                                        <groupId>org.apache.maven.plugins</groupId>
-                                        <artifactId>maven-eclipse-plugin</artifactId>
-                                        <configuration>
-                                                <projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
-                                                <wtpmanifest>true</wtpmanifest>
-                                                <wtpapplicationxml>true</wtpapplicationxml>
-                                                <wtpversion>2.0</wtpversion>
-                                        </configuration>
-                                </plugin>
-                                <!--This plugin's configuration is used to store Eclipse m2e settings 
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.tomcat.maven</groupId>
+					<artifactId>tomcat6-maven-plugin</artifactId>
+					<version>2.1</version>
+					<executions>
+						<execution>
+							<id>default-cli</id>
+							<goals>
+								<goal>run</goal>
+							</goals>
+							<configuration>
+								<port>13000</port>
+								<path>/aggregator</path>
+								<useSeparateTomcatClassLoader>false</useSeparateTomcatClassLoader>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<configuration>
+						<source>1.7</source>
+						<target>1.7</target>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-eclipse-plugin</artifactId>
+					<configuration>
+						<projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
+						<wtpmanifest>true</wtpmanifest>
+						<wtpapplicationxml>true</wtpapplicationxml>
+						<wtpversion>2.0</wtpversion>
+					</configuration>
+				</plugin>
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
 					only. It has no influence on the Maven build itself. -->
-                                <plugin>
-                                        <groupId>org.eclipse.m2e</groupId>
-                                        <artifactId>lifecycle-mapping</artifactId>
-                                        <version>1.0.0</version>
-                                        <configuration>
-                                                <lifecycleMappingMetadata>
-                                                  <pluginExecutions>
-                                                  <pluginExecution>
-                                                  <pluginExecutionFilter>
-                                                  <groupId>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
 											org.codehaus.mojo
 										</groupId>
-                                                  <artifactId>
+										<artifactId>
 											build-helper-maven-plugin
 										</artifactId>
-                                                  <versionRange> [1.5,) </versionRange>
-                                                  <goals>
-                                                  <goal>
+										<versionRange> [1.5,) </versionRange>
+										<goals>
+											<goal>
 												reserve-network-port
 											</goal>
-                                                  </goals>
-                                                  </pluginExecutionFilter>
-                                                  <action>
-                                                  <ignore/>
-                                                  </action>
-                                                  </pluginExecution>
-                                                  </pluginExecutions>
-                                                </lifecycleMappingMetadata>
-                                        </configuration>
-                                </plugin>
-                        </plugins>
-                </pluginManagement>
-                <plugins>
-                	<plugin>
-                		<groupId>pl.project13.maven</groupId>
-                		<artifactId>git-commit-id-plugin</artifactId>
-                		<version>2.1.5</version>
-                		<executions>
-                			<execution>
-                				<goals>
-                					<goal>revision</goal>
-                				</goals>
-                			</execution>
-                		</executions>
-                		<configuration>
-                			<verbose>true</verbose>
-                			<dateFormat>yyyy-MM-dd HH:mm:ss</dateFormat>
-                			<generateGitPropertiesFile>true</generateGitPropertiesFile>
-               				<gitDescribe>
-               					<tags>true</tags>
-               					<dirty>-dev</dirty>
-               					<abbrev>7</abbrev>
-               				</gitDescribe>
-                		</configuration>
-                	</plugin>
-                        <plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-compiler-plugin</artifactId>
-                                <version>2.3.1</version>
-                                <configuration>
-                                        <source>1.7</source>
-                                        <target>1.7</target>
-                                </configuration>
-                        </plugin>
-                        <plugin>
-                                <groupId>org.codehaus.mojo</groupId>
-                                <artifactId>build-helper-maven-plugin</artifactId>
-                                <version>1.5</version>
-                                <executions>
-                                        <execution>
-                                                <id>reserve-network-port</id>
-                                                <goals>
-                                                  <goal>reserve-network-port</goal>
-                                                </goals>
-                                                <phase>process-test-resources</phase>
-                                                <configuration>
-                                                  <portNames>
-                                                  <portName>test.server.port</portName>
-                                                  </portNames>
-                                                </configuration>
-                                        </execution>
-                                        <execution>
-                                        	<id>attach-config-file</id>
-                                        	<phase>package</phase>
-                                        	<goals>
-                                        		<goal>attach-artifact</goal>
-                                        	</goals>
-                                        	<configuration>
-                                        		<artifacts>
-                                        			<artifact>
-	                                        			<file>target/aggregator.properties</file>
-	                                        			<type>properties</type>
-	                                        			<classifier>${aggregator.classifier}</classifier>
-                                        			</artifact>
-                                        		</artifacts>
-                                        	</configuration>
-                                        </execution>
-                                </executions>
-                        </plugin>
-                        <plugin>
-                                <groupId>org.apache.tomcat.maven</groupId>
-                                <artifactId>tomcat6-maven-plugin</artifactId>
-                                <executions>
-                                        <execution>
-                                                <id>start-tomcat</id>
-                                                <goals>
-                                                  <goal>run-war</goal>
-                                                </goals>
-                                                <phase>pre-integration-test</phase>
-                                                <configuration>
-                                                  <port>${test.server.port}</port>
-                                                  <path>/aggregator</path>
-                                                  <fork>true</fork>
-                                                  <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
-                                                </configuration>
-                                        </execution>
-                                        <execution>
-                                                <id>stop-tomcat</id>
-                                                <goals>
-                                                  <goal>shutdown</goal>
-                                                </goals>
-                                                <phase>post-integration-test</phase>
-                                                <configuration>
-                                                  <path>/aggregator</path>
-                                                </configuration>
-                                        </execution>
-                                </executions>
-                        </plugin>
-                        <plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-failsafe-plugin</artifactId>
-                                <version>2.8.1</version>
-                                <executions>
-                                        <execution>
-                                                <id>integration-test</id>
-                                                <goals>
-                                                  <goal>integration-test</goal>
-                                                </goals>
-                                                <configuration>
-                                                  <systemPropertyVariables>
-                                                  <service.url>http://localhost:${test.server.port}/aggregator</service.url>
-                                                  </systemPropertyVariables>
-                                                </configuration>
-                                        </execution>
-                                        <execution>
-                                                <id>verify</id>
-                                                <goals>
-                                                  <goal>verify</goal>
-                                                </goals>
-                                        </execution>
-                                </executions>
-                        </plugin>
-
-                        <plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-surefire-plugin</artifactId>
-                                <version>2.14</version>
-                                <configuration>
-                                        <systemPropertyVariables>
-                                                <webapp.directory>${project.basedir}/src/main/webapp</webapp.directory>
-                                        </systemPropertyVariables>
-                                </configuration>
-                        </plugin>
-
-                        <plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-war-plugin</artifactId>
-                                <version>2.3</version>
-                                <configuration>
-                                        <webResources>
-                                                <resource>
-                                                  <directory>${basedir}/src/main/webapp/WEB-INF</directory>
-                                                  <filtering>true</filtering>
-                                                  <targetPath>WEB-INF</targetPath>
-                                                  <includes>
-                                                          <include>aggregator.properties</include>
-                                                  </includes>
-                                                </resource>
-                                        </webResources>
-                                        <classifier>${aggregator.classifier}</classifier>
-                                </configuration>
-                        </plugin>                                                
-                        <plugin>
-                        	<groupId>org.apache.maven.plugins</groupId>
-                        	<artifactId>maven-site-plugin</artifactId>
-                        	<version>3.4</version>
-                        	<configuration>
-                        		<reportPlugins>
-                        			<plugin>
-                        				<groupId>org.apache.maven.plugins</groupId>
-                        				<artifactId>maven-project-info-reports-plugin</artifactId>
-                        				<version>2.8</version>
-                        				<reportSets>
-                        					<reportSet>
-                        						<reports/>
-                        					</reportSet>
-                        				</reportSets>
-                        			</plugin>
-                        			<plugin>
-                        				<groupId>org.tomdz.maven</groupId>
-                        				<artifactId>sphinx-maven-plugin</artifactId>
-                        				<version>1.0.3</version>
-                        				<configuration>
-                        					<sourceDirectory>${basedir}/docs</sourceDirectory>
-                        				</configuration>
-                        			</plugin>
-                        		</reportPlugins>
-                        	</configuration>
-                        </plugin>
-                </plugins>
-                <resources>
-                	<resource>
-                		<directory>${basedir}/src/main/resources</directory>
-                		<filtering>true</filtering>
-                	</resource>
-                	<resource>
-                		<directory>${basedir}/src/main/webapp/WEB-INF</directory>
-                		<filtering>true</filtering>                		
-                		<includes>
-                			<include>aggregator.properties</include>
-                		</includes>
-                		<targetPath>${project.build.directory}</targetPath>
-                	</resource>
-                </resources>
-        </build>
-        <profiles>
-                <profile>
-                	<id>esx1</id>
-                	<properties>
-                		<aggregator.endpoint.published>http://textgrid-esx1.gwdg.de/1.0/aggregator</aggregator.endpoint.published>
-                		<aggregator.textgridrep.default>http://textgrid-esx1.gwdg.de/1.0/confserv</aggregator.textgridrep.default>
-                		<aggregator.textgridrep.dev>https://textgridlab.org/dev/confserv</aggregator.textgridrep.dev>
-                		<aggregator.classifier>esx1</aggregator.classifier>
-                	</properties>
-                </profile>
-                <profile>
-                	<id>lab</id>
-                	<activation>
-                		<activeByDefault>true</activeByDefault>
-                	</activation>
-                	<properties>
-                		<aggregator.endpoint.published>https://textgridlab.org/1.0/aggregator</aggregator.endpoint.published>
-                		<aggregator.textgridrep.default>https://textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
-                		<aggregator.textgridrep.dev>https://textgridlab.org/dev/confserv</aggregator.textgridrep.dev>
-                	</properties>
-                </profile>
-                <profile>
-                	<id>authtests</id>
-                	<activation>
-                		<property>
-                			<name>sid</name>
-                		</property>
-                	</activation>
-                	<build>
-                		<plugins>
-                			<plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-failsafe-plugin</artifactId>
-                                <version>2.8.1</version>
-                                <executions>
-                                        <execution>
-                                                <id>integration-test</id>
-                                                <goals>
-                                                  <goal>integration-test</goal>
-                                                </goals>
-                                                <configuration>
-                                                  <includes>
-                                                    <includes>**/*IT.java</includes>
-                                                  	<includes>**/*AT.java</includes>
-                                                  </includes>
-                                                  <systemPropertyVariables>
-                                                  	<service.url>http://localhost:${test.server.port}/aggregator</service.url>
-                                                  	<sid>${sid}</sid>
-                                                  </systemPropertyVariables>
-                                                </configuration>
-                                        </execution>
-                                        <execution>
-                                                <id>verify</id>
-                                                <goals>
-                                                  <goal>verify</goal>
-                                                </goals>
-                                        </execution>
-                                </executions>
-
-                			</plugin>
-                		</plugins>
-                	</build>
-                </profile>
-                <profile>
-                <id>textgrid.deb</id>
-                	<activation>
-                		<activeByDefault>true</activeByDefault>
-                	</activation>
-                    <build>
-                      <plugins>
-                        <plugin>
-                          <artifactId>jdeb</artifactId>
-                          <groupId>org.vafer</groupId>
-                          <version>1.4</version>
-                          <executions>
-                            <execution>
-                              <phase>package</phase>
-                              <goals>
-                                <goal>jdeb</goal>
-                              </goals>
-                              <configuration>
-                                <snapshotExpand>true</snapshotExpand>
-                                <dataSet>
-                                  <data>
-                                    <type>directory</type>
-                                    <src>${project.build.directory}/${project.build.finalName}</src>
-                                    <mapper>
-										<type>perm</type>
-										<prefix>/var/textgrid/webapps/${project.artifactId}</prefix>
-										<user>root</user>
-										<group>tomcat7</group>
-										<filemode>755</filemode>
-									</mapper>
-                                  </data>
-                                </dataSet>
-                              </configuration>
-                            </execution>
-                          </executions>
-                        </plugin>
-                      </plugins>
-                  </build>
-                </profile>
-        </profiles>
-        <organization>
-		    <name>TextGrid</name>
-		    <url>http://www.textgrid.de/</url>
-		</organization>
-        <description>The TextGrid Aggregator is a service that can walk aggregations (including editions and collections) and export the objects therein to various formats, e.g., HTML, TEI corpus, EPUB, and ZIP. It can also be used to transform single files (it is the component that is responsible for HTML rendering of TEI objects in TextGrid) and export search results as ZIP files.</description>
-        <inceptionYear>2012</inceptionYear>
-        <scm>
-        	<url>https://projects.gwdg.de/projects/aggregator/repository</url>
-        	<connection>scm:git:git://projects.gwdg.de/dariah-de/tg/textgrid-services/aggregator.git</connection>
-        	<developerConnection>scm:git:ssh://git:@projects.gwdg.de/dariah-de/tg/textgrid-services/aggregator.git</developerConnection>
-        </scm>
-        <issueManagement>
-        	<system>OpenProjects</system>
-        	<url>https://projects.gwdg.de/projects/tg</url>
-        </issueManagement>
-        <ciManagement>
-        	<system>Jenkins</system>
-        	<url>http://dev.digital-humanities.de/ci/job/Aggregator/</url>
-        </ciManagement>
-        <url>https://projects.gwdg.de/projects/aggregator</url>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<version>2.1.5</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<verbose>true</verbose>
+					<dateFormat>yyyy-MM-dd HH:mm:ss</dateFormat>
+					<generateGitPropertiesFile>true</generateGitPropertiesFile>
+					<gitDescribe>
+						<tags>true</tags>
+						<dirty>-dev</dirty>
+						<abbrev>7</abbrev>
+					</gitDescribe>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+					<execution>
+						<id>reserve-network-port</id>
+						<goals>
+							<goal>reserve-network-port</goal>
+						</goals>
+						<phase>process-test-resources</phase>
+						<configuration>
+							<portNames>
+								<portName>test.server.port</portName>
+							</portNames>
+						</configuration>
+					</execution>
+					<execution>
+						<id>attach-config-file</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>target/aggregator.properties</file>
+									<type>properties</type>
+									<classifier>${aggregator.classifier}</classifier>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.tomcat.maven</groupId>
+				<artifactId>tomcat6-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>start-tomcat</id>
+						<goals>
+							<goal>run-war</goal>
+						</goals>
+						<phase>pre-integration-test</phase>
+						<configuration>
+							<port>${test.server.port}</port>
+							<path>/aggregator</path>
+							<fork>true</fork>
+							<useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+						</configuration>
+					</execution>
+					<execution>
+						<id>stop-tomcat</id>
+						<goals>
+							<goal>shutdown</goal>
+						</goals>
+						<phase>post-integration-test</phase>
+						<configuration>
+							<path>/aggregator</path>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>2.8.1</version>
+				<executions>
+					<execution>
+						<id>integration-test</id>
+						<goals>
+							<goal>integration-test</goal>
+						</goals>
+						<configuration>
+							<systemPropertyVariables>
+								<service.url>http://localhost:${test.server.port}/aggregator</service.url>
+							</systemPropertyVariables>
+						</configuration>
+					</execution>
+					<execution>
+						<id>verify</id>
+						<goals>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.14</version>
+				<configuration>
+					<systemPropertyVariables>
+						<webapp.directory>${project.basedir}/src/main/webapp</webapp.directory>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<webResources>
+						<resource>
+							<directory>${basedir}/src/main/webapp/WEB-INF</directory>
+							<filtering>true</filtering>
+							<targetPath>WEB-INF</targetPath>
+							<includes>
+								<include>aggregator.properties</include>
+							</includes>
+						</resource>
+					</webResources>
+					<classifier>${aggregator.classifier}</classifier>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.4</version>
+				<configuration>
+					<reportPlugins>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-project-info-reports-plugin</artifactId>
+							<version>2.8</version>
+							<reportSets>
+								<reportSet>
+									<reports />
+								</reportSet>
+							</reportSets>
+						</plugin>
+						<plugin>
+							<groupId>org.tomdz.maven</groupId>
+							<artifactId>sphinx-maven-plugin</artifactId>
+							<version>1.0.3</version>
+							<configuration>
+								<sourceDirectory>${basedir}/docs</sourceDirectory>
+							</configuration>
+						</plugin>
+					</reportPlugins>
+				</configuration>
+			</plugin>
+		</plugins>
+		<resources>
+			<resource>
+				<directory>${basedir}/src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+			<resource>
+				<directory>${basedir}/src/main/webapp/WEB-INF</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>aggregator.properties</include>
+				</includes>
+				<targetPath>${project.build.directory}</targetPath>
+			</resource>
+		</resources>
+	</build>
+	<profiles>
+		<profile>
+			<id>esx1</id>
+			<properties>
+				<aggregator.endpoint.published>http://textgrid-esx1.gwdg.de/1.0/aggregator</aggregator.endpoint.published>
+				<aggregator.textgridrep.default>http://textgrid-esx1.gwdg.de/1.0/confserv</aggregator.textgridrep.default>
+				<aggregator.textgridrep.dev>https://textgridlab.org/dev/confserv</aggregator.textgridrep.dev>
+				<aggregator.classifier>esx1</aggregator.classifier>
+			</properties>
+		</profile>
+		<profile>
+			<id>lab</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<aggregator.endpoint.published>https://textgridlab.org/1.0/aggregator</aggregator.endpoint.published>
+				<aggregator.textgridrep.default>https://textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
+				<aggregator.textgridrep.dev>https://textgridlab.org/dev/confserv</aggregator.textgridrep.dev>
+			</properties>
+		</profile>
+		<profile>
+			<id>authtests</id>
+			<activation>
+				<property>
+					<name>sid</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-failsafe-plugin</artifactId>
+						<version>2.8.1</version>
+						<executions>
+							<execution>
+								<id>integration-test</id>
+								<goals>
+									<goal>integration-test</goal>
+								</goals>
+								<configuration>
+									<includes>
+										<includes>**/*IT.java</includes>
+										<includes>**/*AT.java</includes>
+									</includes>
+									<systemPropertyVariables>
+										<service.url>http://localhost:${test.server.port}/aggregator</service.url>
+										<sid>${sid}</sid>
+									</systemPropertyVariables>
+								</configuration>
+							</execution>
+							<execution>
+								<id>verify</id>
+								<goals>
+									<goal>verify</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>textgrid.deb</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>jdeb</artifactId>
+						<groupId>org.vafer</groupId>
+						<version>1.4</version>
+						<executions>
+							<execution>
+								<phase>package</phase>
+								<goals>
+									<goal>jdeb</goal>
+								</goals>
+								<configuration>
+									<snapshotExpand>true</snapshotExpand>
+									<dataSet>
+										<data>
+											<type>directory</type>
+											<src>${project.build.directory}/${project.build.finalName}</src>
+											<mapper>
+												<type>perm</type>
+												<prefix>/var/textgrid/webapps/${project.artifactId}</prefix>
+												<user>root</user>
+												<group>tomcat7</group>
+												<filemode>755</filemode>
+											</mapper>
+										</data>
+									</dataSet>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+	<organization>
+		<name>TextGrid</name>
+		<url>https://textgrid.info</url>
+	</organization>
+	<description>The TextGrid Aggregator is a service that can walk aggregations (including editions and collections) and export the objects therein to various formats, e.g., HTML, TEI corpus, EPUB, and ZIP. It can also be used to transform single files (it is the component that is responsible for HTML rendering of TEI objects in TextGrid) and export search results as ZIP files.</description>
+	<inceptionYear>2012</inceptionYear>
+	<scm>
+		<url>https://projects.gwdg.de/projects/aggregator/repository</url>
+		<connection>scm:git:git://projects.gwdg.de/dariah-de/tg/textgrid-services/aggregator.git</connection>
+		<developerConnection>scm:git:ssh://git:@projects.gwdg.de/dariah-de/tg/textgrid-services/aggregator.git</developerConnection>
+	</scm>
+	<issueManagement>
+		<system>OpenProjects</system>
+		<url>https://projects.gwdg.de/projects/tg</url>
+	</issueManagement>
+	<ciManagement>
+		<system>Jenkins</system>
+		<url>http://dev.digital-humanities.de/ci/job/Aggregator/</url>
+	</ciManagement>
+	<url>https://projects.gwdg.de/projects/aggregator</url>
 </project>