From acab68bb8618b2b178b667191ce4aba5248977d7 Mon Sep 17 00:00:00 2001
From: linzhixing <tomoyuki.hayashi@aegif.jp>
Date: Fri, 26 Aug 2016 16:27:04 +0900
Subject: [PATCH] Ver.2.3.16

---
 core/pom.xml                                                    | 2 +-
 .../jp/aegif/nemaki/cmis/service/impl/ObjectServiceImpl.java    | 1 -
 core/src/main/webapp/WEB-INF/classes/repositories.yml           | 2 +-
 setup/installer/install.xml                                     | 2 +-
 setup/installer/tomcat/app-server-core-repositories.yml         | 2 +-
 solr/pom.xml                                                    | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 56237214..aba84434 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>jp.aegif.nemaki</groupId>
 	<artifactId>core</artifactId>
 	<packaging>war</packaging>
-	<version>2.3.15</version>
+	<version>2.3.16</version>
 	<name>core</name>
 	<description>NemakiWare server</description>
 	<url>https://github.com/NemakiWare/NemakiWare</url>
diff --git a/core/src/main/java/jp/aegif/nemaki/cmis/service/impl/ObjectServiceImpl.java b/core/src/main/java/jp/aegif/nemaki/cmis/service/impl/ObjectServiceImpl.java
index 61c106bb..ded81baf 100644
--- a/core/src/main/java/jp/aegif/nemaki/cmis/service/impl/ObjectServiceImpl.java
+++ b/core/src/main/java/jp/aegif/nemaki/cmis/service/impl/ObjectServiceImpl.java
@@ -1103,7 +1103,6 @@ private void _getLeafDescendants(String repositoryId, Content content, List<Cont
 		}
 	}
 	
-	
 	private List<DeleteResult> deleteFolderTree(CallContext callContext, String repositoryId, Folder folder, Boolean allVersions){
 		List<DeleteResult> result = new ArrayList<>();
 		_deleteFolderTree(callContext, repositoryId, folder, allVersions, result);
diff --git a/core/src/main/webapp/WEB-INF/classes/repositories.yml b/core/src/main/webapp/WEB-INF/classes/repositories.yml
index a7571989..d73fc7f1 100644
--- a/core/src/main/webapp/WEB-INF/classes/repositories.yml
+++ b/core/src/main/webapp/WEB-INF/classes/repositories.yml
@@ -6,7 +6,7 @@ default:
   thinClientUri: http://localhost:8080/ui/
   vendor: aegif
   product.name: NemakiWare
-  product.version: 2.3.15
+  product.version: 2.3.16
   namespace: http://www.aegif.jp/NemakiWare/
 super.users: canopy
 repositories:
diff --git a/setup/installer/install.xml b/setup/installer/install.xml
index 4f7b36ee..f529f88b 100755
--- a/setup/installer/install.xml
+++ b/setup/installer/install.xml
@@ -3,7 +3,7 @@
   <!-- Application info -->
   <info>
     <appname>NemakiWare</appname>
-    <appversion>2.3.15</appversion>
+    <appversion>2.3.16</appversion>
     <url>http://www.nemakiware.com/</url>
     <!--
     If you a general user install on C:¥Program Files on Windows,
diff --git a/setup/installer/tomcat/app-server-core-repositories.yml b/setup/installer/tomcat/app-server-core-repositories.yml
index 114ccf8e..b200f587 100644
--- a/setup/installer/tomcat/app-server-core-repositories.yml
+++ b/setup/installer/tomcat/app-server-core-repositories.yml
@@ -6,7 +6,7 @@ default:
   thinClientUri: http://localhost:8080/ui/
   vendor: aegif
   product.name: NemakiWare
-  product.version: 2.3.15
+  product.version: 2.3.16
   namespace: http://www.aegif.jp/NemakiWare/
 super.users: canopy
 repositories:
diff --git a/solr/pom.xml b/solr/pom.xml
index 371a9ad6..f11c6328 100644
--- a/solr/pom.xml
+++ b/solr/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>jp.aegif.nemaki</groupId>
 	<artifactId>solr</artifactId>
 	<packaging>war</packaging>
-	<version>2.3.15</version>
+	<version>2.3.16</version>
 	<name>solr</name>
 	<description>Solr customized for Nemaki</description>
 	<url>https://github.com/NemakiWare/NemakiWare</url>