You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by mc...@apache.org on 2017/09/30 10:39:38 UTC
svn commit: r1810189 - in /tiles/framework/trunk: ./ pom.xml
Author: mck
Date: Sat Sep 30 10:39:38 2017
New Revision: 1810189
URL: http://svn.apache.org/viewvc?rev=1810189&view=rev
Log:
`svn merge -c1810188 ^/tiles/framework/branches/TILES_3_0_X`
use tiles-request-1.0.7
Modified:
tiles/framework/trunk/ (props changed)
tiles/framework/trunk/pom.xml
Propchange: tiles/framework/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 30 10:39:38 2017
@@ -1,2 +1,2 @@
-/tiles/framework/branches/TILES_3_0_X:1486577,1538333,1539385,1539481-1541580,1543135,1571643,1594481-1626663,1706314,1752405
+/tiles/framework/branches/TILES_3_0_X:1486577,1538333,1539385,1539481-1541580,1543135,1571643,1594481-1626663,1706314,1752405,1810179,1810188
/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995,1080544,1080580-1081105
Modified: tiles/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?rev=1810189&r1=1810188&r2=1810189&view=diff
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Sat Sep 30 10:39:38 2017
@@ -318,7 +318,7 @@
<tiles.osgi.private />
<tiles.manifestfile>target/osgi/MANIFEST.MF</tiles.manifestfile>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tiles.request.version>1.0.6</tiles.request.version>
+ <tiles.request.version>1.0.7</tiles.request.version>
<tiles.autotag.version>1.1.0</tiles.autotag.version>
</properties>