Merge pull request #34 in ESPD/espd from hotfix-2017.02.01 to master

* commit '2dbf8165f50859600ad85c4d4b3bdd9dc2c5e967': prepare release 2017.02.01 remove polluting log about requirement not found or without a response reduce session to 2 hours
ESPD · Mar 3, 2017 · e663f69 · e663f69
2 parents 8e08a08 + 2dbf816
commit e663f69
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/espd-docs/pom.xml b/espd-docs/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>espd</artifactId>
         <groupId>eu.europa.ec.grow.espd</groupId>
-        <version>2017.02</version>
+        <version>2017.02.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/espd-docs/src/main/asciidoc/espd.adoc b/espd-docs/src/main/asciidoc/espd.adoc
@@ -3,7 +3,7 @@
 Alexey Lukashov +
 Virgiliu Ratoi
 
-v2017.02, 01-03-2017
+v2017.02.01, 03-03-2017
 
 :sourcedir: ../java/eu/europa/ec/grow/espd
 :homepage: https://ec.europa.eu/espd[ESPD]

diff --git a/espd-docs/src/main/asciidoc/releaseNotes.adoc b/espd-docs/src/main/asciidoc/releaseNotes.adoc
@@ -1,5 +1,9 @@
 == Release notes
 
+=== 2017.02.01 (3rd of March 2017)
+
+The duration of the user session stored on the server has been reduced back to 2 hours.
+
 === 2017.02 (1st of March 2017)
 
 ==== Bug

diff --git a/espd-web/pom.xml b/espd-web/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>espd</artifactId>
         <groupId>eu.europa.ec.grow.espd</groupId>
-        <version>2017.02</version>
+        <version>2017.02.01</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>espd-web</artifactId>

diff --git a/...c/main/java/eu/europa/ec/grow/espd/xml/common/importing/EspdResponseCriterionFactory.java b/...c/main/java/eu/europa/ec/grow/espd/xml/common/importing/EspdResponseCriterionFactory.java
@@ -182,11 +182,7 @@ private void setCriterionValueForRequirement(EspdCriterion espdCriterion, Requir
 			} else {
 				addNormalRequirementValueToEspdCriterion(requirementById.get(), espdCriterion, requirementValue);
 			}
-		} else {
-			log.warn("Requirement with id '{}' could not be found or does not have a response.",
-					requirementType.getID().getValue());
 		}
-
 	}
 
 	private void addRequirementValueToUnboundedGroup(CcvCriterionRequirement ccvRequirement,

diff --git a/espd-web/src/main/webapp/WEB-INF/web.xml b/espd-web/src/main/webapp/WEB-INF/web.xml
@@ -7,6 +7,6 @@
         <location>/WEB-INF/views/500.jsp</location>
     </error-page>
     <session-config>
-    	<session-timeout>240</session-timeout>
+    	<session-timeout>120</session-timeout>
     </session-config>
 </web-app>
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
     <groupId>eu.europa.ec.grow.espd</groupId>
     <artifactId>espd</artifactId>
     <packaging>pom</packaging>
-    <version>2017.02</version>
+    <version>2017.02.01</version>
     <modules>
         <module>espd-web</module>
         <module>espd-docs</module>