SM-2321: Upgrade to Karaf 3.0.2
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/5eed29af Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/5eed29af Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/5eed29af Branch: refs/heads/master Commit: 5eed29afc4fbf49f094b9026e5f2b5c5cb46b60f Parents: ba1ee8e Author: Krzysztof Sobkowiak <[email protected]> Authored: Mon Nov 3 23:50:32 2014 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Mon Nov 3 23:50:32 2014 +0100 ---------------------------------------------------------------------- .../src/main/resources/etc/custom.properties | 3 +- .../resources/etc/org.ops4j.pax.url.mvn.cfg | 32 +++++++++++--------- .../src/main/resources/etc/users.properties | 2 +- .../itests/IntegrationTestConfigurations.scala | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 23 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/assembly/src/main/resources/etc/custom.properties ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/etc/custom.properties b/assembly/src/main/resources/etc/custom.properties index eff5579..53965f1 100644 --- a/assembly/src/main/resources/etc/custom.properties +++ b/assembly/src/main/resources/etc/custom.properties @@ -115,7 +115,8 @@ 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", \ + sun.misc # # Delay console startup until bundles have been properly started http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg index f4ebff5..54ee0ae 100644 --- a/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg +++ b/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg @@ -57,12 +57,6 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false # org.ops4j.pax.url.mvn.proxySupport=false # -# Disable aether support by default. This ensure that the defaultRepositories -# below will be used -# -org.ops4j.pax.url.mvn.disableAether=true - -# # Comma separated list of repositories scanned when resolving an artifact. # Those repositories will be checked before iterating through the # below list of repositories and even before the local repository @@ -73,17 +67,24 @@ org.ops4j.pax.url.mvn.disableAether=true # # 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@id=karaf.${karaf.default.repository},\ - file:${karaf.home}/local-repo@snapshots@id=karaf.local-repo +org.ops4j.pax.url.mvn.defaultRepositories=\ + file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots,\ + file:${karaf.data}/kar@id=kar.repository@multi@snapshots + file:${karaf.home}/local-repo@snapshots@id=system.local-repo + +# Use the default local repo (e.g.~/.m2/repository) as a "remote" repo +#org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false # # Comma separated list of repositories scanned when resolving an artifact. # The default list includes the following repositories: -# http://repo1.maven.org/maven2 -# http://repository.apache.org/content/groups/snapshots-group -# http://svn.apache.org/repos/asf/servicemix/m2-repo -# http://repository.springsource.com/maven/bundles/release -# http://repository.springsource.com/maven/bundles/external +# http://repo1.maven.org/maven2@id=maven.central.repo, \ +# http://repository.springsource.com/maven/bundles/release@id=springsource.release.repo, \ +# http://repository.springsource.com/maven/bundles/external@id=springsource.external.repo, \ +# http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \ +# http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \ +# http://zodiac.springsource.com/maven/bundles/release@id=gemini, \ +# https://oss.sonatype.org/content/repositories/releases/@id=maven.sonatype.repo # To add repositories to the default ones, prepend '+' to the list of repositories # to add. # A repository url can be appended with zero or more of the following flags: @@ -93,9 +94,10 @@ org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.rep # org.ops4j.pax.url.mvn.repositories= \ http://repo1.maven.org/maven2@id=maven.central.repo, \ - http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \ - http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \ http://repository.springsource.com/maven/bundles/release@id=springsource.release.repo, \ http://repository.springsource.com/maven/bundles/external@id=springsource.external.repo, \ + http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \ + http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \ + http://zodiac.springsource.com/maven/bundles/release@id=gemini, \ https://oss.sonatype.org/content/repositories/releases/@id=maven.sonatype.repo http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/assembly/src/main/resources/etc/users.properties ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/etc/users.properties b/assembly/src/main/resources/etc/users.properties index e066450..ca4b482 100644 --- a/assembly/src/main/resources/etc/users.properties +++ b/assembly/src/main/resources/etc/users.properties @@ -30,7 +30,7 @@ # with the name "karaf". # smx = smx,_g_:admingroup -_g_\:admingroup = group,admin,manager,viewer +_g_\:admingroup = group,admin,manager,viewer,webconsole # Workaround for SM-2267: sometimes, the webconsole configuration first hands out a ConnectionFactory # that uses karaf/karaf as the credentials before picking up the settings in system.properties http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala ---------------------------------------------------------------------- diff --git a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala index 070046e..9681fbc 100644 --- a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala +++ b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala @@ -51,7 +51,7 @@ trait IntegrationTestConfigurations { karafDistributionConfiguration(). frameworkUrl( maven().groupId("org.apache.servicemix").artifactId(artifact).`type`("zip").versionAsInProject()). - karafVersion("3.0.1").name("Apache ServiceMix (${name})"). + karafVersion("3.0.2").name("Apache ServiceMix (${name})"). unpackDirectory(new File(s"target/pax-exam/${artifact}")). useDeployFolder(false), keepRuntimeFolder(), http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index e6315e1..2acfedd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -43,7 +43,7 @@ <cxf.version>3.0.2</cxf.version> <felix.bundlerepository.version>2.0.2</felix.bundlerepository.version> - <karaf.version>3.0.2-SNAPSHOT</karaf.version> + <karaf.version>3.0.2</karaf.version> <aries.proxy.version>1.0.3</aries.proxy.version> <aries.util.version>1.1.0</aries.util.version> <aries.blueprint.core.version>1.4.1</aries.blueprint.core.version> http://git-wip-us.apache.org/repos/asf/servicemix/blob/5eed29af/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3e803f2..72bbb76 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ <pax.url.version>2.2.0</pax.url.version> <postgresql.version>9.1-901</postgresql.version> <slf4j.version>1.7.5</slf4j.version> - <spring.version>3.2.9.RELEASE_1</spring.version> + <spring.version>3.2.11.RELEASE_1</spring.version> <wss4j.version>1.6.15</wss4j.version> </properties>
