From e4a6a99d894baa0e1bf52e5d49d9672b81b8422c Mon Sep 17 00:00:00 2001
From: Edvard Fonsell <edvard.fonsell@nitorcreations.com>
Date: Fri, 12 Dec 2014 19:08:54 +0200
Subject: [PATCH 1/3] update cxf, jetty, junit and spring

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1de6e0de5..d0465fa7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
   </modules>
   <properties>
     <jdk.version>1.7</jdk.version>
-    <apache.cxf.version>3.0.2</apache.cxf.version>
+    <apache.cxf.version>3.0.3</apache.cxf.version>
     <commons.lang.version>2.6</commons.lang.version>
     <commons.lang3.version>3.3.2</commons.lang3.version>
     <core-utils.version>1.4</core-utils.version>
@@ -93,8 +93,8 @@
     <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
     <javax.ws.rs.version>2.0.1</javax.ws.rs.version>
     <jodatime.version>2.6</jodatime.version>
-    <jetty.version>9.2.5.v20141112</jetty.version>
-    <junit.version>4.11</junit.version>
+    <jetty.version>9.2.6.v20141205</jetty.version>
+    <junit.version>4.12</junit.version>
     <logback-classic.version>1.1.2</logback-classic.version>
     <maven-clean.version>2.6.1</maven-clean.version>
     <maven-cobertura.version>2.6</maven-cobertura.version>
@@ -125,7 +125,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <slf4j.version>1.7.7</slf4j.version>
-    <spring.version>4.1.2.RELEASE</spring.version>
+    <spring.version>4.1.3.RELEASE</spring.version>
     <swagger.version>1.3.11</swagger.version>
     <swagger.ui.version>2.0.24</swagger.ui.version>
     <validation.api.version>1.1.0.Final</validation.api.version>

From 4dd02f1125f89f290aacb7f66208237641246cf7 Mon Sep 17 00:00:00 2001
From: Edvard Fonsell <edvard.fonsell@nitorcreations.com>
Date: Tue, 16 Dec 2014 10:09:40 +0200
Subject: [PATCH 2/3] update h2, maven-swagger-plugin, mockito and slf4j

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index d0465fa7f..adc085251 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
     <el.version>3.0.0</el.version>
     <findbugs-annotations.version>3.0.0</findbugs-annotations.version>
     <findbugs.version>3.0.0</findbugs.version>
-    <h2.version>1.4.182</h2.version>
+    <h2.version>1.4.183</h2.version>
     <hamcrest.version>1.3</hamcrest.version>
     <hibernate.validator.version>5.1.3.Final</hibernate.validator.version>
     <hikaricp.version>2.2.5</hikaricp.version>
@@ -115,8 +115,8 @@
     <maven-site.version>3.4</maven-site.version>
     <maven-source.version>2.4</maven-source.version>
     <maven-surefire.version>2.18</maven-surefire.version>
-    <maven-swagger.version>2.3.1</maven-swagger.version>
-    <mockito.version>1.10.8</mockito.version>
+    <maven-swagger.version>2.3.2</maven-swagger.version>
+    <mockito.version>1.10.17</mockito.version>
     <multithreadedtc.version>1.01</multithreadedtc.version>
     <mysql.version>5.1.34</mysql.version>
     <nflow.explorer.version>0.0.2</nflow.explorer.version>
@@ -124,7 +124,7 @@
     <postgresql.version>9.3-1102-jdbc41</postgresql.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <slf4j.version>1.7.7</slf4j.version>
+    <slf4j.version>1.7.8</slf4j.version>
     <spring.version>4.1.3.RELEASE</spring.version>
     <swagger.version>1.3.11</swagger.version>
     <swagger.ui.version>2.0.24</swagger.ui.version>

From 489685069289b7590e356f62804e228971c4839c Mon Sep 17 00:00:00 2001
From: Edvard Fonsell <edvard.fonsell@nitorcreations.com>
Date: Wed, 17 Dec 2014 11:29:55 +0200
Subject: [PATCH 3/3] increase javadoc line length to 130 (same as java code)

---
 nflow-engine/.settings/org.eclipse.jdt.core.prefs   | 2 +-
 nflow-jetty/.settings/org.eclipse.jdt.core.prefs    | 2 +-
 nflow-metrics/.settings/org.eclipse.jdt.core.prefs  | 2 +-
 nflow-rest-api/.settings/org.eclipse.jdt.core.prefs | 2 +-
 nflow-tests/.settings/org.eclipse.jdt.core.prefs    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nflow-engine/.settings/org.eclipse.jdt.core.prefs b/nflow-engine/.settings/org.eclipse.jdt.core.prefs
index bd105ad09..603ee251f 100644
--- a/nflow-engine/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-engine/.settings/org.eclipse.jdt.core.prefs
@@ -158,7 +158,7 @@ org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=130
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/nflow-jetty/.settings/org.eclipse.jdt.core.prefs b/nflow-jetty/.settings/org.eclipse.jdt.core.prefs
index 16ee62d2c..269550bdf 100644
--- a/nflow-jetty/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-jetty/.settings/org.eclipse.jdt.core.prefs
@@ -158,7 +158,7 @@ org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=130
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/nflow-metrics/.settings/org.eclipse.jdt.core.prefs b/nflow-metrics/.settings/org.eclipse.jdt.core.prefs
index 6507f9dc5..bb1bf0e49 100644
--- a/nflow-metrics/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-metrics/.settings/org.eclipse.jdt.core.prefs
@@ -157,7 +157,7 @@ org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=130
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/nflow-rest-api/.settings/org.eclipse.jdt.core.prefs b/nflow-rest-api/.settings/org.eclipse.jdt.core.prefs
index 4c9e34fd6..f49407b34 100644
--- a/nflow-rest-api/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-rest-api/.settings/org.eclipse.jdt.core.prefs
@@ -150,7 +150,7 @@ org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=130
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
diff --git a/nflow-tests/.settings/org.eclipse.jdt.core.prefs b/nflow-tests/.settings/org.eclipse.jdt.core.prefs
index 4c9e34fd6..f49407b34 100644
--- a/nflow-tests/.settings/org.eclipse.jdt.core.prefs
+++ b/nflow-tests/.settings/org.eclipse.jdt.core.prefs
@@ -150,7 +150,7 @@ org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=130
 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false