You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/12/07 03:31:31 UTC
[karaf] branch KARAF-5447 updated (267eae4 -> 019f357)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch KARAF-5447
in repository https://gitbox.apache.org/repos/asf/karaf.git.
omit 267eae4 [KARAF-5447] Fix integration tests
omit 8c58de5 Switch to released version under vote
omit 38af4e2 [KARAF-5447] Support Spring 5.0.x
add 13ce82e [KARAF-5455]remove redundant sshRole comment
add 75e051f [KARAF-5458] Use correct location to calculate target path for downloaded artifact
add 2e420da [KARAF-5461]incorrect filter in EncryptionSupport of jaas modules
add fc70bda [KARAF-5456]introduce a property karaf.shell.history.file.maxSize to configure the history file size on disk
add c9bffd9 [KARAF-5467]Karaf doesn't recognize Java 9 on Ubuntu 16.04
add 94cd1e0 [KARAF-5467]more fix
add d4ed5e5 localRepositoryPath works now for maven-invoker-plugin tests (real local repository as remote in it/
add 4cd28b2 [KARAF-5470] Extend enforce JDK version range to include Java 9
add a06a34c Remove unnecessary code
add 36b6a46 Merge pull request #393 from tadayosi/master
add e424722 Do not attempt to start already starting bundles
add 7ec85f0 Remove unused option
add 634ba15 When removing a features repository, handle the fact that another repo can provide the required feature
add 631e9b0 Deduplicate the java process management code in karaf
add e21ba2b [KARAF-5476] Reduce number of logins when using the webconsole
add ef1595d Fix bin/inc to work with any shell
add 7ad0da3 [KARAF-5427] Shell reflection / redirection should require admin role by default
add 3d57887 [KARAF-5475] Add a ClientPrincipal containing the connection method / remote ip
add 851c582 [KARAF-5475] Send an event to EventAdmin after having executed a command in the shell and include the result / exception
add 26a948b [KARAF-5475] Add EventAdmin support to JMX
add 6ff0873 [KARAF-5475] Create an audit bundle that logs to file / tcp / udp / jul
add 1a24059 [KARAF-5475] Fix tests to be timezone independent
add 46e8b90 [KARAF-5446] Fragment bundles are not resolved properly when installing/restarting the container
add b186ba3 Fix performance issue generating service metadata, change logging
add 92b505c [KARAF-5494] Merge branch 'master' of https://github.com/mhus/karaf into mhus-master
add 75f345c [KARAF-5475] Fix tests to be timezone independent
add 4bb3dc2 [KARAF-3674] Improve Karaf scheduler documentation
add 63b0a6c [KARAF-5475] Remove "log_" prefix in subtype, use a synchronous bundle listener to obtain the subject correctly
add 1d70817 [KARAF-5475] Ability to use custom layouts using fragments
add e57cb70 Fix gogo webconsole plugin
add b46deee Use a StringBuilder instead of string concatenations
add c89d5aa [KARAF-5475] Disable the audit log LoginModule (superceeded by the event admin log)
add a0ee11e Partial revert of KARAF-5416 to keep libraries on java 1.8 specific runtimes
add a23ee51 [KARAF-5475] Fix timezone string computation
add 915894b KARAF-5496 - NPEs in SyncopeLoginModule if "version" is not specified
add 5dcbf17 Merge pull request #398 from coheigea/KARAF-5496
add af1219e KARAF-5498 - SyncopeLoginModule parses roles instead of groups for Syncope 2.0.x - Adding a configuration option to fall back to parsing the roles if required.
add 02a4d42 Merge pull request #399 from coheigea/KARAF-5498
add 256efd6 [KARAF-5488] Upgrade to Felix Framework 5.6.10
add beb0284 Merge pull request #394 from jbonofre/KARAF-5488
add 0edb20b [KARAF-5506]ensure we also check the ACL for alias cmds before auto-completer
add 552a173 Exclude MavenTest from surefire execution to give us time to investigate
add cb78db8 Merge pull request #403 from jbonofre/EXCLUDE_MAVENTEST
add 768f13b [KARAF-5495] Support Syncope 2.x in SyncopeBackingEngine
add 14b87bc Merge pull request #402 from jbonofre/KARAF-5495
add be495c1 [KARAF-5489] Upgrade to commons-io 2.6
add 15c3977 Merge pull request #395 from jbonofre/KARAF-5489
add 1bae9e2 [KARAF-5490] Upgrade to JNA 4.5.0
add 1214050 Merge pull request #396 from jbonofre/KARAF-5490
add 874e409 [KARAF-5491] Upgrade to commons-compress 1.15
add 51c90f6 Merge pull request #397 from jbonofre/KARAF-5491
add 5583c32 [KARAF-5307] Add SchedulerMBean
add 24c299e Merge pull request #401 from jbonofre/KARAF-5307
add f8849fc [KARAF-5506]ensure we also check the ACL for alias cmds before auto-completer-more change
add 8ee2ebb [KARAF-5506]use ThreadLocal for the visible service cache so that different shell for different users/roles won't interfere each other
add ccf7657 Karaf 5412 (#404)
add b137b36 [KARAF-5475] Remove additional space
add 2f6f469 [KARAF-5516] Upgrade to commons-lang3 3.7
add 7abcc2b Merge pull request #406 from jbonofre/KARAF-5516
add 50e97b2 [KARAF-5517] Upgrade to Apache Felix Metatype 1.1.6
add 2ed5172 Merge pull request #407 from jbonofre/KARAF-5517
add 79fa1c5 [KARAF-5518] Upgrade to Apache Felix WebConsole DS plugin 2.0.8
add 3ecf22f [KARAF-5519] Upgrade to Apache Felix WebConsole EventAdmin plugin 1.1.8
add fecd0ab Fix org.apache.karaf.jpm.ProcessTest
add 10fd3a7 [KARAF-5520] Upgrade Maven dependencies to 3.5.2
add 98f22ea [KARAF-5522] Upgrade to easymock 3.5.1
add cd485ec [versions] Use ${hibernate.version} in enterprise/pom.xml
add 5349511 [KARAF-5523] Upgrade to equinox 3.12.50
add d9d15d7 [KARAF-5418] Add LDAPPubkeyLoginModule JAAS module
new e22d42f [KARAF-5475] Try to avoid ArrayIndexOutOfBoundsException
new e9f6853 [KARAF-5447] Support Spring 5.0.x
new 2ac405d Switch to released version under vote
new 019f357 [KARAF-5447] Fix integration tests
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (267eae4)
\
N -- N -- N refs/heads/KARAF-5447 (019f357)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/filtered-resources/resources/bin/inc | 13 +-
.../main/filtered-resources/resources/bin/karaf | 6 +
.../filtered-resources/resources/bin/karaf.bat | 2 +
.../resources/etc/org.ops4j.pax.logging.cfg | 10 +-
.../main/resources/resources/etc/system.properties | 8 +-
.../src/main/resources/resources/lib/boot/README | 9 +-
.../resources/lib/{ext => endorsed}/README | 8 +-
assemblies/features/enterprise/pom.xml | 2 +-
assemblies/features/standard/pom.xml | 3 -
.../features/standard/src/main/feature/feature.xml | 124 ++--
.../main/resources/resources/etc/system.properties | 6 +
{config => audit}/pom.xml | 28 +-
.../java/org/apache/karaf/audit/Activator.java | 539 +++++++++++++++++
.../main/java/org/apache/karaf/audit/Event.java | 46 +-
.../java/org/apache/karaf/audit/EventLayout.java | 23 +-
.../java/org/apache/karaf/audit/EventLogger.java | 12 +-
.../apache/karaf/audit/layout/AbstractLayout.java | 198 +++++++
.../org/apache/karaf/audit/layout/GelfLayout.java | 89 +++
.../apache/karaf/audit/layout/Rfc3164Layout.java | 87 +++
.../apache/karaf/audit/layout/Rfc5424Layout.java | 88 +++
.../apache/karaf/audit/layout/SimpleLayout.java | 69 +++
.../apache/karaf/audit/logger/FileEventLogger.java | 291 +++++++++
.../apache/karaf/audit/logger/JulEventLogger.java | 61 ++
.../apache/karaf/audit/logger/TcpEventLogger.java | 67 +++
.../apache/karaf/audit/logger/UdpEventLogger.java | 84 +++
.../java/org/apache/karaf/audit/util/Buffer.java | 306 ++++++++++
.../apache/karaf/audit/util/FastDateFormat.java | 177 ++++++
.../org/apache/karaf/audit/util/NumberOutput.java | 516 ++++++++++++++++
.../test/java/org/apache/karaf/audit/MapEvent.java | 51 +-
.../test/java/org/apache/karaf/audit/TestPerf.java | 152 +++++
.../apache/karaf/audit/logger/EventLoggerTest.java | 266 +++++++++
.../karaf/audit/util/FastDateFormatTest.java | 49 ++
.../karaf/features/internal/service/Deployer.java | 3 +-
.../internal/service/FeaturesServiceImpl.java | 35 +-
.../features/extension/StoredWiringResolver.java | 4 +-
.../main/java/org/apache/karaf/jpm/Process.java | 47 --
.../java/org/apache/karaf/jpm/ProcessBuilder.java | 60 --
.../apache/karaf/jpm/ProcessBuilderFactory.java | 25 -
.../karaf/jpm/impl/ProcessBuilderFactoryImpl.java | 27 -
itests/pom.xml | 16 +-
itests/src/test/filtered-resources/etc/feature.xml | 16 +-
jaas/blueprint/jasypt/pom.xml | 22 +-
.../karaf/jaas/boot/principal/ClientPrincipal.java | 54 ++
jaas/modules/pom.xml | 5 +
.../jaas/modules/encryption/EncryptionSupport.java | 2 +-
.../apache/karaf/jaas/modules/impl/Activator.java | 2 +-
.../apache/karaf/jaas/modules/ldap/LDAPCache.java | 42 ++
.../karaf/jaas/modules/ldap/LDAPLoginModule.java | 30 +-
.../karaf/jaas/modules/ldap/LDAPOptions.java | 5 +
.../jaas/modules/ldap/LDAPPubkeyLoginModule.java | 158 +++++
.../org/apache/karaf/jaas/modules/ldap/Util.java | 48 ++
.../modules/publickey/PublickeyLoginModule.java | 6 +-
.../jaas/modules/syncope/SyncopeBackingEngine.java | 97 ++-
.../syncope/SyncopeBackingEngineFactory.java | 3 +-
.../jaas/modules/syncope/SyncopeLoginModule.java | 30 +-
...Handler.java => NamePubkeyCallbackHandler.java} | 32 +-
.../modules/ldap/LDAPPubkeyLoginModuleTest.java | 161 +++++
.../modules/syncope/SyncopeLoginModuleTest.java | 18 +-
.../{example.com.ldif => example.com_pubkey.ldif} | 10 +
.../{ldap.properties => ldap_pubkey.properties} | 1 +
.../karaf/jaas/modules/ldap/ldaptest.admin.id_rsa | 15 +
.../jaas/modules/ldap/ldaptest.admin.id_rsa.pub | 1 +
.../karaf/jaas/modules/ldap/ldaptest.cheese.id_rsa | 15 +
.../jaas/modules/ldap/ldaptest.cheese.id_rsa.pub | 1 +
.../apache/karaf/jpm/impl/ProcessBuilderImpl.java | 48 --
.../org/apache/karaf/jpm/impl/ProcessImpl.java | 149 -----
.../org/apache/karaf/jpm/impl/ScriptUtils.java | 123 ----
management/server/pom.xml | 8 +-
.../apache/karaf/management/JaasAuthenticator.java | 7 +
.../karaf/management/KarafMBeanServerGuard.java | 41 +-
.../karaf/management/internal/Activator.java | 31 +
.../management/internal/EventAdminLogger.java | 12 +-
.../management/internal/EventAdminLoggerImpl.java | 60 ++
.../internal/EventAdminMBeanServerWrapper.java | 648 +++++++++++++++++++++
.../internal/MBeanInvocationHandler.java | 3 +
.../main/asciidoc/user-guide/os-integration.adoc | 4 +
manual/src/main/asciidoc/user-guide/scheduler.adoc | 36 +-
pom.xml | 57 +-
.../karaf/profile/assembly/ArtifactInstaller.java | 7 +-
.../org/apache/karaf/profile/assembly/Builder.java | 6 +-
.../karaf/profile/command/ProfileCreate.java | 2 -
.../org/apache/karaf/scheduler/SchedulerMBean.java | 20 +-
.../org/apache/karaf/scheduler/core/Activator.java | 4 +
.../karaf/scheduler/core/SchedulerMBeanImpl.java | 91 +++
service/guard/pom.xml | 33 +-
.../felix/eventadmin/impl/Configuration.java | 5 +-
.../impl/adapter/BundleEventAdapter.java | 127 ++++
.../shell/impl/console/CommandsCompleter.java | 31 +-
.../shell/impl/console/ConsoleSessionImpl.java | 11 +-
.../karaf/shell/impl/console/RegistryImpl.java | 7 +
.../shell/impl/console/SessionFactoryImpl.java | 3 +
.../impl/console/osgi/EventAdminListener.java | 32 +-
.../impl/console/osgi/LocalConsoleManager.java | 2 +
.../impl/console/osgi/secured/AliasCommand.java} | 31 +-
.../osgi/secured/SecuredSessionFactoryImpl.java | 117 +++-
.../karaf/shell/ssh/KarafJaasAuthenticator.java | 2 +
tooling/karaf-maven-plugin/pom.xml | 17 +-
.../src/test/filtered-resources/settings.xml | 35 +-
.../tooling/tracker/GenerateServiceMetadata.java | 22 +-
util/pom.xml | 13 +
.../main/java/org/apache/karaf/jpm/Process.java | 0
.../java/org/apache/karaf/jpm/ProcessBuilder.java | 0
.../apache/karaf/jpm/ProcessBuilderFactory.java | 0
.../karaf/jpm/impl/ProcessBuilderFactoryImpl.java | 0
.../apache/karaf/jpm/impl/ProcessBuilderImpl.java | 0
.../org/apache/karaf/jpm/impl/ProcessImpl.java | 0
.../org/apache/karaf/jpm/impl/ScriptUtils.java | 0
.../org/apache/karaf/jpm/impl/unix/start.sh | 0
.../org/apache/karaf/jpm/impl/windows/destroy.vbs | 0
.../org/apache/karaf/jpm/impl/windows/running.vbs | 0
.../org/apache/karaf/jpm/impl/windows/start.vbs | 0
.../internal/servlet/JaasSecurityProvider.java | 43 +-
.../org/apache/karaf/webconsole/gogo/Terminal.java | 108 ++--
.../karaf/wrapper/internal/unix/karaf-wrapper.conf | 3 +
.../wrapper/internal/windows/karaf-wrapper.conf | 3 +
.../wrapper/internal/windows64/karaf-wrapper.conf | 3 +
116 files changed, 5513 insertions(+), 873 deletions(-)
copy archetypes/command/src/test/resources/projects/command/archetype.properties => assemblies/features/base/src/main/resources/resources/lib/boot/README (86%)
copy assemblies/features/base/src/main/resources/resources/lib/{ext => endorsed}/README (81%)
copy {config => audit}/pom.xml (80%)
create mode 100644 audit/src/main/java/org/apache/karaf/audit/Activator.java
copy bundle/core/src/main/java/org/apache/karaf/bundle/core/BundleInfo.java => audit/src/main/java/org/apache/karaf/audit/Event.java (54%)
copy scheduler/src/main/java/org/apache/karaf/scheduler/JobContext.java => audit/src/main/java/org/apache/karaf/audit/EventLayout.java (63%)
copy features/core/src/main/java/org/apache/karaf/features/RegionDigraphPersistence.java => audit/src/main/java/org/apache/karaf/audit/EventLogger.java (78%)
create mode 100644 audit/src/main/java/org/apache/karaf/audit/layout/AbstractLayout.java
create mode 100644 audit/src/main/java/org/apache/karaf/audit/layout/GelfLayout.java
create mode 100644 audit/src/main/java/org/apache/karaf/audit/layout/Rfc3164Layout.java
create mode 100644 audit/src/main/java/org/apache/karaf/audit/layout/Rfc5424Layout.java
create mode 100644 audit/src/main/java/org/apache/karaf/audit/layout/SimpleLayout.java
create mode 100644 audit/src/main/java/org/apache/karaf/audit/logger/FileEventLogger.java
create mode 100644 audit/src/main/java/org/apache/karaf/audit/logger/JulEventLogger.java
create mode 100644 audit/src/main/java/org/apache/karaf/audit/logger/TcpEventLogger.java
create mode 100644 audit/src/main/java/org/apache/karaf/audit/logger/UdpEventLogger.java
create mode 100644 audit/src/main/java/org/apache/karaf/audit/util/Buffer.java
create mode 100644 audit/src/main/java/org/apache/karaf/audit/util/FastDateFormat.java
create mode 100644 audit/src/main/java/org/apache/karaf/audit/util/NumberOutput.java
copy log/src/main/java/org/apache/karaf/log/core/internal/LogMBeanImpl.java => audit/src/test/java/org/apache/karaf/audit/MapEvent.java (51%)
create mode 100644 audit/src/test/java/org/apache/karaf/audit/TestPerf.java
create mode 100644 audit/src/test/java/org/apache/karaf/audit/logger/EventLoggerTest.java
create mode 100644 audit/src/test/java/org/apache/karaf/audit/util/FastDateFormatTest.java
delete mode 100644 instance/src/main/java/org/apache/karaf/jpm/Process.java
delete mode 100644 instance/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java
delete mode 100644 instance/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java
delete mode 100644 instance/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
create mode 100644 jaas/boot/src/main/java/org/apache/karaf/jaas/boot/principal/ClientPrincipal.java
create mode 100644 jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPPubkeyLoginModule.java
create mode 100644 jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/Util.java
copy jaas/modules/src/test/java/org/apache/karaf/jaas/modules/{NamePasswordCallbackHandler.java => NamePubkeyCallbackHandler.java} (53%)
create mode 100644 jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LDAPPubkeyLoginModuleTest.java
copy jaas/modules/src/test/resources/org/apache/karaf/jaas/modules/ldap/{example.com.ldif => example.com_pubkey.ldif} (73%)
copy jaas/modules/src/test/resources/org/apache/karaf/jaas/modules/ldap/{ldap.properties => ldap_pubkey.properties} (97%)
create mode 100644 jaas/modules/src/test/resources/org/apache/karaf/jaas/modules/ldap/ldaptest.admin.id_rsa
create mode 100644 jaas/modules/src/test/resources/org/apache/karaf/jaas/modules/ldap/ldaptest.admin.id_rsa.pub
create mode 100644 jaas/modules/src/test/resources/org/apache/karaf/jaas/modules/ldap/ldaptest.cheese.id_rsa
create mode 100644 jaas/modules/src/test/resources/org/apache/karaf/jaas/modules/ldap/ldaptest.cheese.id_rsa.pub
delete mode 100644 main/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java
delete mode 100644 main/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
delete mode 100644 main/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java
copy profile/src/main/java/org/apache/karaf/profile/LockHandle.java => management/server/src/main/java/org/apache/karaf/management/internal/EventAdminLogger.java (81%)
create mode 100644 management/server/src/main/java/org/apache/karaf/management/internal/EventAdminLoggerImpl.java
create mode 100644 management/server/src/main/java/org/apache/karaf/management/internal/EventAdminMBeanServerWrapper.java
copy package/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java => scheduler/src/main/java/org/apache/karaf/scheduler/SchedulerMBean.java (74%)
create mode 100644 scheduler/src/main/java/org/apache/karaf/scheduler/core/SchedulerMBeanImpl.java
create mode 100644 services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/adapter/BundleEventAdapter.java
copy shell/{console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java => core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/AliasCommand.java} (62%)
copy itests/src/test/resources/etc/maven-settings.xml => tooling/karaf-maven-plugin/src/test/filtered-resources/settings.xml (58%)
rename {main => util}/src/main/java/org/apache/karaf/jpm/Process.java (100%)
rename {main => util}/src/main/java/org/apache/karaf/jpm/ProcessBuilder.java (100%)
rename {main => util}/src/main/java/org/apache/karaf/jpm/ProcessBuilderFactory.java (100%)
rename {main => util}/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java (100%)
rename {instance => util}/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java (100%)
rename {instance => util}/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java (100%)
rename {instance => util}/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java (100%)
rename {instance => util}/src/main/resources/org/apache/karaf/jpm/impl/unix/start.sh (100%)
rename {instance => util}/src/main/resources/org/apache/karaf/jpm/impl/windows/destroy.vbs (100%)
rename {instance => util}/src/main/resources/org/apache/karaf/jpm/impl/windows/running.vbs (100%)
rename {instance => util}/src/main/resources/org/apache/karaf/jpm/impl/windows/start.vbs (100%)
--
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <co...@karaf.apache.org>'].
[karaf] 02/04: [KARAF-5447] Support Spring 5.0.x
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch KARAF-5447
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit e9f685350e185975f8976926d523dd357982506c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Oct 27 14:10:21 2017 +0200
[KARAF-5447] Support Spring 5.0.x
---
.../spring-legacy/src/main/feature/feature.xml | 77 ++++++++++++++++++++
.../features/spring/src/main/feature/feature.xml | 85 ++++++++++------------
pom.xml | 1 +
3 files changed, 117 insertions(+), 46 deletions(-)
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 223b4b1..c3676bb 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -420,6 +420,83 @@
<bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring42.version}</bundle>
</feature>
+ <!-- Spring 4.3.x support -->
+
+ <feature name="spring" description="Spring 4.3.x support" version="${spring43.version}">
+ <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-aspects" description="Spring 4.3.x AOP support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-instrument" description="Spring 4.3.x Instrument support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-jdbc" description="Spring 4.3.x JDBC support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring-tx</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-jms" description="Spring 4.3.x JMS support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring-tx</feature>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-test" description="Spring 4.3.x Test support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-orm" description="Spring 4.3.x ORM support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring-jdbc</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-oxm" description="Spring 4.3.x OXM support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-tx" description="Spring 4.3.x Transaction (TX) support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-web" description="Spring 4.3.x Web support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <feature>http</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-web-portlet" description="Spring 4.3.x Web Portlet support" version="${spring43.version}">
+ <feature prerequisite="true">wrap</feature>
+ <feature version="[${spring43.version},4.4)">spring-web</feature>
+ <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-websocket" description="Spring 4.3.x WebSocket support" version="${spring43.version}">
+ <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <feature version="[${spring43.version},4.4)">spring-web</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring43.version}</bundle>
+ </feature>
+
<!-- Spring Security support -->
<feature name="spring-security" description="Spring Security 3.1.x support" version="${spring.security31.version}">
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 471cedf..f608cd4 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -22,81 +22,74 @@
<repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
- <!-- Spring 4.3.x support -->
+ <!-- Spring 5.0.x support -->
- <feature name="spring" description="Spring 4.3.x support" version="${spring43.version}">
+ <feature name="spring" description="Spring 5.0.x support" version="${spring50.version}">
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring50.version}</bundle>
</feature>
- <feature name="spring-aspects" description="Spring 4.3.x AOP support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring43.version}</bundle>
+ <feature name="spring-aspects" description="Spring 5.0.x AOP support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring50.version}</bundle>
</feature>
- <feature name="spring-instrument" description="Spring 4.3.x Instrument support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring43.version}</bundle>
+ <feature name="spring-instrument" description="Spring 5.0.x Instrument support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring50.version}</bundle>
</feature>
- <feature name="spring-jdbc" description="Spring 4.3.x JDBC support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring-tx</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring43.version}</bundle>
+ <feature name="spring-jdbc" description="Spring 5.0.x JDBC support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring-tx</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring50.version}</bundle>
</feature>
- <feature name="spring-jms" description="Spring 4.3.x JMS support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring-tx</feature>
+ <feature name="spring-jms" description="Spring 5.0.x JMS support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring-tx</feature>
<bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
<bundle dependency="true" start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring50.version}</bundle>
</feature>
- <feature name="spring-test" description="Spring 4.3.x Test support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
+ <feature name="spring-test" description="Spring 5.0.x Test support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
<bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring50.version}</bundle>
</feature>
- <feature name="spring-orm" description="Spring 4.3.x ORM support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring-jdbc</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring43.version}</bundle>
+ <feature name="spring-orm" description="Spring 5.0.x ORM support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring-jdbc</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring50.version}</bundle>
</feature>
- <feature name="spring-oxm" description="Spring 4.3.x OXM support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring43.version}</bundle>
+ <feature name="spring-oxm" description="Spring 5.0.x OXM support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring50.version}</bundle>
</feature>
- <feature name="spring-tx" description="Spring 4.3.x Transaction (TX) support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring43.version}</bundle>
+ <feature name="spring-tx" description="Spring 5.0.x Transaction (TX) support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring50.version}</bundle>
</feature>
- <feature name="spring-web" description="Spring 4.3.x Web support" version="${spring43.version}">
- <feature version="[${spring43.version},4.4)">spring</feature>
+ <feature name="spring-web" description="Spring 5.0.x Web support" version="${spring50.version}">
+ <feature version="[${spring50.version},5.1)">spring</feature>
<feature>http</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring43.version}</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring43.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring50.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring50.version}</bundle>
</feature>
- <feature name="spring-web-portlet" description="Spring 4.3.x Web Portlet support" version="${spring43.version}">
- <feature prerequisite="true">wrap</feature>
- <feature version="[${spring43.version},4.4)">spring-web</feature>
- <bundle dependency="true" start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring43.version}</bundle>
- </feature>
-
- <feature name="spring-websocket" description="Spring 4.3.x WebSocket support" version="${spring43.version}">
+ <feature name="spring-websocket" description="Spring 5.0.x WebSocket support" version="${spring50.version}">
<bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
- <feature version="[${spring43.version},4.4)">spring-web</feature>
- <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring43.version}</bundle>
+ <feature version="[${spring50.version},5.1)">spring-web</feature>
+ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring50.version}</bundle>
</feature>
<!-- Aries Blueprint Spring support -->
diff --git a/pom.xml b/pom.xml
index afc72b1..50e5885 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,6 +291,7 @@
<spring41.version>4.1.9.RELEASE_1</spring41.version>
<spring42.version>4.2.9.RELEASE_1</spring42.version>
<spring43.version>4.3.12.RELEASE_1</spring43.version>
+ <spring50.version>5.0.1.RELEASE_1-SNAPSHOT</spring50.version>
<spring.security31.version>3.1.4.RELEASE</spring.security31.version>
<sshd.version>1.6.0</sshd.version>
--
To stop receiving notification emails like this one, please contact
"commits@karaf.apache.org" <co...@karaf.apache.org>.
[karaf] 01/04: [KARAF-5475] Try to avoid
ArrayIndexOutOfBoundsException
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch KARAF-5447
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit e22d42f043fe331dea4a9a0606799e01e8162d1e
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Dec 4 11:01:24 2017 +0100
[KARAF-5475] Try to avoid ArrayIndexOutOfBoundsException
---
audit/src/main/java/org/apache/karaf/audit/layout/SimpleLayout.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/audit/src/main/java/org/apache/karaf/audit/layout/SimpleLayout.java b/audit/src/main/java/org/apache/karaf/audit/layout/SimpleLayout.java
index 31a1ceb..b389007 100644
--- a/audit/src/main/java/org/apache/karaf/audit/layout/SimpleLayout.java
+++ b/audit/src/main/java/org/apache/karaf/audit/layout/SimpleLayout.java
@@ -29,7 +29,7 @@ public class SimpleLayout extends AbstractLayout {
protected FastDateFormat fastDateFormat = new FastDateFormat();
public SimpleLayout() {
- super(new Buffer(Buffer.Format.Json));
+ super(new Buffer(Buffer.Format.Json, 4096));
hdr = " " + hostName + " " + appName + " " + procId;
}
--
To stop receiving notification emails like this one, please contact
"commits@karaf.apache.org" <co...@karaf.apache.org>.
[karaf] 04/04: [KARAF-5447] Fix integration tests
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch KARAF-5447
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 019f3573992ee19179f65f44ffd891fabc0b43f1
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Dec 5 09:10:58 2017 +0100
[KARAF-5447] Fix integration tests
---
itests/pom.xml | 1 +
.../itests/features/Spring43FeaturesTest.java | 24 ++++++++++++++-
...FeaturesTest.java => Spring50FeaturesTest.java} | 36 +++++++++++++---------
3 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/itests/pom.xml b/itests/pom.xml
index c58e418..d12ceaa 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -265,6 +265,7 @@
<spring41.version>${spring41.version}</spring41.version>
<spring42.version>${spring42.version}</spring42.version>
<spring43.version>${spring43.version}</spring43.version>
+ <spring50.version>${spring50.version}</spring50.version>
<activemq.version>${activemq.version}</activemq.version>
</systemPropertyVariables>
<excludes>
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
index 5d5f7a5..d5d4339 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
@@ -16,14 +16,36 @@ package org.apache.karaf.itests.features;
import org.apache.karaf.itests.KarafTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.MavenUtils;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class Spring43FeaturesTest extends KarafTestSupport {
-
+
+ @Configuration
+ public Option[] config() {
+ String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf");
+ List<Option> result = new LinkedList<>(Arrays.asList(super.config()));
+ result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresRepositories",
+ "mvn:org.apache.karaf.features/framework/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/spring/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/spring-legacy/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/enterprise/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/enterprise-legacy/" + version + "/xml/features, " +
+ "mvn:org.apache.karaf.features/standard/" + version + "/xml/features"));
+ return result.toArray(new Option[result.size()]);
+ }
@Test
public void installSpringFeature() throws Exception {
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/Spring50FeaturesTest.java
similarity index 77%
copy from itests/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
copy to itests/src/test/java/org/apache/karaf/itests/features/Spring50FeaturesTest.java
index 5d5f7a5..3b6cb00 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring50FeaturesTest.java
@@ -16,73 +16,81 @@ package org.apache.karaf.itests.features;
import org.apache.karaf.itests.KarafTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.MavenUtils;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class Spring43FeaturesTest extends KarafTestSupport {
-
+public class Spring50FeaturesTest extends KarafTestSupport {
@Test
public void installSpringFeature() throws Exception {
- installAssertAndUninstallFeature("spring", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring", System.getProperty("spring50.version"));
}
@Test
public void installSpringAspectsFeature() throws Exception {
- installAssertAndUninstallFeature("spring-aspects", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring-aspects", System.getProperty("spring50.version"));
}
@Test
public void installSpringInstrumentFeature() throws Exception {
- installAssertAndUninstallFeature("spring-instrument", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring-instrument", System.getProperty("spring50.version"));
}
@Test
public void installSpringJdbcFeature() throws Exception {
- installAssertAndUninstallFeature("spring-jdbc", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring-jdbc", System.getProperty("spring50.version"));
}
@Test
public void installSpringJmsFeature() throws Exception {
- installAssertAndUninstallFeature("spring-jms", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring-jms", System.getProperty("spring50.version"));
}
@Test
public void installSpringTestFeature() throws Exception {
- installAssertAndUninstallFeature("spring-test", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring-test", System.getProperty("spring50.version"));
}
@Test
public void installSpringOrmFeature() throws Exception {
- installAssertAndUninstallFeature("spring-orm", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring-orm", System.getProperty("spring50.version"));
}
@Test
public void installSpringOxmFeature() throws Exception {
- installAssertAndUninstallFeature("spring-oxm", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring-oxm", System.getProperty("spring50.version"));
}
@Test
public void installSpringTxFeature() throws Exception {
- installAssertAndUninstallFeature("spring-tx", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring-tx", System.getProperty("spring50.version"));
}
@Test
public void installSpringWebFeature() throws Exception {
- installAssertAndUninstallFeature("spring-web", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring-web", System.getProperty("spring50.version"));
}
@Test
public void installSpringWebPortletFeature() throws Exception {
- installAssertAndUninstallFeature("spring-web-portlet", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring-web-portlet", System.getProperty("spring50.version"));
}
@Test
public void installSpringWebSocketFeature() throws Exception {
- installAssertAndUninstallFeature("spring-websocket", System.getProperty("spring43.version"));
+ installAssertAndUninstallFeature("spring-websocket", System.getProperty("spring50.version"));
}
}
--
To stop receiving notification emails like this one, please contact
"commits@karaf.apache.org" <co...@karaf.apache.org>.
[karaf] 03/04: Switch to released version under vote
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch KARAF-5447
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 2ac405d2fe0e5d0facf19f3b45b595eb91b8e460
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Dec 4 08:37:24 2017 +0100
Switch to released version under vote
---
pom.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 50e5885..cd7bac8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,7 +291,7 @@
<spring41.version>4.1.9.RELEASE_1</spring41.version>
<spring42.version>4.2.9.RELEASE_1</spring42.version>
<spring43.version>4.3.12.RELEASE_1</spring43.version>
- <spring50.version>5.0.1.RELEASE_1-SNAPSHOT</spring50.version>
+ <spring50.version>5.0.2.RELEASE_1</spring50.version>
<spring.security31.version>3.1.4.RELEASE</spring.security31.version>
<sshd.version>1.6.0</sshd.version>
@@ -346,6 +346,10 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>servicemix-1206-staging</id>
+ <url>https://repository.apache.org/content/repositories/orgapacheservicemix-1206/</url>
+ </repository>
</repositories>
<pluginRepositories>
<!-- Apache snapshots -->
--
To stop receiving notification emails like this one, please contact
"commits@karaf.apache.org" <co...@karaf.apache.org>.