[maven-release-plugin] prepare release sirona-0.4-incubating

git-svn-id: https://svn.apache.org/repos/asf/incubator/sirona/trunk@1751451 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/agent/javaagent/pom.xml b/agent/javaagent/pom.xml
index 6523687..a7f65e9 100644
--- a/agent/javaagent/pom.xml
+++ b/agent/javaagent/pom.xml
@@ -1,201 +1,201 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-agent</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-javaagent</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: JavaAgent</name>
-
-  <properties>
-    <test.debug.remote>false</test.debug.remote>
-    <sirona.agent.debug>false</sirona.agent.debug>
-    <asm.version>5.0.4</asm.version>
-    <agent.class>org.apache.sirona.javaagent.SironaAgent</agent.class>
-    <java.runtime>15</java.runtime>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-aop</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-proxy</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-store-memory</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-all</artifactId>
-      <version>${asm.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.codehaus.mojo</groupId>
-      <artifactId>animal-sniffer-annotations</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <!-- saw some issues in EE context so importing it brutally for testing -->
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0-5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openjpa</groupId>
-      <artifactId>openjpa</artifactId>
-      <version>2.3.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-core</artifactId>
-      <version>4.6.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>pre-build-jar</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-            <configuration>
-              <excludes> <!-- packaged to be reusable => don't reuse the test config -->
-                <exclude>sirona.properties</exclude>
-                <exclude>META-INF/services/*</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Premain-Class>${agent.class}</Premain-Class>
-              <Agent-Class>${agent.class}</Agent-Class>
-              <Can-Redefine-Classes>true</Can-Redefine-Classes>
-              <Can-Retransform-Classes>true</Can-Retransform-Classes>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <createSourcesJar>true</createSourcesJar>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName>shaded</shadedClassifierName>
-              <createDependencyReducedPom>true</createDependencyReducedPom>
-              <dependencyReducedPomLocation>${project.build.directory}/reduced-pom.xml</dependencyReducedPomLocation>
-              <relocations>
-                <relocation>
-                  <pattern>org.objectweb.asm</pattern>
-                  <shadedPattern>org.apache.sirona.asm</shadedPattern>
-                </relocation>
-              </relocations>
-              <artifactSet>
-                <includes>
-                  <include>org.ow2.asm:asm-all</include>
-                  <include>org.apache.sirona:sirona-aop</include>
-                  <include>org.apache.sirona:sirona-core</include>
-                  <include>org.apache.sirona:sirona-api</include>
-                  <include>org.apache.sirona:sirona-store-memory</include>
-                </includes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <test.debug.remote>${test.debug.remote}</test.debug.remote>
-            <project.build.directory>${project.build.directory}</project.build.directory>
-            <sirona.agent.debug>${sirona.agent.debug}</sirona.agent.debug>
-            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-agent</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-javaagent</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: JavaAgent</name>

+

+  <properties>

+    <test.debug.remote>false</test.debug.remote>

+    <sirona.agent.debug>false</sirona.agent.debug>

+    <asm.version>5.0.4</asm.version>

+    <agent.class>org.apache.sirona.javaagent.SironaAgent</agent.class>

+    <java.runtime>15</java.runtime>

+    <maven.compiler.source>1.5</maven.compiler.source>

+    <maven.compiler.target>1.5</maven.compiler.target>

+  </properties>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-aop</artifactId>

+      <exclusions>

+        <exclusion>

+          <groupId>org.apache.commons</groupId>

+          <artifactId>commons-proxy</artifactId>

+        </exclusion>

+      </exclusions>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-api</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-store-memory</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.ow2.asm</groupId>

+      <artifactId>asm-all</artifactId>

+      <version>${asm.version}</version>

+    </dependency>

+

+    <dependency>

+      <groupId>org.codehaus.mojo</groupId>

+      <artifactId>animal-sniffer-annotations</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.commons</groupId>

+      <artifactId>commons-lang3</artifactId>

+      <scope>test</scope>

+    </dependency>

+    <!-- saw some issues in EE context so importing it brutally for testing -->

+    <dependency>

+      <groupId>org.apache.openejb</groupId>

+      <artifactId>javaee-api</artifactId>

+      <version>6.0-5</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.openjpa</groupId>

+      <artifactId>openjpa</artifactId>

+      <version>2.3.0</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.openejb</groupId>

+      <artifactId>openejb-core</artifactId>

+      <version>4.6.0</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>commons-io</groupId>

+      <artifactId>commons-io</artifactId>

+      <version>2.4</version>

+      <scope>test</scope>

+    </dependency>

+

+  </dependencies>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-jar-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>pre-build-jar</id>

+            <phase>test-compile</phase>

+            <goals>

+              <goal>jar</goal>

+            </goals>

+          </execution>

+          <execution>

+            <goals>

+              <goal>test-jar</goal>

+            </goals>

+            <configuration>

+              <excludes> <!-- packaged to be reusable => don't reuse the test config -->

+                <exclude>sirona.properties</exclude>

+                <exclude>META-INF/services/*</exclude>

+              </excludes>

+            </configuration>

+          </execution>

+        </executions>

+        <configuration>

+          <archive>

+            <manifestEntries>

+              <Premain-Class>${agent.class}</Premain-Class>

+              <Agent-Class>${agent.class}</Agent-Class>

+              <Can-Redefine-Classes>true</Can-Redefine-Classes>

+              <Can-Retransform-Classes>true</Can-Retransform-Classes>

+            </manifestEntries>

+          </archive>

+        </configuration>

+      </plugin>

+

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-shade-plugin</artifactId>

+        <executions>

+          <execution>

+            <phase>test-compile</phase>

+            <goals>

+              <goal>shade</goal>

+            </goals>

+            <configuration>

+              <createSourcesJar>true</createSourcesJar>

+              <shadedArtifactAttached>true</shadedArtifactAttached>

+              <shadedClassifierName>shaded</shadedClassifierName>

+              <createDependencyReducedPom>true</createDependencyReducedPom>

+              <dependencyReducedPomLocation>${project.build.directory}/reduced-pom.xml</dependencyReducedPomLocation>

+              <relocations>

+                <relocation>

+                  <pattern>org.objectweb.asm</pattern>

+                  <shadedPattern>org.apache.sirona.asm</shadedPattern>

+                </relocation>

+              </relocations>

+              <artifactSet>

+                <includes>

+                  <include>org.ow2.asm:asm-all</include>

+                  <include>org.apache.sirona:sirona-aop</include>

+                  <include>org.apache.sirona:sirona-core</include>

+                  <include>org.apache.sirona:sirona-api</include>

+                  <include>org.apache.sirona:sirona-store-memory</include>

+                </includes>

+              </artifactSet>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-surefire-plugin</artifactId>

+        <configuration>

+          <systemPropertyVariables>

+            <test.debug.remote>${test.debug.remote}</test.debug.remote>

+            <project.build.directory>${project.build.directory}</project.build.directory>

+            <sirona.agent.debug>${sirona.agent.debug}</sirona.agent.debug>

+            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>

+          </systemPropertyVariables>

+        </configuration>

+      </plugin>

+    </plugins>

+  </build>

+

+</project>

diff --git a/agent/performance/aop/pom.xml b/agent/performance/aop/pom.xml
index 2e463a0..7c97491 100644
--- a/agent/performance/aop/pom.xml
+++ b/agent/performance/aop/pom.xml
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <artifactId>sirona-performance</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-aop</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance :: AOP</name>
-
-  <properties>
-    <java.runtime>15</java.runtime>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-proxy</artifactId>
-      <version>1.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <id>jenkins-1.5</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-toolchains-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>toolchain</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <toolchains>
-                <jdk>
-                  <version>1.5</version>
-                  <vendor>sun</vendor>
-                </jdk>
-              </toolchains>
-            </configuration>
-          </plugin>
-        </plugins>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <configuration>
-                <fork>true</fork>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <artifactId>sirona-performance</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-aop</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance :: AOP</name>

+

+  <properties>

+    <java.runtime>15</java.runtime>

+    <maven.compiler.source>1.5</maven.compiler.source>

+    <maven.compiler.target>1.5</maven.compiler.target>

+  </properties>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.commons</groupId>

+      <artifactId>commons-proxy</artifactId>

+      <version>1.0</version>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+  </dependencies>

+

+  <profiles>

+    <profile>

+      <id>jenkins-1.5</id>

+      <build>

+        <plugins>

+          <plugin>

+            <groupId>org.apache.maven.plugins</groupId>

+            <artifactId>maven-toolchains-plugin</artifactId>

+            <executions>

+              <execution>

+                <goals>

+                  <goal>toolchain</goal>

+                </goals>

+              </execution>

+            </executions>

+            <configuration>

+              <toolchains>

+                <jdk>

+                  <version>1.5</version>

+                  <vendor>sun</vendor>

+                </jdk>

+              </toolchains>

+            </configuration>

+          </plugin>

+        </plugins>

+        <pluginManagement>

+          <plugins>

+            <plugin>

+              <groupId>org.apache.maven.plugins</groupId>

+              <artifactId>maven-compiler-plugin</artifactId>

+              <configuration>

+                <fork>true</fork>

+              </configuration>

+            </plugin>

+          </plugins>

+        </pluginManagement>

+      </build>

+    </profile>

+  </profiles>

+

+</project>

diff --git a/agent/performance/aspectj/pom.xml b/agent/performance/aspectj/pom.xml
index b98cb97..249d698 100644
--- a/agent/performance/aspectj/pom.xml
+++ b/agent/performance/aspectj/pom.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-performance</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-aspectj</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance  :: AspectJ Integration</name>
-
-  <properties>
-    <aspectj.version>1.7.3</aspectj.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-      <version>${aspectj.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-aop</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjweaver</artifactId>
-      <version>${aspectj.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>"-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"</argLine>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-performance</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-aspectj</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance  :: AspectJ Integration</name>

+

+  <properties>

+    <aspectj.version>1.7.3</aspectj.version>

+  </properties>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.aspectj</groupId>

+      <artifactId>aspectjrt</artifactId>

+      <version>${aspectj.version}</version>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-aop</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.aspectj</groupId>

+      <artifactId>aspectjweaver</artifactId>

+      <version>${aspectj.version}</version>

+      <scope>test</scope>

+    </dependency>

+  </dependencies>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-surefire-plugin</artifactId>

+        <configuration>

+          <argLine>"-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"</argLine>

+        </configuration>

+      </plugin>

+    </plugins>

+  </build>

+

+</project>

diff --git a/agent/performance/cdi/pom.xml b/agent/performance/cdi/pom.xml
index ea02a51..9831966 100644
--- a/agent/performance/cdi/pom.xml
+++ b/agent/performance/cdi/pom.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-performance</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-cdi</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance  :: CDI Integration</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-aop</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_3.0_spec</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openwebbeans.test</groupId>
-      <artifactId>cditest-owb</artifactId>
-      <version>1.2.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-performance</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-cdi</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance  :: CDI Integration</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-jcdi_1.0_spec</artifactId>

+      <version>1.0</version>

+      <scope>provided</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-interceptor_1.1_spec</artifactId>

+      <version>1.0</version>

+      <scope>provided</scope>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-aop</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-servlet_3.0_spec</artifactId>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.openwebbeans.test</groupId>

+      <artifactId>cditest-owb</artifactId>

+      <version>1.2.0</version>

+      <scope>test</scope>

+    </dependency>

+  </dependencies>

+

+</project>

diff --git a/agent/performance/jaxrs/cxf/pom.xml b/agent/performance/jaxrs/cxf/pom.xml
index 48870f8..bf59543 100644
--- a/agent/performance/jaxrs/cxf/pom.xml
+++ b/agent/performance/jaxrs/cxf/pom.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <artifactId>sirona-jaxrs</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-jaxrs-cxf-26</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance :: JAXRS :: CXF 2.6.x</name>
-
-  <properties>
-    <cxf.version>2.6.9</cxf.version>
-    <cxf.scope>provided</cxf.scope>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <systemPropertyVariables>
-              <arquillian.launch>tomcat7</arquillian.launch>
-              <tomcat.http>${tomcat.http}</tomcat.http>
-            </systemPropertyVariables>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <artifactId>sirona-jaxrs</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-jaxrs-cxf-26</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance :: JAXRS :: CXF 2.6.x</name>

+

+  <properties>

+    <cxf.version>2.6.9</cxf.version>

+    <cxf.scope>provided</cxf.scope>

+  </properties>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-jaxrs_1.1_spec</artifactId>

+      <version>1.0</version>

+      <scope>provided</scope>

+    </dependency>

+  </dependencies>

+  <build>

+    <pluginManagement>

+      <plugins>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-surefire-plugin</artifactId>

+          <configuration>

+            <systemPropertyVariables>

+              <arquillian.launch>tomcat7</arquillian.launch>

+              <tomcat.http>${tomcat.http}</tomcat.http>

+            </systemPropertyVariables>

+          </configuration>

+        </plugin>

+      </plugins>

+    </pluginManagement>

+  </build>

+</project>

diff --git a/agent/performance/jaxrs/jaxrs2/pom.xml b/agent/performance/jaxrs/jaxrs2/pom.xml
index a9b3eed..af04000 100644
--- a/agent/performance/jaxrs/jaxrs2/pom.xml
+++ b/agent/performance/jaxrs/jaxrs2/pom.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <artifactId>sirona-jaxrs</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-jaxrs2</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance :: JAXRS :: JAXRS2</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.servicemix.specs</groupId>
-      <artifactId>org.apache.servicemix.specs.jsr339-api-m10</artifactId>
-      <version>2.3.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <systemPropertyVariables>
-              <arquillian.launch>tomcat7</arquillian.launch>
-              <tomcat.http>${tomcat.http}</tomcat.http>
-            </systemPropertyVariables>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <artifactId>sirona-jaxrs</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-jaxrs2</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance :: JAXRS :: JAXRS2</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.servicemix.specs</groupId>

+      <artifactId>org.apache.servicemix.specs.jsr339-api-m10</artifactId>

+      <version>2.3.0</version>

+      <scope>provided</scope>

+    </dependency>

+  </dependencies>

+

+  <build>

+    <pluginManagement>

+      <plugins>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-surefire-plugin</artifactId>

+          <configuration>

+            <systemPropertyVariables>

+              <arquillian.launch>tomcat7</arquillian.launch>

+              <tomcat.http>${tomcat.http}</tomcat.http>

+            </systemPropertyVariables>

+          </configuration>

+        </plugin>

+      </plugins>

+    </pluginManagement>

+  </build>

+

+

+</project>

diff --git a/agent/performance/jaxrs/pom.xml b/agent/performance/jaxrs/pom.xml
index 736d5f2..f07e238 100644
--- a/agent/performance/jaxrs/pom.xml
+++ b/agent/performance/jaxrs/pom.xml
@@ -1,133 +1,133 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <artifactId>sirona-performance</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-jaxrs</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance  :: JAXRS</name>
-  <packaging>pom</packaging>
-
-  <properties> <!-- needs to be overridable by children modules -->
-    <cxf.version>2.7.7</cxf.version>
-    <cxf.scope>test</cxf.scope>
-  </properties>
-
-  <modules>
-    <module>jaxrs2</module>
-    <module>cxf</module>
-  </modules>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-aop</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-      <version>${cxf.version}</version>
-      <scope>${cxf.scope}</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http</artifactId>
-      <version>${cxf.version}</version>
-      <scope>${cxf.scope}</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-      <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.junit</groupId>
-      <artifactId>arquillian-junit-container</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.protocol</groupId>
-      <artifactId>arquillian-protocol-servlet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-tomcat-embedded-7</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-jasper</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-logging-juli</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt.core.compiler</groupId>
-      <artifactId>ecj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.htmlunit</groupId>
-      <artifactId>htmlunit</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <filtering>true</filtering>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>reserve-http-port</id>
-            <phase>generate-test-resources</phase>
-            <goals>
-              <goal>reserve-network-port</goal>
-            </goals>
-            <configuration>
-              <portNames>
-                <portName>tomcat.http</portName>
-              </portNames>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <artifactId>sirona-performance</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-jaxrs</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance  :: JAXRS</name>

+  <packaging>pom</packaging>

+

+  <properties> <!-- needs to be overridable by children modules -->

+    <cxf.version>2.7.7</cxf.version>

+    <cxf.scope>test</cxf.scope>

+  </properties>

+

+  <modules>

+    <module>jaxrs2</module>

+    <module>cxf</module>

+  </modules>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-aop</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.cxf</groupId>

+      <artifactId>cxf-rt-frontend-jaxrs</artifactId>

+      <version>${cxf.version}</version>

+      <scope>${cxf.scope}</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.cxf</groupId>

+      <artifactId>cxf-rt-transports-http</artifactId>

+      <version>${cxf.version}</version>

+      <scope>${cxf.scope}</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.shrinkwrap.descriptors</groupId>

+      <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.shrinkwrap.resolver</groupId>

+      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.junit</groupId>

+      <artifactId>arquillian-junit-container</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.protocol</groupId>

+      <artifactId>arquillian-protocol-servlet</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.container</groupId>

+      <artifactId>arquillian-tomcat-embedded-7</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-jasper</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-logging-juli</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.eclipse.jdt.core.compiler</groupId>

+      <artifactId>ecj</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>net.sourceforge.htmlunit</groupId>

+      <artifactId>htmlunit</artifactId>

+    </dependency>

+  </dependencies>

+

+  <build>

+    <testResources>

+      <testResource>

+        <directory>src/test/resources</directory>

+        <filtering>true</filtering>

+      </testResource>

+    </testResources>

+    <plugins>

+      <plugin>

+        <groupId>org.codehaus.mojo</groupId>

+        <artifactId>build-helper-maven-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>reserve-http-port</id>

+            <phase>generate-test-resources</phase>

+            <goals>

+              <goal>reserve-network-port</goal>

+            </goals>

+            <configuration>

+              <portNames>

+                <portName>tomcat.http</portName>

+              </portNames>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+  </build>

+</project>

diff --git a/agent/performance/jdbc/pom.xml b/agent/performance/jdbc/pom.xml
index d7e9537..65f1156 100644
--- a/agent/performance/jdbc/pom.xml
+++ b/agent/performance/jdbc/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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">
-  <parent>
-    <artifactId>sirona-performance</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>sirona-jdbc</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance :: JDBC</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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">

+  <parent>

+    <artifactId>sirona-performance</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+  <modelVersion>4.0.0</modelVersion>

+  <artifactId>sirona-jdbc</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance :: JDBC</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.hsqldb</groupId>

+      <artifactId>hsqldb</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+  </dependencies>

+</project>

diff --git a/agent/performance/jpa/pom.xml b/agent/performance/jpa/pom.xml
index 2bf0a6a..053a94e 100644
--- a/agent/performance/jpa/pom.xml
+++ b/agent/performance/jpa/pom.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <artifactId>sirona-performance</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-jpa</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance :: JPA</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jpa_2.0_spec</artifactId>
-      <version>1.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-aop</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-proxy</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openjpa</groupId>
-      <artifactId>openjpa</artifactId>
-      <version>2.2.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <artifactId>sirona-performance</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-jpa</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance :: JPA</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-jpa_2.0_spec</artifactId>

+      <version>1.1</version>

+      <scope>provided</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-aop</artifactId>

+      <exclusions>

+        <exclusion>

+          <groupId>org.apache.commons</groupId>

+          <artifactId>commons-proxy</artifactId>

+        </exclusion>

+      </exclusions>

+    </dependency>

+

+    <dependency>

+      <groupId>org.hsqldb</groupId>

+      <artifactId>hsqldb</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.openjpa</groupId>

+      <artifactId>openjpa</artifactId>

+      <version>2.2.2</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+  </dependencies>

+</project>

diff --git a/agent/performance/jta/pom.xml b/agent/performance/jta/pom.xml
index 4fbf0c0..ab882cf 100644
--- a/agent/performance/jta/pom.xml
+++ b/agent/performance/jta/pom.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-performance</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-jta</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance :: JTA</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.1_spec</artifactId>
-      <version>1.1.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-core</artifactId>
-      <version>${openejb.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-performance</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-jta</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance :: JTA</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-jta_1.1_spec</artifactId>

+      <version>1.1.1</version>

+      <scope>provided</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-jcdi_1.0_spec</artifactId>

+      <version>1.0</version>

+      <scope>provided</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-interceptor_1.1_spec</artifactId>

+      <version>1.0</version>

+      <scope>provided</scope>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.openejb</groupId>

+      <artifactId>openejb-core</artifactId>

+      <version>${openejb.version}</version>

+      <scope>test</scope>

+    </dependency>

+  </dependencies>

+

+</project>

diff --git a/agent/performance/pom.xml b/agent/performance/pom.xml
index a9e568b..4b13033 100644
--- a/agent/performance/pom.xml
+++ b/agent/performance/pom.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-agent</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-performance</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance</name>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>aop</module>
-    <module>aspectj</module>
-    <module>cdi</module>
-    <module>jdbc</module>
-    <module>jpa</module>
-    <module>jta</module>
-    <module>spring</module>
-    <module>web</module>
-    <module>jaxrs</module>
-  </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-agent</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-performance</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance</name>

+  <packaging>pom</packaging>

+

+  <modules>

+    <module>aop</module>

+    <module>aspectj</module>

+    <module>cdi</module>

+    <module>jdbc</module>

+    <module>jpa</module>

+    <module>jta</module>

+    <module>spring</module>

+    <module>web</module>

+    <module>jaxrs</module>

+  </modules>

+</project>

diff --git a/agent/performance/spring/pom.xml b/agent/performance/spring/pom.xml
index 6c6a3f9..80eb426 100644
--- a/agent/performance/spring/pom.xml
+++ b/agent/performance/spring/pom.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <artifactId>sirona-performance</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-spring</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance :: Spring Integration</name>
-
-  <properties>
-    <spring.version>3.2.5.RELEASE</spring.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-aop</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>aopalliance</groupId>
-      <artifactId>aopalliance</artifactId>
-      <version>1.0</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${spring.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>${spring.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <artifactId>sirona-performance</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-spring</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance :: Spring Integration</name>

+

+  <properties>

+    <spring.version>3.2.5.RELEASE</spring.version>

+  </properties>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.springframework</groupId>

+      <artifactId>spring-aop</artifactId>

+      <version>${spring.version}</version>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-aop</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>aopalliance</groupId>

+      <artifactId>aopalliance</artifactId>

+      <version>1.0</version>

+      <optional>true</optional>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework</groupId>

+      <artifactId>spring-context</artifactId>

+      <version>${spring.version}</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework</groupId>

+      <artifactId>spring-test</artifactId>

+      <version>${spring.version}</version>

+      <scope>test</scope>

+    </dependency>

+  </dependencies>

+</project>

diff --git a/agent/performance/web/pom.xml b/agent/performance/web/pom.xml
index 9a3285b..93afaa7 100644
--- a/agent/performance/web/pom.xml
+++ b/agent/performance/web/pom.xml
@@ -1,145 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-performance</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-web</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Performance :: Web</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jsp_2.1_spec</artifactId>
-      <version>1.0.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-el_2.2_spec</artifactId>
-      <version>1.0.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_3.0_spec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-aop</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-      <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.junit</groupId>
-      <artifactId>arquillian-junit-container</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.protocol</groupId>
-      <artifactId>arquillian-protocol-servlet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-tomcat-embedded-7</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-jasper</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-logging-juli</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt.core.compiler</groupId>
-      <artifactId>ecj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.htmlunit</groupId>
-      <artifactId>htmlunit</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <filtering>true</filtering>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>reserve-http-port</id>
-            <phase>generate-test-resources</phase>
-            <goals>
-              <goal>reserve-network-port</goal>
-            </goals>
-            <configuration>
-              <portNames>
-                <portName>tomcat.http</portName>
-              </portNames>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <systemPropertyVariables>
-              <arquillian.launch>tomcat7</arquillian.launch>
-              <tomcat.http>${tomcat.http}</tomcat.http>
-            </systemPropertyVariables>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-performance</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-web</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Performance :: Web</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-jsp_2.1_spec</artifactId>

+      <version>1.0.1</version>

+      <scope>provided</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-el_2.2_spec</artifactId>

+      <version>1.0.4</version>

+      <scope>provided</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-servlet_3.0_spec</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-aop</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.shrinkwrap.descriptors</groupId>

+      <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.shrinkwrap.resolver</groupId>

+      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.junit</groupId>

+      <artifactId>arquillian-junit-container</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.protocol</groupId>

+      <artifactId>arquillian-protocol-servlet</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.container</groupId>

+      <artifactId>arquillian-tomcat-embedded-7</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-jasper</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-logging-juli</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.eclipse.jdt.core.compiler</groupId>

+      <artifactId>ecj</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>net.sourceforge.htmlunit</groupId>

+      <artifactId>htmlunit</artifactId>

+    </dependency>

+  </dependencies>

+

+  <build>

+    <testResources>

+      <testResource>

+        <directory>src/test/resources</directory>

+        <filtering>true</filtering>

+      </testResource>

+    </testResources>

+    <plugins>

+      <plugin>

+        <groupId>org.codehaus.mojo</groupId>

+        <artifactId>build-helper-maven-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>reserve-http-port</id>

+            <phase>generate-test-resources</phase>

+            <goals>

+              <goal>reserve-network-port</goal>

+            </goals>

+            <configuration>

+              <portNames>

+                <portName>tomcat.http</portName>

+              </portNames>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+    <pluginManagement>

+      <plugins>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-surefire-plugin</artifactId>

+          <configuration>

+            <systemPropertyVariables>

+              <arquillian.launch>tomcat7</arquillian.launch>

+              <tomcat.http>${tomcat.http}</tomcat.http>

+            </systemPropertyVariables>

+          </configuration>

+        </plugin>

+      </plugins>

+    </pluginManagement>

+  </build>

+</project>

diff --git a/agent/pom.xml b/agent/pom.xml
index db02179..dfca5cc 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-agent</artifactId>
-  <name>Apache Sirona Incubator :: Agent</name>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>performance</module>
-    <module>store</module>
-    <module>pull</module>
-    <module>javaagent</module>
-  </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-agent</artifactId>

+  <name>Apache Sirona Incubator :: Agent</name>

+  <packaging>pom</packaging>

+

+  <modules>

+    <module>performance</module>

+    <module>store</module>

+    <module>pull</module>

+    <module>javaagent</module>

+  </modules>

+</project>

diff --git a/agent/pull/pom.xml b/agent/pull/pom.xml
index 805023d..53ecd20 100644
--- a/agent/pull/pom.xml
+++ b/agent/pull/pom.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-agent</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-pull</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Pull</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_3.0_spec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-cube</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.json-lib</groupId>
-      <artifactId>json-lib</artifactId>
-      <version>2.4</version>
-      <classifier>jdk15</classifier>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec-http</artifactId>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-agent</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-pull</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Pull</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-servlet_3.0_spec</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-cube</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>net.sf.json-lib</groupId>

+      <artifactId>json-lib</artifactId>

+      <version>2.4</version>

+      <classifier>jdk15</classifier>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>io.netty</groupId>

+      <artifactId>netty-codec-http</artifactId>

+    </dependency>

+  </dependencies>

+</project>

diff --git a/agent/store/cube/pom.xml b/agent/store/cube/pom.xml
index 87360a8..f890f9f 100644
--- a/agent/store/cube/pom.xml
+++ b/agent/store/cube/pom.xml
@@ -1,179 +1,179 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-agent-store</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-cube</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Store :: Cube</name>
-  <description>A DataStore for https://github.com/square/cube</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.lmax</groupId>
-      <artifactId>disruptor</artifactId>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-      <version>4.3.2</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.3.5</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpasyncclient</artifactId>
-      <version>4.0.1</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>com.ning</groupId>
-      <artifactId>async-http-client</artifactId>
-      <version>1.8.9</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <scope>runtime</scope>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec-http</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.jcraft</groupId>
-      <artifactId>jzlib</artifactId>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>reserve-network-port</id>
-            <goals>
-              <goal>reserve-network-port</goal>
-            </goals>
-            <phase>process-resources</phase>
-            <configuration>
-              <portNames>
-                <portName>collector.server.port</portName>
-              </portNames>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <createSourcesJar>true</createSourcesJar>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName>shaded</shadedClassifierName>
-              <relocations>
-                <relocation>
-                  <pattern>com.lmax</pattern>
-                  <shadedPattern>org.apache.sirona.com.lmax</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.http</pattern>
-                  <shadedPattern>org.apache.sirona.org.apache.http</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.commons</pattern>
-                  <shadedPattern>org.apache.sirona.org.apache.commons</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>com.ning.http</pattern>
-                  <shadedPattern>org.apache.sirona.com.ning.http</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.jboss.netty</pattern>
-                  <shadedPattern>org.apache.sirona.org.jboss.netty</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.slf4j</pattern>
-                  <shadedPattern>org.apache.sirona.org.slf4j</shadedPattern>
-                </relocation>
-                <!--
-                <relocation>
-                  <pattern>org.apache.sirona</pattern>
-                  <shadedPattern>org.apache.sirona.sirona</shadedPattern>
-                </relocation>
-                -->
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <systemPropertyVariables>
-              <collector.server.port>${collector.server.port}</collector.server.port>
-              <org.apache.sirona.cube.CubeBuilder.collector>http://localhost:${collector.server.port}/1.0/event/put</org.apache.sirona.cube.CubeBuilder.collector>
-            </systemPropertyVariables>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-agent-store</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-cube</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Store :: Cube</name>

+  <description>A DataStore for https://github.com/square/cube</description>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+      <scope>provided</scope>

+    </dependency>

+

+    <dependency>

+      <groupId>com.lmax</groupId>

+      <artifactId>disruptor</artifactId>

+      <optional>true</optional>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.httpcomponents</groupId>

+      <artifactId>httpcore</artifactId>

+      <version>4.3.2</version>

+      <optional>true</optional>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.httpcomponents</groupId>

+      <artifactId>httpclient</artifactId>

+      <version>4.3.5</version>

+      <optional>true</optional>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.httpcomponents</groupId>

+      <artifactId>httpasyncclient</artifactId>

+      <version>4.0.1</version>

+      <optional>true</optional>

+    </dependency>

+

+    <dependency>

+      <groupId>com.ning</groupId>

+      <artifactId>async-http-client</artifactId>

+      <version>1.8.9</version>

+      <optional>true</optional>

+    </dependency>

+

+    <dependency>

+      <groupId>org.slf4j</groupId>

+      <artifactId>slf4j-api</artifactId>

+      <scope>runtime</scope>

+      <optional>true</optional>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>io.netty</groupId>

+      <artifactId>netty-codec-http</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>com.jcraft</groupId>

+      <artifactId>jzlib</artifactId>

+    </dependency>

+

+  </dependencies>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.codehaus.mojo</groupId>

+        <artifactId>build-helper-maven-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>reserve-network-port</id>

+            <goals>

+              <goal>reserve-network-port</goal>

+            </goals>

+            <phase>process-resources</phase>

+            <configuration>

+              <portNames>

+                <portName>collector.server.port</portName>

+              </portNames>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-shade-plugin</artifactId>

+        <executions>

+          <execution>

+            <goals>

+              <goal>shade</goal>

+            </goals>

+            <configuration>

+              <createSourcesJar>true</createSourcesJar>

+              <shadedArtifactAttached>true</shadedArtifactAttached>

+              <shadedClassifierName>shaded</shadedClassifierName>

+              <relocations>

+                <relocation>

+                  <pattern>com.lmax</pattern>

+                  <shadedPattern>org.apache.sirona.com.lmax</shadedPattern>

+                </relocation>

+                <relocation>

+                  <pattern>org.apache.http</pattern>

+                  <shadedPattern>org.apache.sirona.org.apache.http</shadedPattern>

+                </relocation>

+                <relocation>

+                  <pattern>org.apache.commons</pattern>

+                  <shadedPattern>org.apache.sirona.org.apache.commons</shadedPattern>

+                </relocation>

+                <relocation>

+                  <pattern>com.ning.http</pattern>

+                  <shadedPattern>org.apache.sirona.com.ning.http</shadedPattern>

+                </relocation>

+                <relocation>

+                  <pattern>org.jboss.netty</pattern>

+                  <shadedPattern>org.apache.sirona.org.jboss.netty</shadedPattern>

+                </relocation>

+                <relocation>

+                  <pattern>org.slf4j</pattern>

+                  <shadedPattern>org.apache.sirona.org.slf4j</shadedPattern>

+                </relocation>

+                <!--

+                <relocation>

+                  <pattern>org.apache.sirona</pattern>

+                  <shadedPattern>org.apache.sirona.sirona</shadedPattern>

+                </relocation>

+                -->

+              </relocations>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+    <pluginManagement>

+      <plugins>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-surefire-plugin</artifactId>

+          <configuration>

+            <systemPropertyVariables>

+              <collector.server.port>${collector.server.port}</collector.server.port>

+              <org.apache.sirona.cube.CubeBuilder.collector>http://localhost:${collector.server.port}/1.0/event/put</org.apache.sirona.cube.CubeBuilder.collector>

+            </systemPropertyVariables>

+          </configuration>

+        </plugin>

+      </plugins>

+    </pluginManagement>

+  </build>

+

+</project>

diff --git a/agent/store/graphite/pom.xml b/agent/store/graphite/pom.xml
index 57eff55..290ea3f 100644
--- a/agent/store/graphite/pom.xml
+++ b/agent/store/graphite/pom.xml
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-agent-store</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-graphite</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Store :: Graphite</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_3.0_spec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>reserve-network-port</id>
-            <goals>
-              <goal>reserve-network-port</goal>
-            </goals>
-            <phase>process-resources</phase>
-            <configuration>
-              <portNames>
-                <portName>collector.server.port</portName>
-              </portNames>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <systemPropertyVariables>
-              <collector.server.port>${collector.server.port}</collector.server.port>
-              <org.apache.sirona.graphite.GraphiteBuilder.port>${collector.server.port}</org.apache.sirona.graphite.GraphiteBuilder.port>
-            </systemPropertyVariables>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-agent-store</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-graphite</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Store :: Graphite</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-servlet_3.0_spec</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+  </dependencies>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.codehaus.mojo</groupId>

+        <artifactId>build-helper-maven-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>reserve-network-port</id>

+            <goals>

+              <goal>reserve-network-port</goal>

+            </goals>

+            <phase>process-resources</phase>

+            <configuration>

+              <portNames>

+                <portName>collector.server.port</portName>

+              </portNames>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+    <pluginManagement>

+      <plugins>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-surefire-plugin</artifactId>

+          <configuration>

+            <systemPropertyVariables>

+              <collector.server.port>${collector.server.port}</collector.server.port>

+              <org.apache.sirona.graphite.GraphiteBuilder.port>${collector.server.port}</org.apache.sirona.graphite.GraphiteBuilder.port>

+            </systemPropertyVariables>

+          </configuration>

+        </plugin>

+      </plugins>

+    </pluginManagement>

+  </build>

+

+</project>

diff --git a/agent/store/pom.xml b/agent/store/pom.xml
index 45e936c..726d542 100644
--- a/agent/store/pom.xml
+++ b/agent/store/pom.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-agent</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-agent-store</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Store</name>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>graphite</module>
-    <module>cube</module>
-    <module>websocket-client</module>
-  </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-agent</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-agent-store</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Store</name>

+  <packaging>pom</packaging>

+

+  <modules>

+    <module>graphite</module>

+    <module>cube</module>

+    <module>websocket-client</module>

+  </modules>

+</project>

diff --git a/agent/store/websocket-client/pom.xml b/agent/store/websocket-client/pom.xml
index a6c8913..85d3ac3 100644
--- a/agent/store/websocket-client/pom.xml
+++ b/agent/store/websocket-client/pom.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <artifactId>sirona-agent-store</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-websocket-client</artifactId>
-  <name>Apache Sirona Incubator :: Agent :: Store :: WebSocket</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-websocket-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-json_1.0_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.johnzon</groupId>
-      <artifactId>johnzon-mapper</artifactId>
-      <version>${johnzon.version}</version>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <artifactId>sirona-agent-store</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-websocket-client</artifactId>

+  <name>Apache Sirona Incubator :: Agent :: Store :: WebSocket</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.tomcat</groupId>

+      <artifactId>tomcat-websocket-api</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-json_1.0_spec</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.johnzon</groupId>

+      <artifactId>johnzon-mapper</artifactId>

+      <version>${johnzon.version}</version>

+    </dependency>

+  </dependencies>

+</project>

diff --git a/alerter/mail/pom.xml b/alerter/mail/pom.xml
index 7927e16..288698b 100644
--- a/alerter/mail/pom.xml
+++ b/alerter/mail/pom.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <artifactId>sirona-alerter</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-mail-alerter</artifactId>
-  <name>Apache Sirona Incubator :: Alerter :: Mail</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-api</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.javamail</groupId>
-      <artifactId>geronimo-javamail_1.4_mail</artifactId>
-      <version>1.9.0-alpha-2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.4</version>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.icegreen</groupId>
-      <artifactId>greenmail</artifactId>
-      <version>1.4.0</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>com.sun.mail</groupId>
-          <artifactId>javax.mail</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <artifactId>sirona-alerter</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-mail-alerter</artifactId>

+  <name>Apache Sirona Incubator :: Alerter :: Mail</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-api</artifactId>

+      <version>${project.version}</version>

+      <scope>provided</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.javamail</groupId>

+      <artifactId>geronimo-javamail_1.4_mail</artifactId>

+      <version>1.9.0-alpha-2</version>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.commons</groupId>

+      <artifactId>commons-lang3</artifactId>

+      <version>3.4</version>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>com.icegreen</groupId>

+      <artifactId>greenmail</artifactId>

+      <version>1.4.0</version>

+      <scope>test</scope>

+      <exclusions>

+        <exclusion>

+          <groupId>com.sun.mail</groupId>

+          <artifactId>javax.mail</artifactId>

+        </exclusion>

+      </exclusions>

+    </dependency>

+  </dependencies>

+</project>

diff --git a/alerter/pom.xml b/alerter/pom.xml
index 6cf6124..0cea66a 100644
--- a/alerter/pom.xml
+++ b/alerter/pom.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-alerter</artifactId>
-  <name>Apache Sirona Incubator :: Alerter</name>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>mail</module>
-  </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-alerter</artifactId>

+  <name>Apache Sirona Incubator :: Alerter</name>

+  <packaging>pom</packaging>

+

+  <modules>

+    <module>mail</module>

+  </modules>

+</project>

diff --git a/api/pom.xml b/api/pom.xml
index e7cf089..6a7c2f2 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,90 +1,90 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <groupId>org.apache.sirona</groupId>
-    <artifactId>sirona</artifactId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-api</artifactId>
-  <packaging>jar</packaging>
-  <name>Apache Sirona Incubator :: Api</name>
-
-  <properties>
-    <java.runtime>15</java.runtime>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>
-  </properties>
-
-  <description>Contains some interfaces and classes of the Sirona Api</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.mojo</groupId>
-      <artifactId>animal-sniffer-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <id>jenkins-1.5</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-toolchains-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>toolchain</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <toolchains>
-                <jdk>
-                  <version>1.5</version>
-                  <vendor>sun</vendor>
-                </jdk>
-              </toolchains>
-            </configuration>
-          </plugin>
-        </plugins>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <configuration>
-                <fork>true</fork>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <groupId>org.apache.sirona</groupId>

+    <artifactId>sirona</artifactId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-api</artifactId>

+  <packaging>jar</packaging>

+  <name>Apache Sirona Incubator :: Api</name>

+

+  <properties>

+    <java.runtime>15</java.runtime>

+    <maven.compiler.source>1.5</maven.compiler.source>

+    <maven.compiler.target>1.5</maven.compiler.target>

+  </properties>

+

+  <description>Contains some interfaces and classes of the Sirona Api</description>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.codehaus.mojo</groupId>

+      <artifactId>animal-sniffer-annotations</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+  </dependencies>

+

+  <profiles>

+    <profile>

+      <id>jenkins-1.5</id>

+      <build>

+        <plugins>

+          <plugin>

+            <groupId>org.apache.maven.plugins</groupId>

+            <artifactId>maven-toolchains-plugin</artifactId>

+            <executions>

+              <execution>

+                <goals>

+                  <goal>toolchain</goal>

+                </goals>

+              </execution>

+            </executions>

+            <configuration>

+              <toolchains>

+                <jdk>

+                  <version>1.5</version>

+                  <vendor>sun</vendor>

+                </jdk>

+              </toolchains>

+            </configuration>

+          </plugin>

+        </plugins>

+        <pluginManagement>

+          <plugins>

+            <plugin>

+              <groupId>org.apache.maven.plugins</groupId>

+              <artifactId>maven-compiler-plugin</artifactId>

+              <configuration>

+                <fork>true</fork>

+              </configuration>

+            </plugin>

+          </plugins>

+        </pluginManagement>

+      </build>

+    </profile>

+  </profiles>

+

+</project>

diff --git a/core/pom.xml b/core/pom.xml
index 392cf57..d569f13 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,107 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <groupId>org.apache.sirona</groupId>
-    <artifactId>sirona</artifactId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-core</artifactId>
-  <packaging>jar</packaging>
-  <name>Apache Sirona Incubator :: Core</name>
-
-  <properties>
-    <java.runtime>15</java.runtime>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-store-memory</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-math3</artifactId>
-      <version>3.2</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <id>jenkins-1.5</id>
-      <properties>
-        <maven.compiler.source>1.5</maven.compiler.source>
-        <maven.compiler.target>1.5</maven.compiler.target>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-toolchains-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>toolchain</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <toolchains>
-                <jdk>
-                  <version>1.5</version>
-                  <vendor>sun</vendor>
-                </jdk>
-              </toolchains>
-            </configuration>
-          </plugin>
-        </plugins>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <configuration>
-                <fork>true</fork>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-
-      </build>
-    </profile>
-  </profiles>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <groupId>org.apache.sirona</groupId>

+    <artifactId>sirona</artifactId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-core</artifactId>

+  <packaging>jar</packaging>

+  <name>Apache Sirona Incubator :: Core</name>

+

+  <properties>

+    <java.runtime>15</java.runtime>

+    <maven.compiler.source>1.5</maven.compiler.source>

+    <maven.compiler.target>1.5</maven.compiler.target>

+  </properties>

+

+  <dependencies>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-api</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-store-memory</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.commons</groupId>

+      <artifactId>commons-math3</artifactId>

+      <version>3.2</version>

+      <scope>test</scope>

+    </dependency>

+  </dependencies>

+

+  <profiles>

+    <profile>

+      <id>jenkins-1.5</id>

+      <properties>

+        <maven.compiler.source>1.5</maven.compiler.source>

+        <maven.compiler.target>1.5</maven.compiler.target>

+      </properties>

+      <build>

+        <plugins>

+          <plugin>

+            <groupId>org.apache.maven.plugins</groupId>

+            <artifactId>maven-toolchains-plugin</artifactId>

+            <executions>

+              <execution>

+                <goals>

+                  <goal>toolchain</goal>

+                </goals>

+              </execution>

+            </executions>

+            <configuration>

+              <toolchains>

+                <jdk>

+                  <version>1.5</version>

+                  <vendor>sun</vendor>

+                </jdk>

+              </toolchains>

+            </configuration>

+          </plugin>

+        </plugins>

+        <pluginManagement>

+          <plugins>

+            <plugin>

+              <groupId>org.apache.maven.plugins</groupId>

+              <artifactId>maven-compiler-plugin</artifactId>

+              <configuration>

+                <fork>true</fork>

+              </configuration>

+            </plugin>

+          </plugins>

+        </pluginManagement>

+

+      </build>

+    </profile>

+  </profiles>

+

+</project>

diff --git a/plugins/api/pom.xml b/plugins/api/pom.xml
index 7685fff..186de5a 100644
--- a/plugins/api/pom.xml
+++ b/plugins/api/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>sirona-plugins</artifactId>
     <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
+    <version>0.4-incubating</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/ehcache/agent/pom.xml b/plugins/ehcache/agent/pom.xml
index 848c63d..f400738 100644
--- a/plugins/ehcache/agent/pom.xml
+++ b/plugins/ehcache/agent/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>sirona-ehcache</artifactId>
     <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
+    <version>0.4-incubating</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/ehcache/pom.xml b/plugins/ehcache/pom.xml
index 7fed05d..b2300c0 100644
--- a/plugins/ehcache/pom.xml
+++ b/plugins/ehcache/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>sirona-plugins</artifactId>
     <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
+    <version>0.4-incubating</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/hazelcast/agent/pom.xml b/plugins/hazelcast/agent/pom.xml
index 5d3a762..0c7c40b 100644
--- a/plugins/hazelcast/agent/pom.xml
+++ b/plugins/hazelcast/agent/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>sirona-hazelcast</artifactId>
     <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
+    <version>0.4-incubating</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/hazelcast/gui/pom.xml b/plugins/hazelcast/gui/pom.xml
index 15bb0eb..5d9e862 100644
--- a/plugins/hazelcast/gui/pom.xml
+++ b/plugins/hazelcast/gui/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>sirona-hazelcast</artifactId>
     <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
+    <version>0.4-incubating</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/hazelcast/pom.xml b/plugins/hazelcast/pom.xml
index 5169e9a..941e7fa 100644
--- a/plugins/hazelcast/pom.xml
+++ b/plugins/hazelcast/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>sirona-plugins</artifactId>
     <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
+    <version>0.4-incubating</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 5bc4753..8cd77bc 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.sirona</groupId>
     <artifactId>sirona</artifactId>
-    <version>0.4-incubating-SNAPSHOT</version>
+    <version>0.4-incubating</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/tomee/agent/pom.xml b/plugins/tomee/agent/pom.xml
index 152693f..8a41bb1 100644
--- a/plugins/tomee/agent/pom.xml
+++ b/plugins/tomee/agent/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>sirona-tomee</artifactId>
     <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
+    <version>0.4-incubating</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/tomee/pom.xml b/plugins/tomee/pom.xml
index 7092fb8..6b225b2 100644
--- a/plugins/tomee/pom.xml
+++ b/plugins/tomee/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>sirona-plugins</artifactId>
     <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
+    <version>0.4-incubating</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 03ca38c..0ab4bcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   <groupId>org.apache.sirona</groupId>
   <artifactId>sirona</artifactId>
-  <version>0.4-incubating-SNAPSHOT</version>
+  <version>0.4-incubating</version>
   <packaging>pom</packaging>
   <name>Apache Sirona Incubator</name>
   <url>http://sirona.incubator.apache.org/docs/${project.version}</url>
@@ -136,9 +136,9 @@
   </mailingLists>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sirona/trunk/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sirona/trunk/</developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/sirona/trunk/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sirona/tags/sirona-0.4-incubating</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sirona/tags/sirona-0.4-incubating</developerConnection>
+    <url>http://svn.apache.org/viewvc/incubator/sirona/tags/sirona-0.4-incubating</url>
   </scm>
 
   <ciManagement>
diff --git a/server/boomerang/pom.xml b/server/boomerang/pom.xml
index 36b3a0e..33fc4f8 100644
--- a/server/boomerang/pom.xml
+++ b/server/boomerang/pom.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-server</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-boomerang</artifactId>
-  <name>Apache Sirona Incubator :: Server :: Boomerang</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_3.0_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-server</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-boomerang</artifactId>

+  <name>Apache Sirona Incubator :: Server :: Boomerang</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-servlet_3.0_spec</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+  </dependencies>

+</project>

diff --git a/server/collector/pom.xml b/server/collector/pom.xml
index 2940f56..7c60dcc 100644
--- a/server/collector/pom.xml
+++ b/server/collector/pom.xml
@@ -1,148 +1,148 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-server</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-collector</artifactId>
-  <name>Apache Sirona Incubator :: Server :: Collector</name>
-  <packaging>war</packaging>
-
-  <properties>
-    <tomcatRunPort>9090</tomcatRunPort>
-    <tomcatRunPath>/sirona-collector</tomcatRunPath>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_3.0_spec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-store-memory</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-reporting-webapp</artifactId>
-      <version>${project.version}</version>
-      <classifier>classes</classifier>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-json_1.0_spec</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.johnzon</groupId>
-      <artifactId>johnzon-jaxrs</artifactId>
-      <version>${johnzon.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.lmax</groupId>
-      <artifactId>disruptor</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-cube</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec-http</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.jcraft</groupId>
-      <artifactId>jzlib</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-cassandra</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>reserve-network-port</id>
-            <goals>
-              <goal>reserve-network-port</goal>
-            </goals>
-            <phase>process-resources</phase>
-            <configuration>
-              <portNames>
-                <portName>collector.server.port</portName>
-              </portNames>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-        <configuration>
-          <port>${tomcatRunPort}</port>
-          <path>${tomcatRunPath}</path>
-          <useTestClasspath>true</useTestClasspath>
-          <systemProperties>
-            <org.apache.sirona.configuration.sirona.properties>${basedir}/src/test/sirona.properties</org.apache.sirona.configuration.sirona.properties>
-          </systemProperties>
-        </configuration>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <systemPropertyVariables>
-              <collector.server.port>${collector.server.port}</collector.server.port>
-              <org.apache.sirona.cube.CubeBuilder.collector>http://localhost:${collector.server.port}</org.apache.sirona.cube.CubeBuilder.collector>
-            </systemPropertyVariables>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-server</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-collector</artifactId>

+  <name>Apache Sirona Incubator :: Server :: Collector</name>

+  <packaging>war</packaging>

+

+  <properties>

+    <tomcatRunPort>9090</tomcatRunPort>

+    <tomcatRunPath>/sirona-collector</tomcatRunPath>

+  </properties>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-servlet_3.0_spec</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-store-memory</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-reporting-webapp</artifactId>

+      <version>${project.version}</version>

+      <classifier>classes</classifier>

+      <scope>runtime</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-json_1.0_spec</artifactId>

+      <scope>compile</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.johnzon</groupId>

+      <artifactId>johnzon-jaxrs</artifactId>

+      <version>${johnzon.version}</version>

+    </dependency>

+

+    <dependency>

+      <groupId>com.lmax</groupId>

+      <artifactId>disruptor</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-cube</artifactId>

+      <version>${project.version}</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>io.netty</groupId>

+      <artifactId>netty-codec-http</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>com.jcraft</groupId>

+      <artifactId>jzlib</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-cassandra</artifactId>

+      <version>${project.version}</version>

+      <scope>test</scope>

+    </dependency>

+  </dependencies>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.codehaus.mojo</groupId>

+        <artifactId>build-helper-maven-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>reserve-network-port</id>

+            <goals>

+              <goal>reserve-network-port</goal>

+            </goals>

+            <phase>process-resources</phase>

+            <configuration>

+              <portNames>

+                <portName>collector.server.port</portName>

+              </portNames>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.tomcat.maven</groupId>

+        <artifactId>tomcat7-maven-plugin</artifactId>

+        <configuration>

+          <port>${tomcatRunPort}</port>

+          <path>${tomcatRunPath}</path>

+          <useTestClasspath>true</useTestClasspath>

+          <systemProperties>

+            <org.apache.sirona.configuration.sirona.properties>${basedir}/src/test/sirona.properties</org.apache.sirona.configuration.sirona.properties>

+          </systemProperties>

+        </configuration>

+      </plugin>

+    </plugins>

+    <pluginManagement>

+      <plugins>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-surefire-plugin</artifactId>

+          <configuration>

+            <systemPropertyVariables>

+              <collector.server.port>${collector.server.port}</collector.server.port>

+              <org.apache.sirona.cube.CubeBuilder.collector>http://localhost:${collector.server.port}</org.apache.sirona.cube.CubeBuilder.collector>

+            </systemPropertyVariables>

+          </configuration>

+        </plugin>

+      </plugins>

+    </pluginManagement>

+  </build>

+

+</project>

diff --git a/server/pom.xml b/server/pom.xml
index 49c9034..e261ffa 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-server</artifactId>
-  <name>Apache Sirona Incubator :: Server</name>
-  <packaging>pom</packaging>
-
-  <properties>
-    <tomee.version>1.7.1</tomee.version>
-  </properties>
-
-  <modules>
-    <module>collector</module>
-    <module>reporting</module>
-    <module>store</module>
-    <module>boomerang</module>
-    <module>websocket-server</module>
-  </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-server</artifactId>

+  <name>Apache Sirona Incubator :: Server</name>

+  <packaging>pom</packaging>

+

+  <properties>

+    <tomee.version>1.7.1</tomee.version>

+  </properties>

+

+  <modules>

+    <module>collector</module>

+    <module>reporting</module>

+    <module>store</module>

+    <module>boomerang</module>

+    <module>websocket-server</module>

+  </modules>

+</project>

diff --git a/server/reporting/pom.xml b/server/reporting/pom.xml
index ea0c925..8f543d3 100644
--- a/server/reporting/pom.xml
+++ b/server/reporting/pom.xml
@@ -1,122 +1,122 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>org.apache.sirona</groupId>
-    <artifactId>sirona-server</artifactId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-reporting</artifactId>
-  <name>Apache Sirona Incubator :: Server :: Reporting</name>
-  <packaging>pom</packaging>
-
-  <properties>
-    <tomcatRunPort>8080</tomcatRunPort>
-    <tomcatRunPath>/sirona</tomcatRunPath>
-    <sirona.properties.path>${basedir}/src/test/sirona.properties</sirona.properties.path>
-    <cxf.version>3.0.1</cxf.version>
-    <spring.version>4.0.6.RELEASE</spring.version>
-  </properties>
-
-  <modules>
-    <module>reporting-api</module>
-    <module>reporting-ui</module>
-    <module>reporting-webapp</module>
-    <module>reporting-webapp-full</module>
-  </modules>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.sirona</groupId>
-        <artifactId>sirona-reporting-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaxrs_1.1_spec</artifactId> <!-- compatible with EE 6 servers -->
-        <version>1.0</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>${cxf.version}</version>
-        <scope>provided</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <filtering>true</filtering>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-        <configuration>
-          <port>${tomcatRunPort}</port>
-          <path>${tomcatRunPath}</path>
-          <skip>${sirona.reporting.tomcat.skip}</skip>
-          <systemProperties>
-            <org.apache.sirona.configuration.sirona.properties>${sirona.properties.path}</org.apache.sirona.configuration.sirona.properties>
-          </systemProperties>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>reserve-http-port</id>
-            <phase>generate-test-resources</phase>
-            <goals>
-              <goal>reserve-network-port</goal>
-            </goals>
-            <configuration>
-              <portNames>
-                <portName>tomcat.http</portName>
-              </portNames>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <systemPropertyVariables>
-              <arquillian.launch>tomcat7</arquillian.launch>
-              <tomcat.http>${tomcat.http}</tomcat.http>
-            </systemPropertyVariables>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>org.apache.sirona</groupId>

+    <artifactId>sirona-server</artifactId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-reporting</artifactId>

+  <name>Apache Sirona Incubator :: Server :: Reporting</name>

+  <packaging>pom</packaging>

+

+  <properties>

+    <tomcatRunPort>8080</tomcatRunPort>

+    <tomcatRunPath>/sirona</tomcatRunPath>

+    <sirona.properties.path>${basedir}/src/test/sirona.properties</sirona.properties.path>

+    <cxf.version>3.0.1</cxf.version>

+    <spring.version>4.0.6.RELEASE</spring.version>

+  </properties>

+

+  <modules>

+    <module>reporting-api</module>

+    <module>reporting-ui</module>

+    <module>reporting-webapp</module>

+    <module>reporting-webapp-full</module>

+  </modules>

+

+  <dependencyManagement>

+    <dependencies>

+      <dependency>

+        <groupId>org.apache.sirona</groupId>

+        <artifactId>sirona-reporting-api</artifactId>

+        <version>${project.version}</version>

+      </dependency>

+      <dependency>

+        <groupId>org.apache.geronimo.specs</groupId>

+        <artifactId>geronimo-jaxrs_1.1_spec</artifactId> <!-- compatible with EE 6 servers -->

+        <version>1.0</version>

+        <scope>provided</scope>

+      </dependency>

+      <dependency>

+        <groupId>org.apache.cxf</groupId>

+        <artifactId>cxf-rt-frontend-jaxrs</artifactId>

+        <version>${cxf.version}</version>

+        <scope>provided</scope>

+      </dependency>

+    </dependencies>

+  </dependencyManagement>

+

+  <build>

+    <testResources>

+      <testResource>

+        <directory>src/test/resources</directory>

+        <filtering>true</filtering>

+      </testResource>

+    </testResources>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.tomcat.maven</groupId>

+        <artifactId>tomcat7-maven-plugin</artifactId>

+        <configuration>

+          <port>${tomcatRunPort}</port>

+          <path>${tomcatRunPath}</path>

+          <skip>${sirona.reporting.tomcat.skip}</skip>

+          <systemProperties>

+            <org.apache.sirona.configuration.sirona.properties>${sirona.properties.path}</org.apache.sirona.configuration.sirona.properties>

+          </systemProperties>

+        </configuration>

+      </plugin>

+      <plugin>

+        <groupId>org.codehaus.mojo</groupId>

+        <artifactId>build-helper-maven-plugin</artifactId>

+        <executions>

+          <execution>

+            <id>reserve-http-port</id>

+            <phase>generate-test-resources</phase>

+            <goals>

+              <goal>reserve-network-port</goal>

+            </goals>

+            <configuration>

+              <portNames>

+                <portName>tomcat.http</portName>

+              </portNames>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+    <pluginManagement>

+      <plugins>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-surefire-plugin</artifactId>

+          <configuration>

+            <systemPropertyVariables>

+              <arquillian.launch>tomcat7</arquillian.launch>

+              <tomcat.http>${tomcat.http}</tomcat.http>

+            </systemPropertyVariables>

+          </configuration>

+        </plugin>

+      </plugins>

+    </pluginManagement>

+  </build>

+</project>

diff --git a/server/reporting/reporting-api/pom.xml b/server/reporting/reporting-api/pom.xml
index 8a6fc19..05fe375 100644
--- a/server/reporting/reporting-api/pom.xml
+++ b/server/reporting/reporting-api/pom.xml
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <groupId>org.apache.sirona</groupId>
-    <artifactId>sirona-reporting</artifactId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-reporting-api</artifactId>
-  <name>Apache Sirona Incubator :: Server :: Reporting :: Api</name>
-  <packaging>jar</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-      <scope>provided</scope> <!-- using to put it in the container to get JDBC monitoring and deploy the webapp -->
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-aop</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.openejb.maven</groupId>
-        <artifactId>tomee-maven-plugin</artifactId>
-        <version>${tomee.version}</version>
-        <configuration>
-          <tomeeClassifier>jaxrs</tomeeClassifier>
-          <simpleLog>true</simpleLog>
-          <libs>
-            <lib>${project.groupId}:sirona-api:${project.version}</lib>
-            <lib>${project.groupId}:sirona-core:${project.version}</lib>
-            <lib>${project.groupId}:sirona-aop:${project.version}</lib>
-            <lib>${project.groupId}:sirona-store-memory:${project.version}</lib>
-            <lib>org.apache.commons:commons-proxy:1.0</lib>
-          </libs>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <groupId>org.apache.sirona</groupId>

+    <artifactId>sirona-reporting</artifactId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-reporting-api</artifactId>

+  <name>Apache Sirona Incubator :: Server :: Reporting :: Api</name>

+  <packaging>jar</packaging>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+      <scope>provided</scope> <!-- using to put it in the container to get JDBC monitoring and deploy the webapp -->

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-aop</artifactId>

+      <scope>provided</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-jaxrs_1.1_spec</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-web</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>commons-codec</groupId>

+      <artifactId>commons-codec</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.commons</groupId>

+      <artifactId>commons-lang3</artifactId>

+    </dependency>

+  </dependencies>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.openejb.maven</groupId>

+        <artifactId>tomee-maven-plugin</artifactId>

+        <version>${tomee.version}</version>

+        <configuration>

+          <tomeeClassifier>jaxrs</tomeeClassifier>

+          <simpleLog>true</simpleLog>

+          <libs>

+            <lib>${project.groupId}:sirona-api:${project.version}</lib>

+            <lib>${project.groupId}:sirona-core:${project.version}</lib>

+            <lib>${project.groupId}:sirona-aop:${project.version}</lib>

+            <lib>${project.groupId}:sirona-store-memory:${project.version}</lib>

+            <lib>org.apache.commons:commons-proxy:1.0</lib>

+          </libs>

+        </configuration>

+      </plugin>

+    </plugins>

+  </build>

+</project>

diff --git a/server/reporting/reporting-ui/pom.xml b/server/reporting/reporting-ui/pom.xml
index e159d1d..931f62a 100644
--- a/server/reporting/reporting-ui/pom.xml
+++ b/server/reporting/reporting-ui/pom.xml
@@ -1,153 +1,153 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <groupId>org.apache.sirona</groupId>
-    <artifactId>sirona-reporting</artifactId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-reporting-ui</artifactId>
-  <name>Apache Sirona Incubator :: Server :: Reporting :: Ui</name>
-  <packaging>war</packaging>
-
-  <properties>
-    <sirona.reporting.ui.tomcat.skip>false</sirona.reporting.ui.tomcat.skip>
-    <log4j2.version>2.0</log4j2.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-json_1.0_spec</artifactId>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-      <scope>provided</scope> <!-- using to put it in the container to get JDBC monitoring and deploy the webapp -->
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-reporting-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-      <version>${cxf.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.johnzon</groupId>
-      <artifactId>johnzon-jaxrs</artifactId>
-      <version>${johnzon.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>${spring.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jul-to-slf4j</artifactId>
-      <version>1.7.7</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_3.0_spec</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-war-plugin</artifactId>
-          <configuration>
-            <webXml>${basedir}/src/main/web/web.xml</webXml>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-        <configuration>
-          <port>${tomcatRunPort}</port>
-          <path>${tomcatRunPath}</path>
-          <skip>${sirona.reporting.ui.tomcat.skip}</skip>
-          <useTestClasspath>true</useTestClasspath>
-          <systemProperties>
-            <org.apache.sirona.configuration.sirona.properties>${sirona.properties.path}</org.apache.sirona.configuration.sirona.properties>
-          </systemProperties>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.sirona</groupId>
-            <artifactId>sirona-core</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-1.2-api</artifactId>
-            <version>${log4j2.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j2.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <version>${log4j2.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-            <version>1.7.7</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.openejb.maven</groupId>
-        <artifactId>tomee-maven-plugin</artifactId>
-        <version>1.6.0.2</version>
-        <configuration>
-          <tomeeVersion>1.6.0.2</tomeeVersion>
-          <tomeeClassifier>plus</tomeeClassifier>
-          <libs>
-            <lib>org.apache.sirona:sirona-core:${project.version}</lib>
-          </libs>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <groupId>org.apache.sirona</groupId>

+    <artifactId>sirona-reporting</artifactId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-reporting-ui</artifactId>

+  <name>Apache Sirona Incubator :: Server :: Reporting :: Ui</name>

+  <packaging>war</packaging>

+

+  <properties>

+    <sirona.reporting.ui.tomcat.skip>false</sirona.reporting.ui.tomcat.skip>

+    <log4j2.version>2.0</log4j2.version>

+  </properties>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-json_1.0_spec</artifactId>

+      <scope>compile</scope>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+      <scope>provided</scope> <!-- using to put it in the container to get JDBC monitoring and deploy the webapp -->

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-reporting-api</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.cxf</groupId>

+      <artifactId>cxf-rt-frontend-jaxrs</artifactId>

+      <version>${cxf.version}</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.johnzon</groupId>

+      <artifactId>johnzon-jaxrs</artifactId>

+      <version>${johnzon.version}</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework</groupId>

+      <artifactId>spring-web</artifactId>

+      <version>${spring.version}</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.slf4j</groupId>

+      <artifactId>jul-to-slf4j</artifactId>

+      <version>1.7.7</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-servlet_3.0_spec</artifactId>

+      <scope>provided</scope>

+    </dependency>

+

+  </dependencies>

+

+  <build>

+    <pluginManagement>

+      <plugins>

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-war-plugin</artifactId>

+          <configuration>

+            <webXml>${basedir}/src/main/web/web.xml</webXml>

+          </configuration>

+        </plugin>

+      </plugins>

+    </pluginManagement>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.tomcat.maven</groupId>

+        <artifactId>tomcat7-maven-plugin</artifactId>

+        <configuration>

+          <port>${tomcatRunPort}</port>

+          <path>${tomcatRunPath}</path>

+          <skip>${sirona.reporting.ui.tomcat.skip}</skip>

+          <useTestClasspath>true</useTestClasspath>

+          <systemProperties>

+            <org.apache.sirona.configuration.sirona.properties>${sirona.properties.path}</org.apache.sirona.configuration.sirona.properties>

+          </systemProperties>

+        </configuration>

+        <dependencies>

+          <dependency>

+            <groupId>org.apache.sirona</groupId>

+            <artifactId>sirona-core</artifactId>

+            <version>${project.version}</version>

+          </dependency>

+          <dependency>

+            <groupId>org.apache.logging.log4j</groupId>

+            <artifactId>log4j-1.2-api</artifactId>

+            <version>${log4j2.version}</version>

+          </dependency>

+          <dependency>

+            <groupId>org.apache.logging.log4j</groupId>

+            <artifactId>log4j-slf4j-impl</artifactId>

+            <version>${log4j2.version}</version>

+          </dependency>

+          <dependency>

+            <groupId>org.apache.logging.log4j</groupId>

+            <artifactId>log4j-jcl</artifactId>

+            <version>${log4j2.version}</version>

+          </dependency>

+          <dependency>

+            <groupId>org.slf4j</groupId>

+            <artifactId>jul-to-slf4j</artifactId>

+            <version>1.7.7</version>

+          </dependency>

+        </dependencies>

+      </plugin>

+      <plugin>

+        <groupId>org.apache.openejb.maven</groupId>

+        <artifactId>tomee-maven-plugin</artifactId>

+        <version>1.6.0.2</version>

+        <configuration>

+          <tomeeVersion>1.6.0.2</tomeeVersion>

+          <tomeeClassifier>plus</tomeeClassifier>

+          <libs>

+            <lib>org.apache.sirona:sirona-core:${project.version}</lib>

+          </libs>

+        </configuration>

+      </plugin>

+    </plugins>

+  </build>

+

+</project>

diff --git a/server/reporting/reporting-webapp-full/pom.xml b/server/reporting/reporting-webapp-full/pom.xml
index 6f0ef30..b296f2a 100644
--- a/server/reporting/reporting-webapp-full/pom.xml
+++ b/server/reporting/reporting-webapp-full/pom.xml
@@ -1,219 +1,219 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>org.apache.sirona</groupId>
-    <artifactId>sirona-reporting</artifactId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-reporting-webapp-full</artifactId>
-  <name>Apache Sirona Incubator :: Server :: Reporting :: Webapp Full</name>
-  <packaging>war</packaging>
-  <description>Intended for Servlet only containers</description>
-
-  <properties>
-    <sirona.reporting.ui.tomcat.skip>false</sirona.reporting.ui.tomcat.skip>
-    <log4j2.version>2.0</log4j2.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_3.0_spec</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-json_1.0_spec</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxrs_2.0_spec</artifactId>
-      <version>1.0-alpha-1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-      <scope>provided</scope> <!-- using to put it in the container to get JDBC monitoring and deploy the webapp -->
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-aop</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-reporting-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-      <version>${cxf.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.johnzon</groupId>
-      <artifactId>johnzon-jaxrs</artifactId>
-      <version>${johnzon.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-reporting-webapp</artifactId>
-      <version>${project.version}</version>
-      <classifier>classes</classifier>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jul-to-slf4j</artifactId>
-      <version>1.7.7</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-      <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.junit</groupId>
-      <artifactId>arquillian-junit-container</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.protocol</groupId>
-      <artifactId>arquillian-protocol-servlet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-tomcat-embedded-7</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-jasper</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-logging-juli</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt.core.compiler</groupId>
-      <artifactId>ecj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.htmlunit</groupId>
-      <artifactId>htmlunit</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-        <configuration>
-          <port>${tomcatRunPort}</port>
-          <path>${tomcatRunPath}</path>
-          <skip>${sirona.reporting.ui.tomcat.skip}</skip>
-          <systemProperties>
-            <org.apache.sirona.configuration.sirona.properties>${sirona.properties.path}</org.apache.sirona.configuration.sirona.properties>
-          </systemProperties>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.sirona</groupId>
-            <artifactId>sirona-core</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.sirona</groupId>
-            <artifactId>sirona-aop</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-1.2-api</artifactId>
-            <version>${log4j2.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j2.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <version>${log4j2.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-            <version>1.7.7</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>cassandra</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.tomcat.maven</groupId>
-            <artifactId>tomcat7-maven-plugin</artifactId>
-            <dependencies>
-              <dependency>
-                <groupId>org.apache.sirona</groupId>
-                <artifactId>sirona-core</artifactId>
-                <version>${project.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.sirona</groupId>
-                <artifactId>sirona-cassandra</artifactId>
-                <version>${project.version}</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>org.apache.sirona</groupId>

+    <artifactId>sirona-reporting</artifactId>

+    <version>0.4-incubating</version>

+  </parent>

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-reporting-webapp-full</artifactId>

+  <name>Apache Sirona Incubator :: Server :: Reporting :: Webapp Full</name>

+  <packaging>war</packaging>

+  <description>Intended for Servlet only containers</description>

+

+  <properties>

+    <sirona.reporting.ui.tomcat.skip>false</sirona.reporting.ui.tomcat.skip>

+    <log4j2.version>2.0</log4j2.version>

+  </properties>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-servlet_3.0_spec</artifactId>

+      <scope>provided</scope>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-json_1.0_spec</artifactId>

+      <scope>compile</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-jaxrs_2.0_spec</artifactId>

+      <version>1.0-alpha-1</version>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+      <scope>provided</scope> <!-- using to put it in the container to get JDBC monitoring and deploy the webapp -->

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-aop</artifactId>

+      <scope>provided</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-reporting-api</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.cxf</groupId>

+      <artifactId>cxf-rt-frontend-jaxrs</artifactId>

+      <version>${cxf.version}</version>

+      <scope>compile</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.johnzon</groupId>

+      <artifactId>johnzon-jaxrs</artifactId>

+      <version>${johnzon.version}</version>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-reporting-webapp</artifactId>

+      <version>${project.version}</version>

+      <classifier>classes</classifier>

+    </dependency>

+

+    <dependency>

+      <groupId>org.springframework</groupId>

+      <artifactId>spring-web</artifactId>

+      <version>${spring.version}</version>

+    </dependency>

+    <dependency>

+      <groupId>org.slf4j</groupId>

+      <artifactId>jul-to-slf4j</artifactId>

+      <version>1.7.7</version>

+      <scope>test</scope>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.shrinkwrap.descriptors</groupId>

+      <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.shrinkwrap.resolver</groupId>

+      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.junit</groupId>

+      <artifactId>arquillian-junit-container</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.protocol</groupId>

+      <artifactId>arquillian-protocol-servlet</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.container</groupId>

+      <artifactId>arquillian-tomcat-embedded-7</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-jasper</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-logging-juli</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.eclipse.jdt.core.compiler</groupId>

+      <artifactId>ecj</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>net.sourceforge.htmlunit</groupId>

+      <artifactId>htmlunit</artifactId>

+    </dependency>

+  </dependencies>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.tomcat.maven</groupId>

+        <artifactId>tomcat7-maven-plugin</artifactId>

+        <configuration>

+          <port>${tomcatRunPort}</port>

+          <path>${tomcatRunPath}</path>

+          <skip>${sirona.reporting.ui.tomcat.skip}</skip>

+          <systemProperties>

+            <org.apache.sirona.configuration.sirona.properties>${sirona.properties.path}</org.apache.sirona.configuration.sirona.properties>

+          </systemProperties>

+        </configuration>

+        <dependencies>

+          <dependency>

+            <groupId>org.apache.sirona</groupId>

+            <artifactId>sirona-core</artifactId>

+            <version>${project.version}</version>

+          </dependency>

+          <dependency>

+            <groupId>org.apache.sirona</groupId>

+            <artifactId>sirona-aop</artifactId>

+            <version>${project.version}</version>

+          </dependency>

+          <dependency>

+            <groupId>org.apache.logging.log4j</groupId>

+            <artifactId>log4j-1.2-api</artifactId>

+            <version>${log4j2.version}</version>

+          </dependency>

+          <dependency>

+            <groupId>org.apache.logging.log4j</groupId>

+            <artifactId>log4j-slf4j-impl</artifactId>

+            <version>${log4j2.version}</version>

+          </dependency>

+          <dependency>

+            <groupId>org.apache.logging.log4j</groupId>

+            <artifactId>log4j-jcl</artifactId>

+            <version>${log4j2.version}</version>

+          </dependency>

+          <dependency>

+            <groupId>org.slf4j</groupId>

+            <artifactId>jul-to-slf4j</artifactId>

+            <version>1.7.7</version>

+          </dependency>

+        </dependencies>

+      </plugin>

+    </plugins>

+  </build>

+

+  <profiles>

+    <profile>

+      <id>cassandra</id>

+      <build>

+        <plugins>

+          <plugin>

+            <groupId>org.apache.tomcat.maven</groupId>

+            <artifactId>tomcat7-maven-plugin</artifactId>

+            <dependencies>

+              <dependency>

+                <groupId>org.apache.sirona</groupId>

+                <artifactId>sirona-core</artifactId>

+                <version>${project.version}</version>

+              </dependency>

+              <dependency>

+                <groupId>org.apache.sirona</groupId>

+                <artifactId>sirona-cassandra</artifactId>

+                <version>${project.version}</version>

+              </dependency>

+            </dependencies>

+          </plugin>

+        </plugins>

+      </build>

+    </profile>

+  </profiles>

+</project>

diff --git a/server/reporting/reporting-webapp/pom.xml b/server/reporting/reporting-webapp/pom.xml
index 1fb6647..4a4f400 100644
--- a/server/reporting/reporting-webapp/pom.xml
+++ b/server/reporting/reporting-webapp/pom.xml
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <groupId>org.apache.sirona</groupId>
-    <artifactId>sirona-reporting</artifactId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-reporting-webapp</artifactId>
-  <name>Apache Sirona Incubator :: Server :: Reporting :: Webapp</name>
-  <packaging>war</packaging>
-
-  <properties>
-    <sirona.reporting.tomcat.skip>false</sirona.reporting.tomcat.skip>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_3.0_spec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-json_1.0_spec</artifactId>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-reporting-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-      <scope>provided</scope> <!-- using to put it in the container to get JDBC monitoring and deploy the webapp -->
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-aop</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-plugins-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
-      <version>1.7</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.johnzon</groupId>
-      <artifactId>johnzon-jaxrs</artifactId>
-      <version>0.9.2-incubating</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.openejb.maven</groupId>
-        <artifactId>tomee-maven-plugin</artifactId>
-        <version>${tomee.version}</version>
-        <configuration>
-          <tomeeClassifier>jaxrs</tomeeClassifier>
-          <simpleLog>true</simpleLog>
-          <libs>
-            <lib>${project.groupId}:sirona-api:${project.version}</lib>
-            <lib>${project.groupId}:sirona-core:${project.version}</lib>
-            <lib>${project.groupId}:sirona-aop:${project.version}</lib>
-            <lib>${project.groupId}:sirona-store-memory:${project.version}</lib>
-            <lib>org.apache.commons:commons-proxy:1.0</lib>
-          </libs>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <groupId>org.apache.sirona</groupId>

+    <artifactId>sirona-reporting</artifactId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-reporting-webapp</artifactId>

+  <name>Apache Sirona Incubator :: Server :: Reporting :: Webapp</name>

+  <packaging>war</packaging>

+

+  <properties>

+    <sirona.reporting.tomcat.skip>false</sirona.reporting.tomcat.skip>

+  </properties>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-servlet_3.0_spec</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-json_1.0_spec</artifactId>

+      <scope>compile</scope>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-reporting-api</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+      <scope>provided</scope> <!-- using to put it in the container to get JDBC monitoring and deploy the webapp -->

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-aop</artifactId>

+      <scope>provided</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-plugins-api</artifactId>

+      <version>${project.version}</version>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-web</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.commons</groupId>

+      <artifactId>commons-lang3</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>commons-codec</groupId>

+      <artifactId>commons-codec</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.velocity</groupId>

+      <artifactId>velocity</artifactId>

+      <version>1.7</version>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.johnzon</groupId>

+      <artifactId>johnzon-jaxrs</artifactId>

+      <version>0.9.2-incubating</version>

+    </dependency>

+  </dependencies>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.openejb.maven</groupId>

+        <artifactId>tomee-maven-plugin</artifactId>

+        <version>${tomee.version}</version>

+        <configuration>

+          <tomeeClassifier>jaxrs</tomeeClassifier>

+          <simpleLog>true</simpleLog>

+          <libs>

+            <lib>${project.groupId}:sirona-api:${project.version}</lib>

+            <lib>${project.groupId}:sirona-core:${project.version}</lib>

+            <lib>${project.groupId}:sirona-aop:${project.version}</lib>

+            <lib>${project.groupId}:sirona-store-memory:${project.version}</lib>

+            <lib>org.apache.commons:commons-proxy:1.0</lib>

+          </libs>

+        </configuration>

+      </plugin>

+    </plugins>

+  </build>

+</project>

diff --git a/server/store/cassandra/pom.xml b/server/store/cassandra/pom.xml
index 58fd6eb..791148b 100644
--- a/server/store/cassandra/pom.xml
+++ b/server/store/cassandra/pom.xml
@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-collector-store</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-cassandra</artifactId>
-  <name>Apache Sirona Incubator :: Server :: Store :: Cassandra</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.cassandra</groupId>
-      <artifactId>cassandra-thrift</artifactId>
-      <version>1.2.15</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hectorclient</groupId>
-      <artifactId>hector-core</artifactId>
-      <version>1.1-4</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.ecyrd.speed4j</groupId>
-          <artifactId>speed4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.yammer.metrics</groupId>
-          <artifactId>metrics-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.cassandraunit</groupId>
-      <artifactId>cassandra-unit</artifactId>
-      <version>1.2.0.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.lordofthejars</groupId>
-      <artifactId>nosqlunit-cassandra</artifactId>
-      <version>0.7.8</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <createSourcesJar>true</createSourcesJar>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName>shaded</shadedClassifierName>
-              <relocations>
-                <relocation>
-                  <pattern>com.google</pattern>
-                  <shadedPattern>org.apache.sirona.google</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache</pattern>
-                  <shadedPattern>org.apache.sirona.apache</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>me.prettyprint</pattern>
-                  <shadedPattern>org.apache.sirona.me.prettyprint</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>com.eaio</pattern>
-                  <shadedPattern>org.apache.sirona.com.eaio</shadedPattern>
-                </relocation>
-
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-collector-store</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-cassandra</artifactId>

+  <name>Apache Sirona Incubator :: Server :: Store :: Cassandra</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-core</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.cassandra</groupId>

+      <artifactId>cassandra-thrift</artifactId>

+      <version>1.2.15</version>

+      <exclusions>

+        <exclusion>

+          <groupId>javax.servlet</groupId>

+          <artifactId>servlet-api</artifactId>

+        </exclusion>

+      </exclusions>

+    </dependency>

+

+    <dependency>

+      <groupId>org.hectorclient</groupId>

+      <artifactId>hector-core</artifactId>

+      <version>1.1-4</version>

+      <exclusions>

+        <exclusion>

+          <groupId>javax.servlet</groupId>

+          <artifactId>servlet-api</artifactId>

+        </exclusion>

+        <exclusion>

+          <groupId>com.ecyrd.speed4j</groupId>

+          <artifactId>speed4j</artifactId>

+        </exclusion>

+        <exclusion>

+          <groupId>com.yammer.metrics</groupId>

+          <artifactId>metrics-core</artifactId>

+        </exclusion>

+      </exclusions>

+    </dependency>

+

+    <dependency>

+      <groupId>commons-codec</groupId>

+      <artifactId>commons-codec</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.cassandraunit</groupId>

+      <artifactId>cassandra-unit</artifactId>

+      <version>1.2.0.1</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>com.lordofthejars</groupId>

+      <artifactId>nosqlunit-cassandra</artifactId>

+      <version>0.7.8</version>

+      <scope>test</scope>

+    </dependency>

+  </dependencies>

+

+  <build>

+    <plugins>

+      <plugin>

+        <groupId>org.apache.maven.plugins</groupId>

+        <artifactId>maven-shade-plugin</artifactId>

+        <executions>

+          <execution>

+            <phase>package</phase>

+            <goals>

+              <goal>shade</goal>

+            </goals>

+            <configuration>

+              <createSourcesJar>true</createSourcesJar>

+              <shadedArtifactAttached>true</shadedArtifactAttached>

+              <shadedClassifierName>shaded</shadedClassifierName>

+              <relocations>

+                <relocation>

+                  <pattern>com.google</pattern>

+                  <shadedPattern>org.apache.sirona.google</shadedPattern>

+                </relocation>

+                <relocation>

+                  <pattern>org.apache</pattern>

+                  <shadedPattern>org.apache.sirona.apache</shadedPattern>

+                </relocation>

+                <relocation>

+                  <pattern>me.prettyprint</pattern>

+                  <shadedPattern>org.apache.sirona.me.prettyprint</shadedPattern>

+                </relocation>

+                <relocation>

+                  <pattern>com.eaio</pattern>

+                  <shadedPattern>org.apache.sirona.com.eaio</shadedPattern>

+                </relocation>

+

+              </relocations>

+            </configuration>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+  </build>

+

+</project>

diff --git a/server/store/pom.xml b/server/store/pom.xml
index f3fc17c..772bd25 100644
--- a/server/store/pom.xml
+++ b/server/store/pom.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>
-
-  <parent>
-    <artifactId>sirona-server</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sirona-collector-store</artifactId>
-  <name>Apache Sirona Incubator :: Server :: Store</name>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>cassandra</module>
-  </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>

+

+  <parent>

+    <artifactId>sirona-server</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+

+  <artifactId>sirona-collector-store</artifactId>

+  <name>Apache Sirona Incubator :: Server :: Store</name>

+  <packaging>pom</packaging>

+

+  <modules>

+    <module>cassandra</module>

+  </modules>

+</project>

diff --git a/server/websocket-server/pom.xml b/server/websocket-server/pom.xml
index 0ea71e0..3cdf5ec 100644
--- a/server/websocket-server/pom.xml
+++ b/server/websocket-server/pom.xml
@@ -1,102 +1,102 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<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>sirona-server</artifactId>
-    <groupId>org.apache.sirona</groupId>
-    <version>0.4-incubating-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>sirona-websocket-server</artifactId>
-  <name>Apache Sirona Incubator :: Server :: WebSocket</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-websocket-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-json_1.0_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.johnzon</groupId>
-      <artifactId>johnzon-websocket</artifactId>
-      <version>${johnzon.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-websocket-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-      <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.shrinkwrap.resolver</groupId>
-      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.junit</groupId>
-      <artifactId>arquillian-junit-container</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.protocol</groupId>
-      <artifactId>arquillian-protocol-servlet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-tomcat-embedded-7</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-jasper</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-logging-juli</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-websocket</artifactId>
-      <version>${tomcat.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt.core.compiler</groupId>
-      <artifactId>ecj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>ziplock</artifactId>
-      <version>${tomee.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Licensed to the Apache Software Foundation (ASF) under one or more

+  contributor license agreements.  See the NOTICE file distributed with

+  this work for additional information regarding copyright ownership.

+  The ASF licenses this file to You under the Apache License, Version 2.0

+  (the "License"); you may not use this file except in compliance with

+  the License.  You may obtain a copy of the License at

+

+  http://www.apache.org/licenses/LICENSE-2.0

+

+  Unless required by applicable law or agreed to in writing, software

+  distributed under the License is distributed on an "AS IS" BASIS,

+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+  See the License for the specific language governing permissions and

+  limitations under the License.

+-->

+<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>sirona-server</artifactId>

+    <groupId>org.apache.sirona</groupId>

+    <version>0.4-incubating</version>

+  </parent>

+  <modelVersion>4.0.0</modelVersion>

+

+  <artifactId>sirona-websocket-server</artifactId>

+  <name>Apache Sirona Incubator :: Server :: WebSocket</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.tomcat</groupId>

+      <artifactId>tomcat-websocket-api</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.geronimo.specs</groupId>

+      <artifactId>geronimo-json_1.0_spec</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.johnzon</groupId>

+      <artifactId>johnzon-websocket</artifactId>

+      <version>${johnzon.version}</version>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.sirona</groupId>

+      <artifactId>sirona-websocket-client</artifactId>

+      <version>${project.version}</version>

+    </dependency>

+

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.shrinkwrap.descriptors</groupId>

+      <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.shrinkwrap.resolver</groupId>

+      <artifactId>shrinkwrap-resolver-impl-maven</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.junit</groupId>

+      <artifactId>arquillian-junit-container</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.protocol</groupId>

+      <artifactId>arquillian-protocol-servlet</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.jboss.arquillian.container</groupId>

+      <artifactId>arquillian-tomcat-embedded-7</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-jasper</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-logging-juli</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.tomcat.embed</groupId>

+      <artifactId>tomcat-embed-websocket</artifactId>

+      <version>${tomcat.version}</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.eclipse.jdt.core.compiler</groupId>

+      <artifactId>ecj</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.openejb</groupId>

+      <artifactId>ziplock</artifactId>

+      <version>${tomee.version}</version>

+      <scope>test</scope>

+    </dependency>

+  </dependencies>

+</project>

diff --git a/store/memory/pom.xml b/store/memory/pom.xml
index 7a52dd6..735dc16 100644
--- a/store/memory/pom.xml
+++ b/store/memory/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sirona</groupId>
     <artifactId>sirona-store</artifactId>
-    <version>0.4-incubating-SNAPSHOT</version>
+    <version>0.4-incubating</version>
   </parent>
 
   <artifactId>sirona-store-memory</artifactId>
diff --git a/store/pom.xml b/store/pom.xml
index 2d99632..a69f995 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sirona</groupId>
     <artifactId>sirona</artifactId>
-    <version>0.4-incubating-SNAPSHOT</version>
+    <version>0.4-incubating</version>
   </parent>
 
   <artifactId>sirona-store</artifactId>