This is an automated email from the ASF dual-hosted git repository.
dependabot[bot] pushed a change to branch
dependabot/maven/main/felix.framework.version-7.0.5
in repository https://gitbox.apache.org/repos/asf/karaf.git
discard d76c9a7fbc Bump felix.framework.version from 5.6.10 to 7.0.5
add 9028384714 Bump dawidd6/action-download-artifact from 8 to 19 (#2459)
add 94faf43a26 ci: fix test results not commenting on PRs (#2462)
add d026776b11 refactor: replace Derby with H2 database (#2185) (#2311)
add c5b775ea80 Bump org.jline:jline from 4.0.5 to 4.0.7 (#2466)
add 276c4fbd6f Bump com.h2database:h2 from 2.2.224 to 2.4.240 (#2465)
add ef6e2da354 feat(jakarta): Upgrade to Pax Web 11.0.1 (#2427)
add e9fc44a20d Remove Aries Blueprint Web feature (#2473)
add f6cecbd1f8 refactor: remove Pax CDI support (#2471)
add fe35b79a3f Bump org.apache.rat:apache-rat-plugin from 0.17 to 0.18
(#2469)
add e02d549197 Bump jackson.version from 2.21.1 to 2.21.2 (#2467)
add 93a805d91f Bump activemq.version from 6.2.1 to 6.2.2 (#2480)
add bab8982fef Bump biz.aQute.bnd:biz.aQute.bndlib from 7.2.1 to 7.2.3
(#2483)
add 0085b14cf4 Bump org.jline:jline from 4.0.7 to 4.0.9 (#2478)
add 3389398d4e Bump org.fusesource.jansi:jansi from 2.4.2 to 2.4.3 (#2487)
add 08248b2025 Bump org.codehaus.plexus:plexus-utils from 4.0.2 to 4.0.3
(#2486)
add b085df9b10 Upgrade plugin settings (#2490)
add 34df200dbb Relocate slf4j-log4j12 to slf4j-reload4j (#2489)
add 714790a819 Bump log4j.version from 2.25.3 to 2.25.4 (#2495)
add 2da19dee29 Bump activemq.version from 6.2.2 to 6.2.3 (#2496)
add a6a8258498 Use upload/download-artifact instead of cache for CI
inter-job repo sharing (#2498)
add d87af69bcf feat(jakarta): Migrate remaining javax APIs to Jakarta
namespace (#2476)
add 514d8cffc6 build(deps-dev): bump com.sun.mail:jakarta.mail from 1.6.7
to 2.0.2 (#2510)
add 520cc9b040 build(deps-dev): bump org.jline:jline from 4.0.9 to 4.0.10
(#2509)
add bd284e95b0 build(deps): bump jakarta.ws.rs:jakarta.ws.rs-api from
3.1.0 to 4.0.0 (#2504)
add c691fef0ad build(deps-dev): bump
org.apache.geronimo.specs:geronimo-atinject_1.0_spec (#2503)
add 00ea580152 build(deps): bump actions/download-artifact from 4 to 8
(#2501)
add d6b32e2f0c build(deps): bump org.apache.cxf:cxf-rt-frontend-jaxrs
(#2500)
add f6e980ef74 build(deps): bump dawidd6/action-download-artifact from 19
to 20 (#2502)
add 031d9a1bee build(deps): bump redis.clients:jedis from 7.4.0 to 7.4.1
(#2511)
add ddc78157ca [KARAF-2513] Fix log:tail thread leak on SSH disconnect
(#2514)
add 7740f7ec6e Filter out empty repository entries in feature descriptors
(#2515)
add 042a2f71ce Add windows and macos platforms to the CI (#2493)
add b6ea78fdf8 build(deps-dev): bump org.jline:jline from 4.0.10 to 4.0.12
(#2526)
add d5c1779b92 build(deps): bump org.hibernate.orm:hibernate-core (#2530)
add cbaa58b7b9 build(deps): bump activemq.version from 6.2.3 to 6.2.4
(#2529)
add 4429324df1 Prepare for Maven 4 (#2322)
add d630355d02 Upgrade Maven plugins in archetype pom files (#2327)
add 99c81bc0bc fix(shell): enable autoFlush on console PrintStream (#2267)
(#2518)
add 076d5ee06c build(deps-dev): bump
org.codehaus.modello:modello-maven-plugin (#2533)
add a2cd70104d Bump jakarta.activation:jakarta.activation-api from 1.2.2
to 2.1.4 (#2350)
add 9d72f041d1 build(deps): bump org.apache.felix:org.apache.felix.scr
(#2534)
add 7a3f8f859d Remove static ThreadLocal caching in XmlUtils to prevent
ClassLoader leaks (#2516)
add 5e4167f6ee fix(karaf-maven-plugin): Deal with non-features classifier
in the karaf-maven-plugin (#2521)
add 58a492414b build(deps): bump bouncycastle.version from 1.83 to 1.84
(#2539)
add d5ccaf39ff build(deps): bump pax.logging.version from 2.3.2 to 2.3.3
(#2542)
add 35d28b653e build(deps): bump maven.version from 3.9.14 to 3.9.15
(#2547)
add a4a750dc47 Bump felix.framework.version from 5.6.10 to 7.0.5
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 (d76c9a7fbc)
\
N -- N -- N
refs/heads/dependabot/maven/main/felix.framework.version-7.0.5 (a4a750dc47)
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.
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 16 +-
.github/workflows/ci-test-results.yml | 17 +-
.github/workflows/ci.yml | 35 +-
.mvn/README | 1 +
.../src/main/resources/archetype-resources/pom.xml | 12 +-
.../src/main/resources/archetype-resources/pom.xml | 12 +-
.../src/main/resources/archetype-resources/pom.xml | 12 +-
.../src/main/resources/archetype-resources/pom.xml | 12 +-
.../src/main/resources/archetype-resources/pom.xml | 12 +-
.../src/main/resources/archetype-resources/pom.xml | 15 +-
.../src/main/distribution/LICENSE | 7 -
assemblies/apache-karaf-minimal/pom.xml | 2 +-
assemblies/apache-karaf/pom.xml | 2 +-
.../apache-karaf/src/main/distribution/LICENSE | 7 -
assemblies/features/base/pom.xml | 46 +-
assemblies/features/enterprise/pom.xml | 35 +-
.../enterprise/src/main/feature/feature.xml | 82 ++-
.../framework/src/main/feature/feature.xml | 13 +-
assemblies/features/integration/pom.xml | 2 -
.../integration/src/main/feature/feature.xml | 5 +-
assemblies/features/pom.xml | 1 -
assemblies/features/specs/pom.xml | 2 +-
.../features/specs/src/main/feature/feature.xml | 28 +-
assemblies/features/spring-legacy/pom.xml | 217 --------
.../spring-legacy/src/main/feature/feature.xml | 550 -------------------
.../features/spring/src/main/feature/feature.xml | 8 +-
assemblies/features/standard/pom.xml | 8 +-
.../features/standard/src/main/feature/feature.xml | 31 +-
bom/pom.xml | 51 +-
.../karaf/event/command/EventPrinterTest.java | 10 +-
.../karaf/event/command/EventSendCommandTest.java | 2 +-
.../karaf/event/service/EventCollectorTest.java | 2 +-
examples/karaf-cdi-example/README.md | 69 ---
.../karaf-cdi-example-api/pom.xml | 44 --
.../apache/karaf/examples/cdi/api/MyService.java | 22 -
.../karaf-cdi-example-consumer/pom.xml | 72 ---
.../examples/cdi/consumer/MyConsumerBean.java | 37 --
.../karaf-cdi-example-features/pom.xml | 99 ----
.../src/main/feature/feature.xml | 34 --
.../karaf-cdi-example-provider/pom.xml | 72 ---
.../karaf/examples/cdi/provider/MyServiceBean.java | 32 --
examples/karaf-cdi-example/pom.xml | 42 --
.../karaf/examples/docker/ExampleServlet.java | 10 +-
.../karaf-docker-example-dynamic-dist/pom.xml | 2 +-
.../karaf-docker-example-static-dist/pom.xml | 2 +-
.../karaf-graphql-example-api/pom.xml | 2 +-
.../karaf-graphql-example-commands/pom.xml | 2 +-
.../karaf-graphql-example-core/pom.xml | 2 +-
.../src/main/feature/feature.xml | 12 +-
.../karaf-graphql-example-scr-servlet/pom.xml | 10 +-
.../graphql/servlet/ExampleGraphQLHttpServlet.java | 2 +-
.../karaf-graphql-example-websocket/pom.xml | 16 +-
.../graphql/websocket/GraphQLWebSocketExample.java | 17 +-
.../graphql/websocket/GraphQLWebSocketServlet.java | 16 +-
examples/karaf-itest-example/pom.xml | 6 +-
.../karaf/examples/jaas/wab/ExampleServlet.java | 10 +-
.../src/main/feature/feature.xml | 18 +-
.../jdbc/provider/BookingServiceJdbcImpl.java | 8 +-
.../karaf-jms-example-command/pom.xml | 7 +-
.../karaf/examples/jms/command/ConsumeCommand.java | 12 +-
.../karaf/examples/jms/command/SendCommand.java | 12 +-
.../src/main/feature/feature.xml | 9 +-
examples/karaf-jpa-example/README.md | 110 ----
.../karaf-jpa-example-command/pom.xml | 85 ---
.../karaf/examples/jpa/command/AddCommand.java | 45 --
.../karaf/examples/jpa/command/GetCommand.java | 53 --
.../karaf/examples/jpa/command/ListCommand.java | 47 --
.../karaf/examples/jpa/command/RemoveCommand.java | 49 --
.../jpa/completers/BookingIdCompleter.java | 45 --
.../karaf-jpa-example-features/pom.xml | 100 ----
.../src/main/feature/feature.xml | 85 ---
.../karaf-jpa-example-provider-api/pom.xml | 63 ---
.../org/apache/karaf/examples/jpa/Booking.java | 59 --
.../apache/karaf/examples/jpa/BookingService.java | 36 --
.../pom.xml | 77 ---
.../blueprint/eclipselink/BookingServiceImpl.java | 84 ---
.../src/main/resources/META-INF/persistence.xml | 39 --
.../resources/OSGI-INF/blueprint/blueprint.xml | 32 --
.../pom.xml | 77 ---
.../blueprint/hibernate/BookingServiceImpl.java | 84 ---
.../src/main/resources/META-INF/persistence.xml | 39 --
.../resources/OSGI-INF/blueprint/blueprint.xml | 32 --
.../pom.xml | 77 ---
.../blueprint/openjpa/BookingServiceImpl.java | 84 ---
.../src/main/resources/META-INF/persistence.xml | 38 --
.../resources/OSGI-INF/blueprint/blueprint.xml | 32 --
.../karaf-jpa-example-provider-blueprint/pom.xml | 41 --
.../pom.xml | 102 ----
.../ds/eclipselink/BookingServiceImpl.java | 77 ---
.../src/main/resources/META-INF/persistence.xml | 39 --
.../pom.xml | 102 ----
.../provider/ds/hibernate/BookingServiceImpl.java | 77 ---
.../src/main/resources/META-INF/persistence.xml | 39 --
.../karaf-jpa-example-provider-ds-openjpa/pom.xml | 102 ----
.../provider/ds/openjpa/BookingServiceImpl.java | 77 ---
.../src/main/resources/META-INF/persistence.xml | 38 --
.../karaf-jpa-example-provider-ds/pom.xml | 41 --
.../karaf-jpa-example-provider/pom.xml | 41 --
examples/karaf-jpa-example/pom.xml | 41 --
.../default.profile/org.ops4j.pax.web.cfg | 2 +-
.../src/main/resources/karaf.profile/profile.cfg | 1 -
.../karaf-redis-example-service/pom.xml | 2 +-
.../karaf-rest-example-blueprint/pom.xml | 6 +-
.../rest/blueprint/BookingServiceRest.java | 16 +-
.../karaf-rest-example-client-cxf/pom.xml | 18 +-
.../rest/client/cxf/AddBookingCommand.java | 4 +-
.../rest/client/cxf/ListAllBookingCommand.java | 2 +-
.../rest/client/cxf/ListBookingCommand.java | 4 +-
.../karaf-rest-example-client-jersey/pom.xml | 6 +-
.../rest/client/jersey/AddBookingCommand.java | 8 +-
.../rest/client/jersey/ListBookingCommand.java | 10 +-
.../karaf-rest-example-scr/pom.xml | 11 +-
.../examples/rest/scr/BookingServiceRest.java | 4 +-
.../karaf/examples/rest/scr/RestService.java | 2 +-
.../karaf-rest-example-whiteboard/pom.xml | 6 +-
.../rest/whiteboard/BookingServiceRest.java | 16 +-
.../servlet/annotation/ExampleServlet.java | 12 +-
.../annotation/MultipartExampleServlet.java | 14 +-
.../examples/servlet/blueprint/ExampleServlet.java | 8 +-
.../main/resources/OSGI-INF/blueprint/servlet.xml | 2 +-
.../src/main/feature/feature.xml | 9 +-
.../karaf-servlet-example-registration/pom.xml | 16 +-
.../examples/servlet/registration/Activator.java | 62 ---
.../servlet/registration/ExampleServlet.java | 16 +-
.../karaf/examples/servlet/scr/ExampleServlet.java | 10 +-
.../karaf-servlet-example-upload/pom.xml | 6 -
.../karaf/examples/servlet/upload/Component.java | 46 --
.../examples/servlet/upload/UploadServlet.java | 60 +-
examples/karaf-websocket-example/pom.xml | 34 +-
.../karaf/examples/websocket/WebSocketExample.java | 97 ----
.../websocket/WebSocketExampleEndpoint.java | 68 +++
.../websocket/WebsocketExampleServlet.java | 41 +-
examples/pom.xml | 2 -
features/core/pom.xml | 12 +-
.../karaf/features/internal/model/Bundle.java | 14 +-
.../karaf/features/internal/model/Capability.java | 8 +-
.../karaf/features/internal/model/Conditional.java | 10 +-
.../karaf/features/internal/model/Config.java | 10 +-
.../karaf/features/internal/model/ConfigFile.java | 10 +-
.../karaf/features/internal/model/Content.java | 4 +-
.../karaf/features/internal/model/Dependency.java | 12 +-
.../karaf/features/internal/model/Feature.java | 12 +-
.../karaf/features/internal/model/Features.java | 23 +-
.../karaf/features/internal/model/JaxbUtil.java | 12 +-
.../karaf/features/internal/model/Library.java | 10 +-
.../features/internal/model/ObjectFactory.java | 6 +-
.../karaf/features/internal/model/Requirement.java | 8 +-
.../karaf/features/internal/model/ScopeFilter.java | 10 +-
.../karaf/features/internal/model/Scoping.java | 10 +-
.../features/internal/model/package-info.java | 4 +-
.../model/processing/BundleReplacements.java | 16 +-
.../model/processing/FeatureReplacements.java | 14 +-
.../model/processing/FeaturesProcessing.java | 18 +-
.../internal/model/processing/ObjectFactory.java | 2 +-
.../model/processing/OverrideBundleDependency.java | 10 +-
.../internal/model/processing/package-info.java | 6 +-
.../service/FeaturesProcessingSerializer.java | 12 +-
.../internal/service/FeaturesServiceImpl.java | 2 +-
.../features/internal/service/RepositoryImpl.java | 2 +
.../java/org/apache/karaf/features/AppendTest.java | 10 +-
.../org/apache/karaf/features/RepositoryTest.java | 15 +
.../internal/service/FeaturesProcessorTest.java | 4 +-
.../apache/karaf/features/internal/service/f02.xml | 4 +-
.../apache/karaf/features/internal/service/f08.xml | 2 +-
.../internal/service/org.apache.karaf.features.xml | 4 +-
.../apache/karaf/features/{repo3.xml => repo5.xml} | 13 +-
http/pom.xml | 5 -
.../karaf/http/core/internal/ProxyServiceImpl.java | 21 +-
.../karaf/http/core/internal/osgi/Activator.java | 10 +-
.../http/core/internal/proxy/ProxyServlet.java | 12 +-
.../http/core/internal/HttpMBeanImplTest.java | 2 +-
.../karaf/instance/core/internal/InstanceImpl.java | 2 +-
.../etc/org.apache.karaf.features.repos.cfg | 6 +-
itests/common/pom.xml | 1 +
.../org/apache/karaf/itests/KarafTestSupport.java | 2 +-
itests/test/pom.xml | 18 +-
.../src/test/filtered-resources/etc/feature.xml | 22 +-
.../java/org/apache/karaf/itests/BundleTest.java | 5 -
.../java/org/apache/karaf/itests/ConfigTest.java | 3 +-
.../java/org/apache/karaf/itests/FeatureTest.java | 4 +-
.../org/apache/karaf/itests/FelixHttpTest.java | 1 +
.../java/org/apache/karaf/itests/HttpTest.java | 8 +-
.../test/java/org/apache/karaf/itests/JmsTest.java | 142 -----
.../test/java/org/apache/karaf/itests/JtaTest.java | 164 +++---
.../java/org/apache/karaf/itests/MavenTest.java | 29 +-
.../test/java/org/apache/karaf/itests/XATest.java | 70 ++-
.../karaf/itests/examples/CdiExampleTest.java | 41 --
.../karaf/itests/examples/GraphQLExampleTest.java | 8 +-
.../karaf/itests/examples/JmsExampleTest.java | 74 ---
.../karaf/itests/examples/JpaExampleTest.java | 85 ---
.../karaf/itests/examples/RestExampleTest.java | 2 +
.../karaf/itests/examples/ServletExampleTest.java | 48 +-
.../karaf/itests/examples/SoapExampleTest.java | 2 +
.../itests/examples/WebSocketExampleTest.java | 17 +-
.../itests/features/EnterpriseFeaturesTest.java | 1 -
.../karaf/itests/features/PaxCdiFeaturesTest.java | 79 ---
.../karaf/itests/features/SpecsFeaturesTest.java | 5 -
.../karaf/itests/features/Spring3FeaturesTest.java | 134 -----
.../itests/features/Spring43FeaturesTest.java | 121 ----
.../itests/features/Spring52FeaturesTest.java | 117 ----
.../itests/features/Spring53FeaturesTest.java | 122 -----
.../itests/features/Spring60FeaturesTest.java | 101 ----
.../itests/features/StandardFeaturesTest.java | 5 -
.../itests/ssh/FeatureSshCommandSecurityTest.java | 3 +
.../karaf/itests/ssh/SshCommandTestBase.java | 12 +-
.../org/apache/karaf/itests/util/SimpleSocket.java | 7 +-
...ource-derby.cfg => org.ops4j.datasource-h2.cfg} | 8 +-
.../apache/karaf/itests/features/xa-test-camel.xml | 2 +-
jaas/blueprint/jasypt/pom.xml | 6 +-
jaas/jasypt/pom.xml | 2 +-
jaas/modules/pom.xml | 13 +-
.../jaas/modules/encryption/BasicEncryption.java | 2 +-
.../jaas/modules/jdbc/JdbcLoginModuleTest.java | 11 +-
jaas/spring-security-crypto/pom.xml | 2 +-
.../impl/SpringSecurityCryptoEncryption.java | 2 +-
jms/pom.xml | 12 +-
.../main/java/org/apache/karaf/jms/JmsMessage.java | 2 +-
.../internal/ActiveMQDestinationSourceFactory.java | 85 ++-
.../internal/ArtemisDestinationSourceFactory.java | 12 +-
.../internal/ConnectionFactoryRegistration.java | 156 ++++++
.../karaf/jms/internal/DestinationSource.java | 11 +-
.../apache/karaf/jms/internal/JmsServiceImpl.java | 90 +--
.../apache/karaf/jms/internal/osgi/Activator.java | 21 +
.../apache/karaf/main/lock/DefaultJDBCLock.java | 6 +-
.../apache/karaf/main/lock/GenericJDBCLock.java | 3 -
.../lock/{DerbyJDBCLock.java => H2JDBCLock.java} | 74 ++-
main/src/main/resources/OSGI-INF/bundle.info | 2 +-
.../org/apache/karaf/main/MainLockingTest.java | 6 +-
.../main/lock/DefaultJDBCLockIntegrationTest.java | 8 +-
.../karaf/main/lock/DefaultJDBCLockTest.java | 16 +-
...ionTest.java => H2JDBCLockIntegrationTest.java} | 116 ++--
...{DerbyJDBCLockTest.java => H2JDBCLockTest.java} | 158 +++---
management/server/pom.xml | 2 +-
manual/src/main/asciidoc/index.adoc | 1 -
manual/src/main/asciidoc/user-guide/cdi.adoc | 75 ---
manual/src/main/asciidoc/user-guide/failover.adoc | 20 +-
manual/src/main/asciidoc/user-guide/jdbc.adoc | 54 +-
.../src/main/asciidoc/user-guide/provisioning.adoc | 27 +-
manual/src/main/asciidoc/user-guide/scheduler.adoc | 6 +-
maven/core/pom.xml | 2 +-
pom.xml | 66 ++-
profile/pom.xml | 2 +-
scheduler/pom.xml | 9 +-
.../apache/karaf/scheduler/command/Reschedule.java | 2 +-
.../karaf/scheduler/command/ScheduleCommand.java | 2 +-
.../karaf/scheduler/command/ScheduleScript.java | 2 +-
.../scheduler/core/InternalScheduleOptions.java | 2 +-
services/interceptor/impl/pom.xml | 6 +-
.../karaf/service/interceptor/impl/E2ETest.java | 2 +-
.../impl/console/osgi/LocalConsoleManager.java | 2 +-
.../org/apache/karaf/shell/ssh/ShellCommand.java | 12 +-
.../apache/karaf/shell/ssh/ShellCommandTest.java | 109 ++++
specs/javaxmlws/pom.xml | 4 -
.../main/java/javax/xml/bind/ContextFinder.java | 510 -----------------
tooling/karaf-maven-plugin/pom.xml | 12 +-
.../tooling/features/GenerateDescriptorMojo.java | 34 +-
.../karaf/tooling/utils/Dependency31Helper.java | 32 +-
.../java/org/apache/karaf/tooling/RunMojoTest.java | 8 +-
.../features/GenerateDescriptorMojoTest.java | 2 +-
tooling/utils/pom.xml | 3 +-
util/pom.xml | 4 +-
.../main/java/org/apache/karaf/util/XmlUtils.java | 98 ++--
.../org/apache/karaf/util/BundleUtilsTest.java | 2 +-
webconsole/console/pom.xml | 17 +-
.../internal/servlet/JaasSecurityProvider.java | 34 +-
.../internal/servlet/KarafOsgiManager.java | 38 +-
.../servlet/KarafOsgiManagerActivator.java | 5 +-
webconsole/features/pom.xml | 9 +-
.../karaf/webconsole/features/Activator.java | 7 +-
.../karaf/webconsole/features/FeaturesPlugin.java | 34 +-
webconsole/gogo/pom.xml | 9 +-
.../apache/karaf/webconsole/gogo/Activator.java | 6 +-
.../apache/karaf/webconsole/gogo/GogoPlugin.java | 37 +-
webconsole/http/pom.xml | 9 +-
.../apache/karaf/webconsole/http/Activator.java | 6 +-
.../apache/karaf/webconsole/http/HttpPlugin.java | 608 ++++++++++-----------
webconsole/instance/pom.xml | 9 +-
.../karaf/webconsole/instance/Activator.java | 6 +-
.../karaf/webconsole/instance/InstancePlugin.java | 40 +-
.../webconsole/instance/InstancePluginTest.java | 18 +-
280 files changed, 2159 insertions(+), 7354 deletions(-)
create mode 100644 .mvn/README
delete mode 100644 assemblies/features/spring-legacy/pom.xml
delete mode 100644
assemblies/features/spring-legacy/src/main/feature/feature.xml
delete mode 100644 examples/karaf-cdi-example/README.md
delete mode 100644 examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml
delete mode 100644
examples/karaf-cdi-example/karaf-cdi-example-api/src/main/java/org/apache/karaf/examples/cdi/api/MyService.java
delete mode 100644
examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml
delete mode 100644
examples/karaf-cdi-example/karaf-cdi-example-consumer/src/main/java/org/apache/karaf/examples/cdi/consumer/MyConsumerBean.java
delete mode 100644
examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml
delete mode 100644
examples/karaf-cdi-example/karaf-cdi-example-features/src/main/feature/feature.xml
delete mode 100644
examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml
delete mode 100644
examples/karaf-cdi-example/karaf-cdi-example-provider/src/main/java/org/apache/karaf/examples/cdi/provider/MyServiceBean.java
delete mode 100644 examples/karaf-cdi-example/pom.xml
delete mode 100644 examples/karaf-jpa-example/README.md
delete mode 100644 examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/AddCommand.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/GetCommand.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/ListCommand.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/RemoveCommand.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/completers/BookingIdCompleter.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-features/src/main/feature/feature.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/src/main/java/org/apache/karaf/examples/jpa/Booking.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/src/main/java/org/apache/karaf/examples/jpa/BookingService.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/eclipselink/BookingServiceImpl.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/resources/META-INF/persistence.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/resources/OSGI-INF/blueprint/blueprint.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/hibernate/BookingServiceImpl.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/resources/META-INF/persistence.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/resources/OSGI-INF/blueprint/blueprint.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/openjpa/BookingServiceImpl.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/resources/META-INF/persistence.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/src/main/java/org/apache/karaf/examples/jpa/provider/ds/eclipselink/BookingServiceImpl.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/src/main/resources/META-INF/persistence.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/src/main/java/org/apache/karaf/examples/jpa/provider/ds/hibernate/BookingServiceImpl.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/src/main/resources/META-INF/persistence.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/ds/openjpa/BookingServiceImpl.java
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/resources/META-INF/persistence.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml
delete mode 100644
examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml
delete mode 100644 examples/karaf-jpa-example/pom.xml
delete mode 100644
examples/karaf-servlet-example/karaf-servlet-example-registration/src/main/java/org/apache/karaf/examples/servlet/registration/Activator.java
delete mode 100644
examples/karaf-servlet-example/karaf-servlet-example-upload/src/main/java/org/apache/karaf/examples/servlet/upload/Component.java
delete mode 100644
examples/karaf-websocket-example/src/main/java/org/apache/karaf/examples/websocket/WebSocketExample.java
create mode 100644
examples/karaf-websocket-example/src/main/java/org/apache/karaf/examples/websocket/WebSocketExampleEndpoint.java
copy features/core/src/test/resources/org/apache/karaf/features/{repo3.xml =>
repo5.xml} (84%)
delete mode 100644
itests/test/src/test/java/org/apache/karaf/itests/JmsTest.java
delete mode 100644
itests/test/src/test/java/org/apache/karaf/itests/examples/CdiExampleTest.java
delete mode 100644
itests/test/src/test/java/org/apache/karaf/itests/examples/JmsExampleTest.java
delete mode 100644
itests/test/src/test/java/org/apache/karaf/itests/examples/JpaExampleTest.java
delete mode 100644
itests/test/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java
delete mode 100644
itests/test/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
delete mode 100644
itests/test/src/test/java/org/apache/karaf/itests/features/Spring43FeaturesTest.java
delete mode 100644
itests/test/src/test/java/org/apache/karaf/itests/features/Spring52FeaturesTest.java
delete mode 100644
itests/test/src/test/java/org/apache/karaf/itests/features/Spring53FeaturesTest.java
delete mode 100644
itests/test/src/test/java/org/apache/karaf/itests/features/Spring60FeaturesTest.java
rename
itests/test/src/test/resources/org/apache/karaf/itests/features/{org.ops4j.datasource-derby.cfg
=> org.ops4j.datasource-h2.cfg} (85%)
create mode 100644
jms/src/main/java/org/apache/karaf/jms/internal/ConnectionFactoryRegistration.java
rename main/src/main/java/org/apache/karaf/main/lock/{DerbyJDBCLock.java =>
H2JDBCLock.java} (71%)
rename
main/src/test/java/org/apache/karaf/main/lock/{DerbyJDBCLockIntegrationTest.java
=> H2JDBCLockIntegrationTest.java} (83%)
rename main/src/test/java/org/apache/karaf/main/lock/{DerbyJDBCLockTest.java
=> H2JDBCLockTest.java} (59%)
delete mode 100644 manual/src/main/asciidoc/user-guide/cdi.adoc
create mode 100644
shell/ssh/src/test/java/org/apache/karaf/shell/ssh/ShellCommandTest.java
delete mode 100644
specs/javaxmlws/src/main/java/javax/xml/bind/ContextFinder.java
