This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/main/org.hibernate-hibernate-validator-8.0.3.Final
in repository https://gitbox.apache.org/repos/asf/karaf.git
discard 7b8d6cef15 Bump org.hibernate:hibernate-validator from 7.0.5.Final to
8.0.3.Final
add 69a0bd2ae6 Bump com.google.guava:guava from 20.0 to 23.0 (#2362)
add a43754534d Bump redis.clients:jedis from 4.4.8 to 7.4.0 (#2351)
add 52d4083ec9 Bump org.apache.felix:maven-bundle-plugin from 5.1.9 to
6.0.2 (#2349)
add c8e0abc45e Bump maven.resolver.version from 1.9.27 to 2.0.16 (#2342)
add 800ca04957 Bump org.apache.maven.shared:maven-filtering from 3.4.0 to
3.5.0 (#2298)
add d418e4de7e Bump jackson.version from 2.21.0 to 2.21.1 (#2286)
add 4ec4c446b2 Bump org.osgi:osgi.annotation from 7.0.0 to 8.1.0 (#2370)
add 6b30c8338f Bump org.osgi:osgi.core from 7.0.0 to 8.0.0 (#2365)
add b4558881f4 Bump org.osgi:org.osgi.annotation.bundle from 1.1.1 to
2.0.0 (#2364)
add 00e4914856 Bump org.codehaus.plexus:plexus-utils from 3.6.0 to 4.0.2
(#2360)
add 4b839ca90a Bump biz.aQute.bnd:biz.aQute.bndlib from 6.4.1 to 7.2.1
(#2373)
add a3d3fced1e Bump org.apache.felix:org.apache.felix.inventory from 1.1.0
to 2.0.0 (#2357)
add ea71d6b2ba Bump org.eclipse.platform:org.eclipse.osgi from 3.18.0 to
3.24.100 (#2303)
add e7e168aefa Bump org.apache.maven:maven-archiver from 3.5.2 to 3.6.6
(#2205)
add e3d9d760de ci: use workflow_run to publish test results on fork PRs
(#2450)
add fc24935e98 Bump camel.version from 4.10.7 to 4.14.5 (#2456)
add 7f1a6a704a Bump org.jline:jline from 3.30.8 to 4.0.5 (#2454)
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 2381f26d71 Bump org.hibernate:hibernate-validator from 7.0.5.Final to
8.0.3.Final
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 (7b8d6cef15)
\
N -- N -- N
refs/heads/dependabot/maven/main/org.hibernate-hibernate-validator-8.0.3.Final
(2381f26d71)
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:
.github/workflows/ci-test-results.yml | 64 +++
.github/workflows/ci.yml | 21 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../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 | 2 +-
.../karaf/event/command/EventSendCommandTest.java | 2 +-
.../karaf/event/service/EventCollectorTest.java | 2 +-
.../karaf-blueprint-example-common/pom.xml | 2 +-
.../karaf-bundle-example-common/pom.xml | 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-command-example-api/pom.xml | 2 +-
.../karaf-command-example-provider/pom.xml | 2 +-
.../karaf-config-example-listener/pom.xml | 2 +-
.../karaf-config-example-managed-factory/pom.xml | 2 +-
.../karaf-config-example-managed/pom.xml | 2 +-
.../karaf-config-example-static/pom.xml | 2 +-
.../karaf/examples/docker/ExampleServlet.java | 10 +-
.../karaf-docker-example-dynamic-dist/pom.xml | 2 +-
.../karaf-docker-example-static-dist/pom.xml | 2 +-
examples/karaf-dump-example/pom.xml | 2 +-
.../karaf-graphql-example-api/pom.xml | 2 +-
.../karaf-graphql-example-commands/pom.xml | 4 +-
.../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 | 8 +-
.../karaf-jaas-example-app/pom.xml | 2 +-
.../karaf/examples/jaas/wab/ExampleServlet.java | 10 +-
.../karaf-jdbc-example-api/pom.xml | 2 +-
.../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 --
.../karaf-mbean-example-api/pom.xml | 2 +-
.../karaf-mbean-example-provider/pom.xml | 2 +-
.../karaf-mbean-example-simple/pom.xml | 2 +-
.../default.profile/org.ops4j.pax.web.cfg | 2 +-
.../src/main/resources/karaf.profile/profile.cfg | 1 -
.../karaf-redis-example-api/pom.xml | 2 +-
.../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 +-
.../karaf-soap-example-api/pom.xml | 2 +-
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 | 16 +-
.../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 +-
.../java/org/apache/karaf/features/AppendTest.java | 10 +-
.../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 +-
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 +-
.../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/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 -
.../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 +
main/src/main/java/org/apache/karaf/main/Main.java | 9 +-
.../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 +-
.../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 | 69 ++-
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 +-
specs/javaxmlws/pom.xml | 4 -
.../main/java/javax/xml/bind/ContextFinder.java | 510 -----------------
tooling/karaf-maven-plugin/pom.xml | 16 +-
.../tooling/features/GenerateDescriptorMojo.java | 2 +-
.../java/org/apache/karaf/tooling/RunMojoTest.java | 8 +-
.../features/GenerateDescriptorMojoTest.java | 2 +-
tooling/utils/pom.xml | 1 -
util/pom.xml | 4 +-
.../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 +-
276 files changed, 1900 insertions(+), 7245 deletions(-)
create mode 100644 .github/workflows/ci-test-results.yml
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
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
delete mode 100644
specs/javaxmlws/src/main/java/javax/xml/bind/ContextFinder.java
