Merge remote-tracking branch 'origin/development'
[staff/due1/sed-hs15-srs-purple.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index bdadbfc..d07cddd 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>\r
        <groupId>srs-purple</groupId>\r
        <artifactId>srs-purple-main</artifactId>\r
-       <version>1.0-SNAPSHOT</version>\r
+       <version>1.4</version>\r
        <name>Smart Reservation System</name>\r
        <description>Some description ...</description>\r
        <organization>\r
@@ -51,9 +51,9 @@
                        <timezone>+1</timezone>\r
                </developer>\r
                <developer>\r
-                       <id>Abbreviation4</id>\r
-                       <name>FirstName4 Name4</name>\r
-                       <email>E-Mail Address4</email>\r
+                       <id>tritm3</id>\r
+                       <name>Moritz Trittibach</name>\r
+                       <email>tritm3@bfh.ch</email>\r
                        <organization>Berner Fachhochschule / TI</organization>\r
                        <organizationUrl>http://www.ti.bfh.ch/</organizationUrl>\r
                        <roles>\r
                        <version>4.12</version>\r
                        <scope>test</scope>\r
                </dependency>\r
+               <dependency>\r
+                       <groupId>commons-codec</groupId>\r
+                       <artifactId>commons-codec</artifactId>\r
+                       <version>1.10</version>\r
+               </dependency>\r
+               <dependency>\r
+                   <groupId>ch.bfh.ti.due1</groupId>\r
+                   <artifactId>date-range</artifactId>\r
+                   <version>1.1</version>\r
+               </dependency>\r
        </dependencies>\r
 \r
        <dependencyManagement>\r
                                                                <report>project-team</report>\r
                                                        </reports>\r
                                                </plugin>\r
-                                               <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> \r
-                                                       <version>2.9.1</version> </plugin> -->\r
+                                               <plugin>\r
+                                                       <groupId>org.apache.maven.plugins</groupId>\r
+                                                       <artifactId>maven-javadoc-plugin</artifactId>\r
+                                                       <version>2.10.3</version>\r
+                                               </plugin>\r
                                                <plugin>\r
                                                        <groupId>org.apache.maven.plugins</groupId>\r
                                                        <artifactId>maven-surefire-report-plugin</artifactId>\r
                                                        <artifactId>jdepend-maven-plugin</artifactId>\r
                                                        <version>2.0</version>\r
                                                </plugin>\r
-                                               <!-- Note: Two Checkstyle reports are generated. Don't know yet why. -->\r
                                                <plugin>\r
                                                        <groupId>org.apache.maven.plugins</groupId>\r
                                                        <artifactId>maven-checkstyle-plugin</artifactId>\r
-                                                       <version>2.16</version>\r
-                                                       <configuration>\r
-                                                               <configLocation>src/checkstyle/checkstyle-configuration.xml</configLocation>\r
-                                                               <headerLocation>src/checkstyle/checkstyle-header.txt</headerLocation>\r
-                                                       </configuration>\r
+                            <version>2.17</version>\r
+                            <configuration>\r
+                                <configLocation>src/checkstyle/checkstyle-configuration.xml</configLocation>\r
+                                <headerLocation>src/checkstyle/checkstyle-header.txt</headerLocation>\r
+                                                               <failsOnError>false</failsOnError>\r
+                            </configuration>\r
                                                        <reportSets>\r
                                                                <reportSet>\r
                                                                        <reports>\r