WIP

shaundsmith · Jan 7, 2015 · 7cb2a81 · 7cb2a81
1 parent 7edba47
commit 7cb2a81
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 12 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     compile "net.sf.flexjson:flexjson:2.1"
     compile "org.freemarker:freemarker:2.3.19"
     compile "net.sourceforge.jexcelapi:jxl:2.6.12"
-    compile "asm:asm:3.3.1"
+//    compile "asm:asm:3.3.1"
     compile "org.springframework:spring-test:3.2.3.RELEASE" // optional
     compile "org.springframework:spring-context:3.2.3.RELEASE" // optional
     compile "org.springframework:spring-context-support:3.2.3.RELEASE" // optional
@@ -80,11 +80,12 @@ dependencies {
         exclude group: 'org.seleniumhq.selenium', module:'selenium-java'
         exclude group: 'junit', module: 'junit-dep'
     }
-    compile "xml-apis:xml-apis:1.4.01"
+//    compile "xml-apis:xml-apis:1.4.01"
     compile "com.jhlabs:filters:2.0.235"
     compile "org.asciidoctor:asciidoctor-java-integration:0.1.3"
     compile "com.google.code.gson:gson:2.2.4"
     compile "junit:junit:4.11"
+    compile "javax.validation:validation-api:1.1.0.Final"
     compile "org.hibernate:hibernate-validator:5.1.1.Final"
     compile "javax.el:javax.el-api:2.2.4"
     compile "org.glassfish.web:javax.el:2.2.4"
@@ -103,4 +104,19 @@ processResources {
      filter ReplaceTokens, tokens: [
             "application.version": "" + version
     ]
+}
+
+task writeNewPom << {
+    pom {
+        project {
+            inceptionYear '2008'
+            licenses {
+                license {
+                    name 'The Apache Software License, Version 2.0'
+                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    distribution 'repo'
+                }
+            }
+        }
+    }.writeTo("pom.xml")
 }
diff --git a/core/gradle/wrapper/gradle-wrapper.properties b/core/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Oct 14 09:57:47 EST 2014
+#Sat Dec 27 09:47:43 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/core/src/main/java/net/thucydides/core/model/TestOutcome.java b/core/src/main/java/net/thucydides/core/model/TestOutcome.java
@@ -31,7 +31,6 @@
 import org.joda.time.DateTime;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.text.html.Option;
 import javax.validation.constraints.NotNull;
 import java.io.File;
 import java.io.IOException;

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Thu Oct 30 12:00:46 EST 2014
+#Wed Jan 07 17:18:39 GMT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/release-notes.md b/release-notes.md
@@ -24,6 +24,8 @@
   -  Automated the generation of the release notes from the git commits
 ## Miscellaneous
   - Improved release notes to avoid empty tags
+  - Improved release notes to avoid empty tags
+  - Updated release notes
   - Merge branch 'master' of github.com:serenity-bdd/serenity-core
   - Updated the README file to reflect the new commit conventions
   - Updated release notes

diff --git a/serenity-ant-task/gradle/wrapper/gradle-wrapper.properties b/serenity-ant-task/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Oct 14 09:57:47 EST 2014
+#Sat Dec 27 09:47:43 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/serenity-browsermob-plugin/gradle/wrapper/gradle-wrapper.properties b/serenity-browsermob-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Oct 14 09:57:47 EST 2014
+#Sat Dec 27 09:47:43 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/serenity-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/serenity-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Thu Oct 30 11:47:42 EST 2014
+#Sat Dec 27 09:47:43 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/serenity-junit/gradle/wrapper/gradle-wrapper.properties b/serenity-junit/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Oct 14 09:57:48 EST 2014
+#Sat Dec 27 09:47:43 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/serenity-report-resources/gradle/wrapper/gradle-wrapper.properties b/serenity-report-resources/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Oct 14 09:57:48 EST 2014
+#Sat Dec 27 09:47:43 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/serenity-sample-alternative-resources/gradle/wrapper/gradle-wrapper.properties b/serenity-sample-alternative-resources/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Oct 14 09:57:48 EST 2014
+#Sat Dec 27 09:47:43 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/serenity-test-utils/gradle/wrapper/gradle-wrapper.properties b/serenity-test-utils/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Oct 14 09:57:48 EST 2014
+#Sat Dec 27 09:47:43 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME