[SMX-3213] Upgrade to Apache karaf 4.0.8
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/9dca5d60 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/9dca5d60 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/9dca5d60 Branch: refs/heads/master Commit: 9dca5d60e21ce77e294aad8536acfb54dc4fbe30 Parents: 9e5f3ae Author: Krzysztof Sobkowiak <[email protected]> Authored: Sun Jan 15 22:22:30 2017 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Sun Jan 15 22:22:30 2017 +0100 ---------------------------------------------------------------------- assemblies/apache-servicemix/pom.xml | 3 - .../resources/etc/org.ops4j.pax.logging.cfg | 8 +++ .../resources/etc/org.ops4j.pax.url.mvn.cfg | 76 +++++++++++++++++--- parent/assemblies-parent/pom.xml | 5 +- parent/features-parent/pom.xml | 6 +- 5 files changed, 78 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/9dca5d60/assemblies/apache-servicemix/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml index bbd76b2..07deef0 100644 --- a/assemblies/apache-servicemix/pom.xml +++ b/assemblies/apache-servicemix/pom.xml @@ -255,9 +255,6 @@ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activator/${servicemix.specs.version};type:=default;export:=true</library> <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.locator/${servicemix.specs.version};type:=default;export:=true</library> - - <library>mvn:net.java.dev.jna/jna/${jna.version};type:=boot;export:=false</library> - <library>mvn:net.java.dev.jna/jna-platform/${jna.version};type:=boot;export:=false</library> </libraries> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/servicemix/blob/9dca5d60/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.logging.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.logging.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.logging.cfg index cdea981..b08d999 100644 --- a/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.logging.cfg +++ b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.logging.cfg @@ -24,6 +24,9 @@ log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer # To avoid flooding the log when using DEBUG level on an ssh connection and doing log:tail log4j.logger.org.apache.sshd.server.channel.ChannelSession = INFO +# Avoid extensive logging +log4j.logger.org.apache.aries.spifly.dynamic.bundle=WARN + # Security audit logger log4j.logger.org.apache.karaf.jaas.modules.audit=INFO, audit log4j.additivity.org.apache.karaf.jaas.modules.audit=false @@ -68,3 +71,8 @@ log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-1 #log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log log4j.appender.sift.appender.append=true + +# help with identification of maven-related problems with pax-url-aether +#log4j.logger.shaded.org.eclipse.aether = TRACE +#log4j.logger.shaded.org.apache.http.headers = DEBUG +#log4j.logger.org.ops4j.pax.url.mvn = TRACE \ No newline at end of file http://git-wip-us.apache.org/repos/asf/servicemix/blob/9dca5d60/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg index 93b8ef9..bb89da4 100644 --- a/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg +++ b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg @@ -18,6 +18,10 @@ ################################################################################ # +# see: https://ops4j1.jira.com/wiki/display/paxurl/Aether+Configuration +# + +# # If set to true, the following property will not allow any certificate to be used # when accessing Maven repositories through SSL # @@ -34,6 +38,9 @@ # * 3. if not found looks for ${maven.home}/conf/settings.xml # * 4. if not found looks for ${M2_HOME}/conf/settings.xml # +# Properties prefixed with "org.ops4j.pax.url.mvn." have +# higher priority except <proxies> element. HTTP proxies should be configured in +# settings file #org.ops4j.pax.url.mvn.settings= # @@ -43,27 +50,34 @@ # above, or defaulted to: # System.getProperty( "user.home" ) + "/.m2/repository" # +# leaving this option commented makes the system dependent on external +# configuration, which is not always desired +# "localRepository" is the target location for artifacts downloaded from +# "remote repositories" #org.ops4j.pax.url.mvn.localRepository= # # Default this to false. It's just weird to use undocumented repos +# "false" means that http://repo1.maven.org/maven2@id=central won't be +# implicitly used as remote repository # org.ops4j.pax.url.mvn.useFallbackRepositories=false # -# Uncomment if you don't wanna use the proxy settings -# from the Maven conf/settings.xml file -# -# org.ops4j.pax.url.mvn.proxySupport=false - -# # Comma separated list of repositories scanned when resolving an artifact. +# list of repositories searched in the first place, should contain +# ${runtime.home}/${karaf.default.repository}. +# if "org.ops4j.pax.url.mvn.localRepository" is defined and it's not +# ~/.m2/repository, it's recommended (at least for dev purposes) to add +# ~/.m2/repository to defaultRepositories +# each of these repositories is checked by aether as "local repository". if +# artifact isn't found, "repositories" are searched next +# # Those repositories will be checked before iterating through the # below list of repositories and even before the local repository # 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. # @@ -73,11 +87,22 @@ org.ops4j.pax.url.mvn.defaultRepositories=\ file:${karaf.base}/${karaf.default.repository}@id=child.system.repository@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 +# +# if "defaultLocalRepoAsRemote" is set do *any* value, localRepository will be +# added to the list of remote repositories being searched for artifacts +# +#org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote = true # # Comma separated list of repositories scanned when resolving an artifact. +# list of repositories searched after resolution fails for "defaultRepositories" +# These are true remote repositories accessed using maven/aether/wagon +# mechanisms. If any repository contains required artifact, it is then written +# to "localRepository" +# +# if this list is _prepended_ with '+' sign, all repositories from active +# profiles defined in effective settings.xml file will be _appended_ to this +# list # The default list includes the following repositories: # http://repo1.maven.org/maven2@id=central # http://repository.springsource.com/maven/bundles/release@id=spring.ebr @@ -89,9 +114,10 @@ org.ops4j.pax.url.mvn.defaultRepositories=\ # 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: -# @snapshots : the repository contains snaphots +# @snapshots : the repository contains snapshots # @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 +# @id=repository.id : the id for the repository, just like in the +# settings.xml this is optional but recommended # org.ops4j.pax.url.mvn.repositories= \ http://repo1.maven.org/maven2@id=central, \ @@ -102,3 +128,31 @@ org.ops4j.pax.url.mvn.repositories= \ https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, \ https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases +# +# Global policies override repository-specific settings (@checksum=..., @update=..., @releasesUpdate=..., ...) +# +#org.ops4j.pax.url.mvn.globalUpdatePolicy = daily +#org.ops4j.pax.url.mvn.globalChecksumPolicy = warn + +# +# socket and connection configuration (pax-url-aether 2.5.0) +# +# default value for connection and read timeouts, when socket.readTimeout and socket.connectionTimeout +# are not specified +org.ops4j.pax.url.mvn.timeout = 5000 +# timeout in ms when establishing http connection during artifact resolution +org.ops4j.pax.url.mvn.socket.connectionTimeout = 5000 +# timeout in ms when reading data after connecting to remote repository +org.ops4j.pax.url.mvn.socket.readTimeout = 30000 +# SO_KEEPALIVE option for sockets, defaults to false +org.ops4j.pax.url.mvn.socket.keepAlive = false +# SO_LINGER option for sockets, defaults to -1 +org.ops4j.pax.url.mvn.socket.linger = -1 +# SO_REUSEADDR option for sockets, defaults to false +org.ops4j.pax.url.mvn.socket.reuseAddress = false +# TCP_NODELAY option for sockets, defaults to true +org.ops4j.pax.url.mvn.socket.tcpNoDelay = true +# Configure buffer size for HTTP connections (output and input buffers), defaults to 8192 bytes +org.ops4j.pax.url.mvn.connection.bufferSize = 8192 +# Number of connection retries after failure is detected in http client. httpclient uses default value "3" +org.ops4j.pax.url.mvn.connection.retryCount = 3 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/servicemix/blob/9dca5d60/parent/assemblies-parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/assemblies-parent/pom.xml b/parent/assemblies-parent/pom.xml index c9d9b6a..47fef49 100644 --- a/parent/assemblies-parent/pom.xml +++ b/parent/assemblies-parent/pom.xml @@ -43,9 +43,8 @@ <cxf.version>3.1.5</cxf.version> <fasterxml.jackson.version>2.6.3</fasterxml.jackson.version> <geronimo-atinject.version>1.0</geronimo-atinject.version> - <jna.version>4.2.2</jna.version> <jodatime2.bundle.version>2.9</jodatime2.bundle.version> - <karaf.version>4.0.7</karaf.version> + <karaf.version>4.0.8</karaf.version> <pax.exam.version>4.9.1</pax.exam.version> <pax.logging.version>1.8.5</pax.logging.version> <servicemix.specs.version>2.7.0</servicemix.specs.version> @@ -54,7 +53,7 @@ <xerces.version>2.11.0</xerces.version> <depends-maven-plugin.version>1.3.1</depends-maven-plugin.version> - <maven-bundle-plugin.version>3.0.1</maven-bundle-plugin.version> + <maven-bundle-plugin.version>3.2.0</maven-bundle-plugin.version> <maven-archetype-packaging-version>2.0</maven-archetype-packaging-version> </properties> http://git-wip-us.apache.org/repos/asf/servicemix/blob/9dca5d60/parent/features-parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/features-parent/pom.xml b/parent/features-parent/pom.xml index 16df76e..d3abdb2 100644 --- a/parent/features-parent/pom.xml +++ b/parent/features-parent/pom.xml @@ -42,10 +42,10 @@ <activiti.version>5.19.0.2</activiti.version> <akka.version>2.3.9</akka.version> - <aries.blueprint.core.version>1.6.2</aries.blueprint.core.version> + <aries.blueprint.core.version>1.7.1</aries.blueprint.core.version> <aries.jpa.version>2.3.0</aries.jpa.version> <aries.proxy.version>1.0.5</aries.proxy.version> - <aries.transaction.version>1.3.0</aries.transaction.version> + <aries.transaction.version>1.3.1</aries.transaction.version> <aries.util.version>1.1.1</aries.util.version> <commons-httpclient.bundle.version>3.1_7</commons-httpclient.bundle.version> <commons-codec.bundle.version>1.10</commons-codec.bundle.version> @@ -71,7 +71,7 @@ <mvel2.version>2.2.1.Final</mvel2.version> <mybatis.version>3.3.0</mybatis.version> <osgi.version>6.0.0</osgi.version> - <!--<pax.url.version>2.4.7</pax.url.version>--> + <!--<pax.url.version>2.5.2</pax.url.version>--> <postgresql.version>9.1-901</postgresql.version> <reflections.bundle.version>0.9.10_3</reflections.bundle.version> <scala.version>2.11.7</scala.version>
