You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ja...@apache.org on 2012/07/09 21:38:03 UTC
svn commit: r1359361 - in /servicemix/smx4/features/branches/features-4.4.x:
./ assemblies/shared/src/main/resources/etc/custom.properties
Author: janstey
Date: Mon Jul 9 19:38:02 2012
New Revision: 1359361
URL: http://svn.apache.org/viewvc?rev=1359361&view=rev
Log:
Merged revisions 1239315 via svnmerge from
https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk
........
r1239315 | janstey | 2012-02-01 17:20:01 -0330 (Wed, 01 Feb 2012) | 1 line
SMX4-1084 - remove trailing comma so system bundle exports can be parsed with Felix 4.0.x
........
Modified:
servicemix/smx4/features/branches/features-4.4.x/ (props changed)
servicemix/smx4/features/branches/features-4.4.x/assemblies/shared/src/main/resources/etc/custom.properties
Propchange: servicemix/smx4/features/branches/features-4.4.x/
------------------------------------------------------------------------------
Merged /servicemix/smx4/features/trunk:r1239315
Propchange: servicemix/smx4/features/branches/features-4.4.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jul 9 19:38:02 2012
@@ -1 +1 @@
-/servicemix/smx4/features/trunk:1-1215210,1232811,1244513,1298713,1299584,1302577,1307720,1347872,1358015
+/servicemix/smx4/features/trunk:1-1215210,1232811,1239315,1244513,1298713,1299584,1302577,1307720,1347872,1358015
Modified: servicemix/smx4/features/branches/features-4.4.x/assemblies/shared/src/main/resources/etc/custom.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/branches/features-4.4.x/assemblies/shared/src/main/resources/etc/custom.properties?rev=1359361&r1=1359360&r2=1359361&view=diff
==============================================================================
--- servicemix/smx4/features/branches/features-4.4.x/assemblies/shared/src/main/resources/etc/custom.properties (original)
+++ servicemix/smx4/features/branches/features-4.4.x/assemblies/shared/src/main/resources/etc/custom.properties Mon Jul 9 19:38:02 2012
@@ -115,5 +115,5 @@ org.osgi.framework.system.packages.extra
org.apache.xerces.xni.grammars; version="2.11.0", \
org.apache.xerces.impl.xs; version="2.11.0", \
org.apache.xerces.impl.validation; version="2.11.0", \
- org.apache.xml.serialize; version="2.11.0", \
+ org.apache.xml.serialize; version="2.11.0"