Merge branch '1.5.x'
This commit is contained in:
		
						commit
						fbd296873a
					
				| 
						 | 
				
			
			@ -48,9 +48,9 @@
 | 
			
		|||
		<!-- Dependency versions -->
 | 
			
		||||
		<activemq.version>5.14.4</activemq.version>
 | 
			
		||||
		<antlr2.version>2.7.7</antlr2.version>
 | 
			
		||||
		<appengine-sdk.version>1.9.50</appengine-sdk.version>
 | 
			
		||||
		<appengine-sdk.version>1.9.51</appengine-sdk.version>
 | 
			
		||||
		<artemis.version>1.5.4</artemis.version>
 | 
			
		||||
		<aspectj.version>1.8.9</aspectj.version>
 | 
			
		||||
		<aspectj.version>1.8.10</aspectj.version>
 | 
			
		||||
		<assertj.version>3.6.2</assertj.version>
 | 
			
		||||
		<atomikos.version>3.9.3</atomikos.version>
 | 
			
		||||
		<bitronix.version>2.1.4</bitronix.version>
 | 
			
		||||
| 
						 | 
				
			
			@ -75,7 +75,7 @@
 | 
			
		|||
		<ehcache3.version>3.2.1</ehcache3.version>
 | 
			
		||||
		<embedded-mongo.version>2.0.0</embedded-mongo.version>
 | 
			
		||||
		<flyway.version>4.1.2</flyway.version>
 | 
			
		||||
		<freemarker.version>2.3.25-incubating</freemarker.version>
 | 
			
		||||
		<freemarker.version>2.3.26-incubating</freemarker.version>
 | 
			
		||||
		<elasticsearch.version>2.4.4</elasticsearch.version>
 | 
			
		||||
		<glassfish-el.version>3.0.0</glassfish-el.version>
 | 
			
		||||
		<groovy.version>2.4.10</groovy.version>
 | 
			
		||||
| 
						 | 
				
			
			@ -115,7 +115,7 @@
 | 
			
		|||
		<jmustache.version>1.13</jmustache.version>
 | 
			
		||||
		<jna.version>4.2.2</jna.version>
 | 
			
		||||
		<joda-time.version>2.9.9</joda-time.version>
 | 
			
		||||
		<jolokia.version>1.3.5</jolokia.version>
 | 
			
		||||
		<jolokia.version>1.3.6</jolokia.version>
 | 
			
		||||
		<jooq.version>3.9.1</jooq.version>
 | 
			
		||||
		<json.version>20140107</json.version>
 | 
			
		||||
		<jsonassert.version>1.4.0</jsonassert.version>
 | 
			
		||||
| 
						 | 
				
			
			@ -185,7 +185,7 @@
 | 
			
		|||
		<thymeleaf-layout-dialect.version>2.1.2</thymeleaf-layout-dialect.version>
 | 
			
		||||
		<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
 | 
			
		||||
		<thymeleaf-extras-java8time.version>3.0.0.RELEASE</thymeleaf-extras-java8time.version>
 | 
			
		||||
		<tomcat.version>8.5.12</tomcat.version>
 | 
			
		||||
		<tomcat.version>8.5.13</tomcat.version>
 | 
			
		||||
		<undertow.version>1.4.11.Final</undertow.version>
 | 
			
		||||
		<unboundid-ldapsdk.version>3.2.1</unboundid-ldapsdk.version>
 | 
			
		||||
		<webjars-hal-browser.version>3325375</webjars-hal-browser.version>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue