Merge branch '240-release-2-3' into 'master'

Resolve "Release 2.3"

Closes #240

See merge request genesys-pgr/genesys-server!139

.gitlab-ci.yml

 variables:
-  GENESYS_VERSION:        "2.2"
+  GENESYS_VERSION:        "2.3"
   DOCKER_HOST:            genesys1.swarm.genesys-pgr.org
   DOCKER_VERSION:         latest
 

CHANGELOG.md

 
+# Release 2.3
+
+December 2017
+
+* 7c363aa6 CSS for printing
+* 91a79f43 Wrong navigation through the links in the Table of Contents
+* b6722c0e Documentation updated
+* 42764813 Update acl_sid table with user#email
+* beb8531d CSS updates for 2.3
+* 349bcbb0 Statistics API endpoint
+* a4d50529 Crop page as JSON
+* b1cb5dc4 BUG accession-turtle
+* 72adc78a File management for institute updated
+* f56ec599 Manage metadata for institutes
+* 6162ee2b Custom tag for repository file
+* 6d67b951 BrAPI error
+* 8207ffe0 removed assembly jetty
+* 8e5d1dcb "Refine search by trait" filters doesn't work properly
+* a33470d0 Grunt with hashes
+* 4bc1b49e Documented the password, client_credentials grants
+* a721f7d1 Migrate to npm
+* bb96e523 Fixed bug in registration of new OAuth clients
+* 74b36c0b Migration of data to new app-blocks:1.3 for ACL
+* 9bcbdcf0 Refactored for updated app-blocks ACL security
+* d8c29ae5 Application configuration updated
+* cbb0512e Editor for OAuth Client details
+* bf7d1a68 OAuthClient as ACL SID
+* 95ab33c4 Links to WIEWS institute information page are changed
+* 7fdf8a3b Properly handle rewriting for URLs starting with //
+* 16d4f666 Fixed decorator/1/admin.jsp
+* d1867dae Fixed code for invalid exceptions thrown in UserService
+* 17b21f88 NPE fixed in BatchRESTService
+* 1dea75f5 Beanshell admin tool
+* cfd309b6 Logging reduced
+* ec1ffbe2 href and src missing <c:url (fixes #211)
+* bb8d61d4 DOI not linked
+* 4be39791 Register Genesys as target for passport data for accessions with DOI
+* b2396d21 KML exhausts memory
+* c56fee41 Hazelcast doesn't recognize members array
+* 0f6323d3 Removed NewGUIFilter and view resolver
+* ae53a395 Ability to save empty list of accessions
+
+
 # Genesys release 2.2
 
 October 2017

README.md

@@ -7,7 +7,7 @@ These instructions will help you run a copy of the Genesys portal (without the d
 ## Running genesys2-server with Docker
 
 ```shell
-docker run dockerhub.croptrust.org/genesys-pgr/genesys-server:2.2
+docker run dockerhub.croptrust.org/genesys-pgr/genesys-server:2.3
 ```
 
 The genesys container can be configured via environment variables (`-e` docker flag).

pom.xml

@@ -23,7 +23,7 @@
 
 	<name>Genesys 2 Server</name>
 	<packaging>war</packaging>
-	<version>2.2</version>
+	<version>2.3</version>
 	<url>https://www.genesys-pgr.org</url>
 	<description>Genesys 2 Server</description>
 
@@ -38,7 +38,7 @@
 		<connection>https://gitlab.croptrust.org/genesys-pgr/genesys-server.git</connection>
 		<developerConnection>scm:git:git@gitlab.croptrust.org:genesys-pgr/genesys-server.git</developerConnection>
 		<url>git@gitlab.croptrust.org:genesys-pgr/genesys-server.git</url>
-		<tag>genesys2-server-2.1</tag>
+		<tag>genesys2-server-2.3</tag>
 	</scm>
 
 	<organization>
@@ -58,7 +58,7 @@
 		<snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
 
 		<junit.version>4.12</junit.version>
-		<application.blocks.version>1.3-SNAPSHOT</application.blocks.version>
+		<application.blocks.version>1.3</application.blocks.version>
 		<commons.beanutils.version>1.9.2</commons.beanutils.version>
 		<commons.collections.version>3.2.1</commons.collections.version>
 		<commons.fileupload.version>1.3.1</commons.fileupload.version>
@@ -510,7 +510,7 @@
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>file-repository-ftpserver</artifactId>
-			<version>0.9-SNAPSHOT</version>
+			<version>0.9</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
@@ -536,7 +536,7 @@
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>glis-client-resttemplate</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache-extras.beanshell</groupId>