Merge branch 'develop' of https://github.com/tagbangers/wallride

tagbangers · Feb 21, 2017 · d4eaa36 · d4eaa36
2 parents 10da53a + 7f676b9
commit d4eaa36
Show file tree

Hide file tree

Showing 55 changed files with 963 additions and 2,565 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,10 @@ and easy deploy to AWS BeansTalk(of course other servlet containers)
 
 We hope this CMS is loved by many developers of principles all over the world.
 
+Documentation
+========
+[Documentation is here.](http://wallride.org/docs/guide.html)
+
 Screen Shots
 ========
 [Screen Shots is here.](https://github.com/tagbangers/wallride/wiki/Screen-shots)
diff --git a/pom.xml b/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.4.RELEASE</version>
 	</parent>
 	<groupId>org.wallride</groupId>
 	<artifactId>wallride</artifactId>
-	<version>1.0.0.M9</version>
+	<version>1.0.0.M10</version>
 	<packaging>pom</packaging>
 	<name>WallRide</name>
 	<description>CMS for developers of principles</description>
@@ -55,13 +55,16 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-aws-context.verion>1.0.4.RELEASE</spring-cloud-aws-context.verion>
+		<spring-cloud-aws-context.verion>1.1.0.RELEASE</spring-cloud-aws-context.verion>
+		<thymeleaf.version>3.0.0.RELEASE</thymeleaf.version>
+		<thymeleaf-extras-springsecurity4.version>3.0.0.RELEASE</thymeleaf-extras-springsecurity4.version>
+		<thymeleaf-extras-java8time.version>3.0.0.RELEASE</thymeleaf-extras-java8time.version>
 		<hibernate.version>5.1.0.Final</hibernate.version>
-		<hibernate-search.version>5.5.2.Final</hibernate-search.version>
+		<hibernate-search.version>5.5.4.Final</hibernate-search.version>
 		<infinispan.version>8.1.0.Final</infinispan.version>
 		<infinispan-spring4.version>8.1.0.Alpha2</infinispan-spring4.version>
 		<lucene.version>5.3.0</lucene.version>
-		<amazonaws-version>1.10.66</amazonaws-version>
+		<amazonaws-version>1.11.25</amazonaws-version>
 	</properties>
 
 	<modules>
@@ -77,7 +80,7 @@
 			<dependency>
 				<groupId>org.wallride</groupId>
 				<artifactId>wallride-core</artifactId>
-				<version>1.0.0.M9</version>
+				<version>1.0.0.M10</version>
 			</dependency>
 
 			<!-- Spring -->

diff --git a/wallride-bootstrap/pom.xml b/wallride-bootstrap/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.wallride</groupId>
         <artifactId>wallride-parent</artifactId>
-        <version>1.0.0.M9</version>
+        <version>1.0.0.M10</version>
         <relativePath>../wallride-parent/pom.xml</relativePath>
     </parent>
     <artifactId>wallride-bootstrap</artifactId>
@@ -24,6 +24,12 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- MySQL Driver -->
         <dependency>
             <groupId>mysql</groupId>