svn commit: r1492542 - in /servicemix/smx5/trunk: examples/cxf/cxf-wsn/pom.xml parent/pom.xml

2013-06-13 Thread ffang
Author: ffang
Date: Thu Jun 13 07:05:55 2013
New Revision: 1492542

URL: http://svn.apache.org/r1492542
Log:
[SM-2204]a couple of cxf related examples which use spring-dm configuration 
doesn't work due to regression in CXF 2.7.4

Modified:
servicemix/smx5/trunk/examples/cxf/cxf-wsn/pom.xml
servicemix/smx5/trunk/parent/pom.xml

Modified: servicemix/smx5/trunk/examples/cxf/cxf-wsn/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-wsn/pom.xml?rev=1492542r1=1492541r2=1492542view=diff
==
--- servicemix/smx5/trunk/examples/cxf/cxf-wsn/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-wsn/pom.xml Thu Jun 13 07:05:55 2013
@@ -39,7 +39,7 @@
 descriptionCXF example using WSN/description
 
 properties
-cxf-version2.7.4/cxf-version
+cxf-version${cxf.version}/cxf-version
 /properties
 
-/project
\ No newline at end of file
+/project

Modified: servicemix/smx5/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx5/trunk/parent/pom.xml?rev=1492542r1=1492541r2=1492542view=diff
==
--- servicemix/smx5/trunk/parent/pom.xml (original)
+++ servicemix/smx5/trunk/parent/pom.xml Thu Jun 13 07:05:55 2013
@@ -40,7 +40,7 @@
 activemq.version5.8.0/activemq.version
 activiti.version5.10/activiti.version
 camel.version2.11.0/camel.version
-cxf.version2.7.4/cxf.version
+cxf.version2.7.5/cxf.version
 
 felix.obr.version1.6.6/felix.obr.version
 




svn commit: r1492547 - /servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg

2013-06-13 Thread ffang
Author: ffang
Date: Thu Jun 13 07:18:08 2013
New Revision: 1492547

URL: http://svn.apache.org/r1492547
Log:
[SM-2205]add identifier for the org.ops4j.pax.url.mvn.repositories

Modified:

servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg

Modified: 
servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
URL: 
http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg?rev=1492547r1=1492546r2=1492547view=diff
==
--- 
servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
 (original)
+++ 
servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
 Thu Jun 13 07:18:08 2013
@@ -69,11 +69,12 @@ org.ops4j.pax.url.mvn.disableAether=true
 # A repository url can be appended with zero or more of the following flags:
 #@snapshots  : the repository contains snaphots
 #@noreleases : the repository does not contain any released artifacts
+#@id=reponid : the id for the repository, just like in the settings.xml 
this is optional but recomendet
 #
 # The following property value will add the system folder as a repo.
 #
-org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots,\
-file:${karaf.home}/local-repo@snapshots
+org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots@id=karaf.${karaf.default.repository},\
+file:${karaf.home}/local-repo@snapshots@id=karaf.local-repo
 
 #
 # Comma separated list of repositories scanned when resolving an artifact.
@@ -88,13 +89,14 @@ org.ops4j.pax.url.mvn.defaultRepositorie
 # A repository url can be appended with zero or more of the following flags:
 #@snapshots  : the repository contains snaphots
 #@noreleases : the repository does not contain any released artifacts
+#@id=reponid : the id for the repository, just like in the settings.xml 
this is optional but recomendet
 #
 org.ops4j.pax.url.mvn.repositories= \
-http://repo1.maven.org/maven2, \
-
http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases,
 \
-http://svn.apache.org/repos/asf/servicemix/m2-repo, \
-http://repository.springsource.com/maven/bundles/release, \
-http://repository.springsource.com/maven/bundles/external, \
-http://oss.sonatype.org/content/repositories/releases/, \
-https://maven.alfresco.com/nexus/content/groups/public/
+http://repo1.maven.org/maven2@id=maven.central.repo, \
+
http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshot.repo,
 \
+http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix.repo, \
+
http://repository.springsource.com/maven/bundles/release@id=springsource.release.repo,
 \
+
http://repository.springsource.com/maven/bundles/external@id=springsource.external.repo,
 \
+http://oss.sonatype.org/content/repositories/releases/@id=sonatype.repo, \
+https://maven.alfresco.com/nexus/content/groups/public/@id=alfresco.repo
 




Jenkins build is back to normal : ServiceMix5 ยป Apache ServiceMix :: Assemblies :: Apache ServiceMix #30

2013-06-13 Thread Apache Jenkins Server
See 
https://builds.apache.org/job/ServiceMix5/org.apache.servicemix$apache-servicemix/30/