From d77a8f65a223cad3af9ea587d5b026f29d3193c4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 23 Sep 2023 00:21:19 +0200 Subject: [PATCH 001/440] [KARAF-7761] Upgrade maven-resources-plugin to 3.3.1 Signed-off-by: Robert Varga (cherry picked from commit 82e4295f2181fa137cf95e030fa5a14e89800e36) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b320f691b4c..e6b020a7338 100644 --- a/pom.xml +++ b/pom.xml @@ -510,7 +510,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.3.0 + 3.3.1 org.apache.servicemix.tooling From 153a79f41d1ee7288e631859c080027d376b49d6 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 23 Sep 2023 00:18:50 +0200 Subject: [PATCH 002/440] [KARAF-7760] Upgrade maven-source-plugin to 3.3.0 Signed-off-by: Robert Varga (cherry picked from commit e3ccf244ef144ff6bda9539dfd89c92841a04836) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e6b020a7338..4847c804ec4 100644 --- a/pom.xml +++ b/pom.xml @@ -520,7 +520,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 org.apache.maven.plugins From 1f16d282d02530aae19a03dbeb893ac92d1dac46 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 23 Sep 2023 00:11:55 +0200 Subject: [PATCH 003/440] [KARAF-7759] Upgrade maven-remote-resources-plugin to 3.1.0 Signed-off-by: Robert Varga (cherry picked from commit 6429d65bd56eee31299b6bdba064c6a1ad2e189d) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4847c804ec4..8754e7db801 100644 --- a/pom.xml +++ b/pom.xml @@ -460,7 +460,7 @@ org.apache.maven.plugins maven-remote-resources-plugin - 3.0.0 + 3.1.0 org.apache.maven.plugins From c3828fccf8d0576b8ad8df1a315aa4c9f0397634 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 22 Sep 2023 23:44:03 +0200 Subject: [PATCH 004/440] [KARAF-7758]: Upgrade maven-surefire-plugin to 3.1.2 Signed-off-by: Robert Varga (cherry picked from commit 2d982bce3aed374b97a0fb6f7fe3aa92568464f0) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8754e7db801..90b3d8fad58 100644 --- a/pom.xml +++ b/pom.xml @@ -501,7 +501,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.1.2 once ${surefire.argLine} From 09c85fa0a5f8c8f2a18ffbf7ae963eb7c115755c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 22 Sep 2023 23:29:14 +0200 Subject: [PATCH 005/440] [KARAF-7757] Upgrade maven-enforcer-plugin to 3.4.1 Signed-off-by: Robert Varga (cherry picked from commit 1a6b389113de78c5b01a77052a0e044c7ee5695e) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90b3d8fad58..557c80c29dc 100644 --- a/pom.xml +++ b/pom.xml @@ -440,7 +440,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.4.1 org.apache.maven.plugins From d6e48969bf8213e002b038b671d14a6bbd2396da Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 22 Sep 2023 23:20:15 +0200 Subject: [PATCH 006/440] [KARAF-7755]: Upgrade maven-compiler-plugin to 3.11.0 Signed-off-by: Robert Varga (cherry picked from commit 416b0ccafebd6668c39f95a6097119affb26c7dd) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 557c80c29dc..f0ba449ecf4 100644 --- a/pom.xml +++ b/pom.xml @@ -430,7 +430,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.11.0 org.apache.maven.plugins From 21757cc72886008f8a3e987701d1d00a048429ba Mon Sep 17 00:00:00 2001 From: Grzegorz Grzybek Date: Fri, 27 Oct 2023 19:15:44 +0200 Subject: [PATCH 007/440] [KARAF-7773] Upgrade to Pax Web 8.0.24 & Jetty 9.4.53.v20231009 --- assemblies/features/standard/src/main/feature/feature.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index 85e9e04ce0b..10cbf9402d4 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -910,7 +910,7 @@ org.osgi.service.http.port=8181 pax-web-http-war - + pax-web-jetty diff --git a/pom.xml b/pom.xml index f0ba449ecf4..2364c85bdd7 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ 1.5.1 1.8.5 2.6.14 - 8.0.22 + 8.0.24 3.0.0 1.5.6 1.1.3 From b47601a93131ea52403dd4281a6b2132dd623431 Mon Sep 17 00:00:00 2001 From: Grzegorz Grzybek Date: Mon, 13 Nov 2023 08:27:40 +0100 Subject: [PATCH 008/440] [KARAF-7779] Fix deployment scenario where feature has a fragment for existing bundle --- .../internal/region/SubsystemResolver.java | 15 +++- .../internal/service/DeployerTest.java | 69 +++++++++++++++ .../internal/support/TestBundleRevision.java | 86 +++++++++++++++++++ .../features/internal/service/data4/b.mf | 4 + .../features/internal/service/data4/f.mf | 5 ++ .../internal/service/data4/features.xml | 22 +++++ 6 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundleRevision.java create mode 100644 features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/b.mf create mode 100644 features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/f.mf create mode 100644 features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/features.xml diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java index a7ec9551e2d..8ff50728bdd 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/SubsystemResolver.java @@ -472,7 +472,20 @@ private Map getResourceMapping(SimpleFilter resourceFilter) { if (wire != null) { String region = (String) wire.getCapability().getAttributes().get(IDENTITY_NAMESPACE); region = flats.get(region); - resources.put(resource, region); + Resource toStore = resource; + if (resource instanceof BundleRevision) { + // there may be a situation where a bundle is already installed, but new feature + // installs a fragment attached to this bundle. In this case, what we effectively + // need to install is not the bundle again + // (we'd get "java.lang.IllegalStateException: Resource has no uri"), but the fragment + Resource originalRequirer = wire.getRequirement().getResource(); + if (originalRequirer != null && originalRequirer != resource) { + // it means the source of this requirement is NOT the installed bundle, which + // should be a fragment + toStore = originalRequirer; + } + } + resources.put(toStore, region); } } } diff --git a/features/core/src/test/java/org/apache/karaf/features/internal/service/DeployerTest.java b/features/core/src/test/java/org/apache/karaf/features/internal/service/DeployerTest.java index be83b4f2221..85cac4d2b77 100644 --- a/features/core/src/test/java/org/apache/karaf/features/internal/service/DeployerTest.java +++ b/features/core/src/test/java/org/apache/karaf/features/internal/service/DeployerTest.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -40,6 +41,7 @@ import org.apache.karaf.features.FeaturesService; import org.apache.karaf.features.internal.resolver.Slf4jResolverLog; import org.apache.karaf.features.internal.support.TestBundle; +import org.apache.karaf.features.internal.support.TestBundleRevision; import org.apache.karaf.features.internal.support.TestDownloadManager; import org.easymock.EasyMock; import org.easymock.IAnswer; @@ -49,6 +51,7 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.wiring.BundleRevision; import org.osgi.resource.Resource; import org.osgi.resource.Wire; import org.osgi.service.resolver.Resolver; @@ -58,6 +61,7 @@ import static org.apache.karaf.features.FeaturesService.*; import static org.apache.karaf.features.internal.util.MapUtils.addToMapSet; import static org.easymock.EasyMock.anyInt; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; public class DeployerTest { @@ -134,6 +138,71 @@ public void testInstallSimpleFeature() throws Exception { c.verify(); } + @Test + public void testInstallFeatureWithFragment() throws Exception { + String dataDir = "data4"; + + TestDownloadManager manager = new TestDownloadManager(getClass(), dataDir); + + RepositoryImpl repo = new RepositoryImpl(getClass().getResource(dataDir + "/features.xml").toURI()); + Feature f = repo.getFeatures()[0]; + + URL loc = getClass().getResource(dataDir + "/b.mf"); + Manifest man = new Manifest(loc.openStream()); + Hashtable headers = new Hashtable<>(); + for (Map.Entry attr : man.getMainAttributes().entrySet()) { + headers.put(attr.getKey().toString(), attr.getValue().toString()); + } + Bundle bundle = new TestBundle(1, "b", Bundle.ACTIVE, headers) { + @Override + public A adapt(Class type) { + if (type == BundleRevision.class) { + return type.cast(new TestBundleRevision(this)); + } + return super.adapt(type); + } + }; + Bundle fragment = createTestBundle(2L, Bundle.RESOLVED, dataDir, "f"); + + Map bundles = new HashMap<>(); + bundles.put("b", bundle); + bundles.put("f", fragment); + + Deployer.DeploymentState dstate = new Deployer.DeploymentState(); + dstate.state = new State(); + dstate.bundles = new HashMap<>(); + dstate.bundles.put(1L, bundle); + dstate.bundlesPerRegion = new HashMap<>(); + dstate.bundlesPerRegion.put(ROOT_REGION, Collections.singleton(1L)); + dstate.partitionFeatures(Collections.singletonList(f)); + dstate.filtersPerRegion = new HashMap<>(); + dstate.filtersPerRegion.put(ROOT_REGION, new HashMap<>()); + + Deployer.DeploymentRequest request = new Deployer.DeploymentRequest(); + request.bundleUpdateRange = DEFAULT_BUNDLE_UPDATE_RANGE; + request.featureResolutionRange = DEFAULT_FEATURE_RESOLUTION_RANGE; + request.globalRepository = null; + request.options = EnumSet.noneOf(Option.class); + request.stateChanges = Collections.emptyMap(); + request.updateSnaphots = SnapshotUpdateBehavior.None; + request.requirements = new HashMap<>(); + addToMapSet(request.requirements, ROOT_REGION, f.getName() + "/" + new VersionRange(f.getVersion(), true)); + + final List installedBundles = new ArrayList<>(); + MyDeployCallback callback = new MyDeployCallback(dstate, bundles) { + @Override + public Bundle installBundle(String region, String uri, InputStream is) throws BundleException { + installedBundles.add(uri); + return super.installBundle(region, uri, is); + } + }; + Deployer deployer = new Deployer(manager, resolver, callback); + + deployer.deploy(dstate, request); + assertEquals(1, installedBundles.size()); + assertEquals("f", installedBundles.get(0)); + } + @Test public void testUpdateSimpleFeature() throws Exception { IMocksControl c = EasyMock.createControl(); diff --git a/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundleRevision.java b/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundleRevision.java new file mode 100644 index 00000000000..ee17900e3d7 --- /dev/null +++ b/features/core/src/test/java/org/apache/karaf/features/internal/support/TestBundleRevision.java @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.karaf.features.internal.support; + +import java.util.List; +import java.util.stream.Collectors; + +import org.apache.felix.utils.resource.CapabilityImpl; +import org.osgi.framework.Bundle; +import org.osgi.framework.Version; +import org.osgi.framework.wiring.BundleCapability; +import org.osgi.framework.wiring.BundleRequirement; +import org.osgi.framework.wiring.BundleRevision; +import org.osgi.framework.wiring.BundleWiring; +import org.osgi.resource.Capability; +import org.osgi.resource.Requirement; + +public class TestBundleRevision implements BundleRevision { + + private final TestBundle bundle; + + public TestBundleRevision(TestBundle bundle) { + this.bundle = bundle; + } + + @Override + public String getSymbolicName() { + return bundle.getSymbolicName(); + } + + @Override + public Version getVersion() { + return bundle.getVersion(); + } + + @Override + public List getDeclaredCapabilities(String s) { + return null; + } + + @Override + public List getDeclaredRequirements(String s) { + return null; + } + + @Override + public int getTypes() { + return 0; + } + + @Override + public BundleWiring getWiring() { + return null; + } + + @Override + public List getCapabilities(String s) { + return bundle.getCapabilities(null).stream().filter(c -> !c.getNamespace().equals("osgi.content")) + .map(c -> new CapabilityImpl(this, c.getNamespace(), c.getDirectives(), c.getAttributes())) + .collect(Collectors.toList()); + } + + @Override + public List getRequirements(String s) { + return bundle.getRequirements(s); + } + + @Override + public Bundle getBundle() { + return bundle; + } +} diff --git a/features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/b.mf b/features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/b.mf new file mode 100644 index 00000000000..9e8ac9eab80 --- /dev/null +++ b/features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/b.mf @@ -0,0 +1,4 @@ +Manifest-Version: 1 +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: b +Bundle-Version: 1.0.0 diff --git a/features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/f.mf b/features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/f.mf new file mode 100644 index 00000000000..a6b6067adc0 --- /dev/null +++ b/features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/f.mf @@ -0,0 +1,5 @@ +Manifest-Version: 1 +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: f +Fragment-Host: b +Bundle-Version: 1.0.0 diff --git a/features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/features.xml b/features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/features.xml new file mode 100644 index 00000000000..886aeb3204d --- /dev/null +++ b/features/core/src/test/resources/org/apache/karaf/features/internal/service/data4/features.xml @@ -0,0 +1,22 @@ + + + + + f + + From bed573cee63073dcc302d237f08cfd4225479955 Mon Sep 17 00:00:00 2001 From: same8891 <55152301+same8891@users.noreply.github.com> Date: Thu, 9 Nov 2023 16:11:08 -0600 Subject: [PATCH 009/440] Update MainLockingTest.java (cherry picked from commit 7516c3b15191e8d87eaffb52cb0c90c132f2860c) --- main/src/test/java/org/apache/karaf/main/MainLockingTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/test/java/org/apache/karaf/main/MainLockingTest.java b/main/src/test/java/org/apache/karaf/main/MainLockingTest.java index 8a12fd45d2c..0b93f7226f4 100644 --- a/main/src/test/java/org/apache/karaf/main/MainLockingTest.java +++ b/main/src/test/java/org/apache/karaf/main/MainLockingTest.java @@ -187,7 +187,7 @@ public void testLostMasterLockAfterThreshold() throws Exception { FrameworkStartLevel sl = framework.adapt(FrameworkStartLevel.class); MockLock lock = (MockLock) main.getLock(); - + Thread.sleep(1000); Assert.assertEquals(100, sl.getStartLevel()); // simulate losing a lock From 99b299f61027dbb4fec9d8d856d3be92a9a043f2 Mon Sep 17 00:00:00 2001 From: Bernd Date: Mon, 6 Nov 2023 00:08:50 +0100 Subject: [PATCH 010/440] avoid long evaluation chain for JRE property (cherry picked from commit a7f64687fc45a631c7a8f5ea67400d18c5501977) --- .../resources/etc/jre.properties | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties index cea56132b83..50c95a87461 100644 --- a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties +++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties @@ -493,14 +493,14 @@ jre-9= \ com.sun.security.sasl.util jre-10 = ${jre-9} -jre-11 = ${jre-10} -jre-12 = ${jre-11} -jre-13 = ${jre-12} -jre-14 = ${jre-13} -jre-15 = ${jre-14} -jre-16 = ${jre-15} -jre-17 = ${jre-16} -jre-18 = ${jre-17} -jre-19 = ${jre-18} -jre-20 = ${jre-19} -jre-21 = ${jre-20} +jre-11 = ${jre-9} +jre-12 = ${jre-9} +jre-13 = ${jre-9} +jre-14 = ${jre-9} +jre-15 = ${jre-9} +jre-16 = ${jre-9} +jre-17 = ${jre-9} +jre-18 = ${jre-9} +jre-19 = ${jre-9} +jre-20 = ${jre-9} +jre-21 = ${jre-9} From c8eef474375acfd0b97bd8e3119cdbce02da83e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Mon, 18 Sep 2023 00:00:28 +0200 Subject: [PATCH 011/440] [KARAF-7751] upgrade plugins to solve RB issues (cherry picked from commit e982f65806ee39cf8ad43600c7a029da69cee7be) --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index f0ba449ecf4..2ab769f184e 100644 --- a/pom.xml +++ b/pom.xml @@ -84,8 +84,8 @@ ${scm.connection} ${scm.developerConnection} ${scm.url} - HEAD - + HEAD + @@ -356,7 +356,7 @@ 1.4.0 - 1.4.0 + 1.5.0 UTF-8 @@ -480,7 +480,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.0.1 false clean install @@ -525,7 +525,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.4.2 + 3.6.0 org.apache.maven.plugins From 6e8067203d58f857fcfc2e688e0484c1cc8aa355 Mon Sep 17 00:00:00 2001 From: Francesco Calabria Date: Tue, 14 Nov 2023 16:33:18 +0100 Subject: [PATCH 012/440] [KARAF-6606] Fixed felix.fileinstall.filename property availability via ConfigMBean (getConfig method) (cherry picked from commit 8910546230032ca5d679f09d61ada486ce78510d) --- .../core/impl/ConfigRepositoryImpl.java | 6 ++ .../impl/FelixFileInstallFilenameTest.java | 90 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java index c5bfa76a8be..3f057863e3f 100644 --- a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java +++ b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java @@ -165,6 +165,12 @@ public TypedProperties getConfig(String pid) throws IOException, InvalidSyntaxEx } if (file != null && file.exists()) { tp = load(file); + + Object fileInstallFileName = props.get(FILEINSTALL_FILE_NAME); + if (fileInstallFileName != null && !"".equals(fileInstallFileName)) { + tp.put(FILEINSTALL_FILE_NAME, fileInstallFileName); + } + } else { for (Enumeration e = props.keys(); e.hasMoreElements();) { String key = e.nextElement(); diff --git a/config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java b/config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java new file mode 100644 index 00000000000..8af12367131 --- /dev/null +++ b/config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java @@ -0,0 +1,90 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.karaf.config.core.impl; + +import junit.framework.TestCase; +import org.apache.felix.utils.properties.TypedProperties; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.service.cm.Configuration; +import org.osgi.service.cm.ConfigurationAdmin; + +import java.io.IOException; +import java.net.URI; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.Map; +import java.util.Properties; + +import static org.easymock.EasyMock.*; + +public class FelixFileInstallFilenameTest extends TestCase { + + private static final String PID = "my.test.persistent.id"; + + private static final String CFG_TEST_FILE = "src/test/resources/test.cfg"; + + private static final URI CFG_TEST_FILE_URI = Paths.get(CFG_TEST_FILE).toUri(); + + private static final String FILE_INSTALL_FILENAME = "felix.fileinstall.filename"; + + private ConfigRepositoryImpl configRepository; + + @Override + protected void setUp() throws Exception { + ConfigurationAdmin admin = createMock(ConfigurationAdmin.class); + configRepository = new ConfigRepositoryImpl(admin); + + Configuration config = createMock(Configuration.class); + expect(admin.getConfiguration(PID, null)).andReturn(config); + replay(admin); + + Properties properties = new Properties(); + properties.load(Files.newInputStream(Paths.get(CFG_TEST_FILE))); + + Dictionary dictionary = new Hashtable<>(); + for (Map.Entry entry : properties.entrySet()) { + dictionary.put(String.valueOf(entry.getKey()), entry.getValue()); + } + dictionary.put(FILE_INSTALL_FILENAME, CFG_TEST_FILE_URI); + + expect(config.getProcessedProperties(null)) + .andReturn(dictionary); + replay(config); + } + + public void testGetConfig() throws InvalidSyntaxException, IOException { + + TypedProperties tp = configRepository.getConfig(PID); + + assertNotNull("The felix.fileinstall.filename properties should be present", + tp.get(FILE_INSTALL_FILENAME)); + + assertEquals("The felix.fileinstall.filename properties should be set on PID configs", + CFG_TEST_FILE_URI.toString(), tp.get(FILE_INSTALL_FILENAME)); + } + + public void testMBeanListProperties() throws Exception { + + ConfigMBeanImpl configMBean = new ConfigMBeanImpl(); + configMBean.setConfigRepo(configRepository); + + Map pidProps = configMBean.listProperties(PID); + + assertNotNull("The felix.fileinstall.filename properties should be present", + pidProps.get(FILE_INSTALL_FILENAME)); + } + +} \ No newline at end of file From fd2ce0b67915ab92df1965f1aaa6918f05eab528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 13 Dec 2023 20:10:42 +0100 Subject: [PATCH 013/440] KARAF-7790: Upgrade to jansi 2.4.1 (cherry picked from commit 8b6f37f27aabf964b46d003ce289cac2a94bdb70) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ab769f184e..93bde3eae00 100644 --- a/pom.xml +++ b/pom.xml @@ -279,7 +279,7 @@ 5.6.7.Final 7.0.2.Final 4.5.13 - 2.4.0 + 2.4.1 3.9.0.GA 3.21.0 4.13.2 From bf4840f21659321929236439956ce2ffd1185292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 13 Dec 2023 20:15:03 +0100 Subject: [PATCH 014/440] KARAF-7789: Upgrade to xbean 4.24 (cherry picked from commit c57c3adc26e4bc30114ed0f0912f7f661ace4442) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 641d5d3c905..d53d7ce07ba 100644 --- a/pom.xml +++ b/pom.xml @@ -348,7 +348,7 @@ 1.2.16 2.10.0 1.3.10_1 - 4.23 + 4.24 1.4.7 2.3.0 From 2ba431012f9b03865172bd598c69d83005f257a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 14 Dec 2023 14:48:11 +0100 Subject: [PATCH 015/440] KARAF-7788: Upgrade to commons-lang3 3.14.0 (cherry picked from commit 02b5182cd50162dea85d24acb1056accaa1cde23) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d53d7ce07ba..68cf7020f88 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ 1.23.0 3.2.2 1.5 - 3.13.0 + 3.14.0 1.2 2.11.1 2.13.0 From 20e778343326e2791a7b60e49cd7cf0487b8537c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 14 Dec 2023 14:49:20 +0100 Subject: [PATCH 016/440] KARAF-7787: Upgrade to commons-compress 1.25.0 (cherry picked from commit 5c9e24250ff43cbb69a9097462806e2238e3e33e) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68cf7020f88..b9a9e469ae9 100644 --- a/pom.xml +++ b/pom.xml @@ -178,7 +178,7 @@ 2.3.8 1.9.4 1.15 - 1.23.0 + 1.25.0 3.2.2 1.5 3.14.0 From 265f1b47c7223c19c38fc1892eb148723fd2aa83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 14 Dec 2023 14:50:30 +0100 Subject: [PATCH 017/440] KARAF-7786: Upgrade to Aries SpiFly 1.3.7 (cherry picked from commit 11b79c88ba261dfc39802cbb468e06e59480eb70) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9a9e469ae9..0c92c723901 100644 --- a/pom.xml +++ b/pom.xml @@ -261,7 +261,7 @@ 1.1.0 1.1.13 1.1.1 - 1.3.6 + 1.3.7 2.0.10 2.0.10 1.0.1 From a4f13b330a9138141d4f3a21dbcd268623e3e4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 14 Dec 2023 15:07:21 +0100 Subject: [PATCH 018/440] KARAF-7785: Upgrade to Aries Proxy 1.1.14 (cherry picked from commit 6c3906c71bb73c4b0e4398d4f17bae36acdfa3c5) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c92c723901..be7666c8443 100644 --- a/pom.xml +++ b/pom.xml @@ -259,7 +259,7 @@ 1.1.0 1.0.2 1.1.0 - 1.1.13 + 1.1.14 1.1.1 1.3.7 2.0.10 From fdc12e5b0a5673fb517d60cd2aff29b28a8b05ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 14 Dec 2023 15:08:34 +0100 Subject: [PATCH 019/440] KARAF-7784: Upgrade to JNA 5.14.0 (cherry picked from commit d8abd5ed976334bfa4f4f8eeb138415e71388766) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be7666c8443..417a794f54c 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ 3.2.9_1 3.5.5 2.14.1 - 5.13.0 + 5.14.0 2.3.8 1.9.4 1.15 From 4772027856baf5d8daeae592290850ce05381341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Fri, 15 Dec 2023 06:01:09 +0100 Subject: [PATCH 020/440] KARAF-7771: Upgrade to asm 9.6 (cherry picked from commit 05fab6314844c59369fa446e2f509ffad85f9d25) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 417a794f54c..1a0d493ede5 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 5.17.1 1.0_6 1.9.5_1 - 9.5 + 9.6 1.3.2 3.1.6 1.75 From 256095d0a1cb0b799ff63867a419695bff98d3ff Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 23 Sep 2023 00:24:00 +0200 Subject: [PATCH 021/440] [KARAF-7762] Upgrade build-helper-maven-plugin to 3.4.0 Signed-off-by: Robert Varga (cherry picked from commit ac55e6e27a32429c3e80a461cb39e4fe40646c0b) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a0d493ede5..b09ec666e04 100644 --- a/pom.xml +++ b/pom.xml @@ -573,7 +573,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.4.0 org.apache.maven.plugins From c7c14ce1d02650ef14afd95248d87b7238460607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Fri, 15 Dec 2023 06:03:18 +0100 Subject: [PATCH 022/440] KARAF-7772: Upgrade to sshd 2.11.0 (cherry picked from commit f4d0e141b65c61309e5a32d605a2771b3bbe3e47) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b09ec666e04..dd6b868399e 100644 --- a/pom.xml +++ b/pom.xml @@ -346,7 +346,7 @@ 5.7.3_1 1.2.16 - 2.10.0 + 2.11.0 1.3.10_1 4.24 1.4.7 From fd4aec49bd4ec4874a0de1c7f52f496412f87730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 14 Dec 2023 15:36:18 +0100 Subject: [PATCH 023/440] KARAF-7782: Upgrade to commons-io 2.15.1 (cherry picked from commit a8a1486235fc423fadbc4f3a5033ed0261836d17) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dd6b868399e..c72a837ee2a 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ 3.14.0 1.2 2.11.1 - 2.13.0 + 2.15.1 2.7.11 1.9.3_1 1.7.1 From aa9a7871b2c551e84862b99137e04d10311c4401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Fri, 15 Dec 2023 11:13:36 +0100 Subject: [PATCH 024/440] KARAF-7781: Upgrade to maven-plugin-annotations 3.10.2 (cherry picked from commit 895d4858b16716b488ad5e206a6ec4388656f137) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c72a837ee2a..eecd9d434d2 100644 --- a/pom.xml +++ b/pom.xml @@ -287,7 +287,7 @@ 1.2.17 3.8.6 3.5.2 - 3.6.4 + 3.10.2 1.8.2 8.0.0 From 0eb6fe3ce3fdcdd26892776e8ab079f9a6e70d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Mon, 18 Dec 2023 11:15:54 +0100 Subject: [PATCH 025/440] KARAF-7783: Upgrade to commons-logging 1.3.0 (cherry picked from commit 7d37936b137d88c3e955b2dc7c9707514fa60098) --- jaas/modules/pom.xml | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml index 058b5043e42..625e3795f0f 100644 --- a/jaas/modules/pom.xml +++ b/jaas/modules/pom.xml @@ -188,6 +188,7 @@ !net.spy.memcached*, com.sun.security.auth.module;resolution:=optional, javax.xml.bind*;version="[2.2,3)", + org.apache.commons.logging;version="[1,2)", * diff --git a/pom.xml b/pom.xml index eecd9d434d2..afa6449b76b 100644 --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ 3.2.2 1.5 3.14.0 - 1.2 + 1.3.0 2.11.1 2.15.1 2.7.11 From f66f32cf6b411c2673f49f955f79413b8595c20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Fri, 15 Dec 2023 17:36:33 +0100 Subject: [PATCH 026/440] KARAF-7727: Fix org.osgi.util.promise version and use properties (cherry picked from commit f7451eb361) --- .../features/framework/src/main/feature/feature.xml | 8 ++++---- assemblies/features/standard/src/main/feature/feature.xml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml index e202b95064e..d339d8555dd 100644 --- a/assemblies/features/framework/src/main/feature/feature.xml +++ b/assemblies/features/framework/src/main/feature/feature.xml @@ -31,8 +31,8 @@ mvn:org.ops4j.pax.logging/pax-logging-log4j2/${pax.logging.version} mvn:org.fusesource.jansi/jansi/${jansi.version} - mvn:org.osgi/org.osgi.util.function/1.2.0 - mvn:org.osgi/org.osgi.util.promise/1.2.0 + mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} + mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version} mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version} mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version} @@ -57,8 +57,8 @@ mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version} mvn:org.ops4j.pax.logging/pax-logging-logback/${pax.logging.version} - mvn:org.osgi/org.osgi.util.function/1.2.0 - mvn:org.osgi/org.osgi.util.promise/1.2.0 + mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} + mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version} mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version} mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version} diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index 10cbf9402d4..183d91ab4d6 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -1465,9 +1465,9 @@ org.apache.felix.eventadmin.AddSubject=true - mvn:org.osgi/org.osgi.util.function/1.2.0 - mvn:org.osgi/org.osgi.util.promise/1.2.0 - mvn:org.osgi/org.osgi.service.component/1.5.0 + mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} + mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} + mvn:org.osgi/org.osgi.service.component/${org.osgi.service.component.version} mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version} mvn:org.apache.felix/org.apache.felix.scr/${felix.scr.version} From 36488d724cda5c5a81035c38dfc3117be9eece33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 3 Jan 2024 11:47:07 +0100 Subject: [PATCH 027/440] KARAF-7769: Upgrade to Felix WebConsole 4.8.12 (cherry picked from commit 289f7ecfaaf3875d8982066cf719cd6f0c057338) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index afa6449b76b..99feb8b990d 100644 --- a/pom.xml +++ b/pom.xml @@ -223,7 +223,7 @@ 1.1.0 5.1.9 1.11.8 - 4.8.10 + 4.8.12 3.4.0 1.0.10 1.2.4 From b870c6e47e187ff004586c30ea9aedfd7c15274a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 3 Jan 2024 15:02:58 +0100 Subject: [PATCH 028/440] KARAF-7793: Upgrade to PAX Logging 2.2.6 (cherry picked from commit f67845259140202577fde1e99f7152cb1b2344a1) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99feb8b990d..d87d57f5a40 100644 --- a/pom.xml +++ b/pom.xml @@ -308,7 +308,7 @@ 1.1.4 4.13.5 - 2.2.3 + 2.2.6 1.5.1 1.8.5 2.6.14 From 26e01debc1add5e7b88bb9a4d28adcf14f1450a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 3 Jan 2024 17:11:05 +0100 Subject: [PATCH 029/440] KARAF-7775: Move config shell commands in a dedicated bundle (cherry picked from commit 43fcb6175483864dd7e5e5d4be0e4f9e2963424b) --- .../framework/src/main/feature/feature.xml | 2 + .../standard/src/main/feature/feature.xml | 4 +- config/command/pom.xml | 139 +++++++++++++++ .../karaf/config/command/CancelCommand.java | 0 .../config/command/ConfigCommandSupport.java | 0 .../command/ConfigPropertyCommandSupport.java | 2 +- .../karaf/config/command/DeleteCommand.java | 0 .../karaf/config/command/EditCommand.java | 2 +- .../karaf/config/command/ExistsCommand.java | 0 .../karaf/config/command/InstallCommand.java | 0 .../karaf/config/command/ListCommand.java | 0 .../karaf/config/command/MetaCommand.java | 9 +- .../config/command/PropAppendCommand.java | 2 +- .../karaf/config/command/PropDelCommand.java | 0 .../karaf/config/command/PropGetCommand.java | 2 +- .../karaf/config/command/PropListCommand.java | 0 .../karaf/config/command/PropSetCommand.java | 2 +- .../karaf/config/command/UpdateCommand.java | 0 .../completers/ConfigurationCompleter.java | 0 .../ConfigurationPropertyCompleter.java | 7 +- .../command/completers/MetaCompleter.java | 2 +- .../src/main/resources/OSGI-INF/bundle.info | 0 .../src/main/resources}/command/edit.txt | 0 .../karaf/config/command/EditCommandTest.java | 0 .../config/command/MockCommandSession.java | 0 .../config/command/UpdateCommandTest.java | 0 config/core/pom.xml | 164 ++++++++++++++++++ .../apache/karaf/config/core/ConfigMBean.java | 0 .../karaf/config/core/ConfigRepository.java | 0 .../karaf/config/core}/MetaServiceCaller.java | 2 +- .../config/core/impl/ConfigMBeanImpl.java | 0 .../core/impl/ConfigRepositoryImpl.java | 0 .../config/core/impl/JsonConfigInstaller.java | 0 .../core/impl/KarafConfigurationPlugin.java | 0 .../config/core/impl/osgi/Activator.java | 0 .../OSGI-INF/metatype/metatype.properties | 4 +- .../resources/OSGI-INF/metatype/metatype.xml | 0 .../config/core/impl/ConfigMBeanImplTest.java | 0 .../impl/FelixFileInstallFilenameTest.java | 0 .../core/impl/JsonConfigInstallerTest.java | 0 .../impl/KarafConfigurationPluginTest.java | 0 ...example.Arrays~no_update_required.cfg.json | 0 ...rg.example.Arrays~update_required.cfg.json | 0 config/{ => core}/src/test/resources/test.cfg | 0 config/pom.xml | 140 +-------------- 45 files changed, 330 insertions(+), 153 deletions(-) create mode 100644 config/command/pom.xml rename config/{ => command}/src/main/java/org/apache/karaf/config/command/CancelCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/ConfigCommandSupport.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/DeleteCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/EditCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/ExistsCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/InstallCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/ListCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/MetaCommand.java (96%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/PropAppendCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/PropDelCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/PropGetCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/PropListCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/PropSetCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/UpdateCommand.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/completers/ConfigurationCompleter.java (100%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java (96%) rename config/{ => command}/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java (98%) rename config/{ => command}/src/main/resources/OSGI-INF/bundle.info (100%) rename config/{src/main/resources/org/apache/karaf/config => command/src/main/resources}/command/edit.txt (100%) rename config/{ => command}/src/test/java/org/apache/karaf/config/command/EditCommandTest.java (100%) rename config/{ => command}/src/test/java/org/apache/karaf/config/command/MockCommandSession.java (100%) rename config/{ => command}/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java (100%) create mode 100644 config/core/pom.xml rename config/{ => core}/src/main/java/org/apache/karaf/config/core/ConfigMBean.java (100%) rename config/{ => core}/src/main/java/org/apache/karaf/config/core/ConfigRepository.java (100%) rename config/{src/main/java/org/apache/karaf/config/core/impl => core/src/main/java/org/apache/karaf/config/core}/MetaServiceCaller.java (99%) rename config/{ => core}/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java (100%) rename config/{ => core}/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java (100%) rename config/{ => core}/src/main/java/org/apache/karaf/config/core/impl/JsonConfigInstaller.java (100%) rename config/{ => core}/src/main/java/org/apache/karaf/config/core/impl/KarafConfigurationPlugin.java (100%) rename config/{ => core}/src/main/java/org/apache/karaf/config/core/impl/osgi/Activator.java (100%) rename config/{ => core}/src/main/resources/OSGI-INF/metatype/metatype.properties (90%) rename config/{ => core}/src/main/resources/OSGI-INF/metatype/metatype.xml (100%) rename config/{ => core}/src/test/java/org/apache/karaf/config/core/impl/ConfigMBeanImplTest.java (100%) rename config/{ => core}/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java (100%) rename config/{ => core}/src/test/java/org/apache/karaf/config/core/impl/JsonConfigInstallerTest.java (100%) rename config/{ => core}/src/test/java/org/apache/karaf/config/core/impl/KarafConfigurationPluginTest.java (100%) rename config/{ => core}/src/test/resources/org.example.Arrays~no_update_required.cfg.json (100%) rename config/{ => core}/src/test/resources/org.example.Arrays~update_required.cfg.json (100%) rename config/{ => core}/src/test/resources/test.cfg (100%) diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml index d339d8555dd..a30ae6c578c 100644 --- a/assemblies/features/framework/src/main/feature/feature.xml +++ b/assemblies/features/framework/src/main/feature/feature.xml @@ -33,6 +33,7 @@ mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} + mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version} mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version} mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version} mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version} @@ -59,6 +60,7 @@ mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} + mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version} mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version} mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version} mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version} diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index 183d91ab4d6..462b1775626 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -630,6 +630,7 @@ property-set[/.*org[.]apache[.]karaf[.]command[.]acl[.].+/] = admin property-set[/.*org[.]apache[.]karaf[.]service[.]acl[.].+/] = admin update = manager + mvn:org.apache.karaf.config/org.apache.karaf.config.command/${project.version} @@ -978,7 +979,6 @@ realm=karaf # The role required to access the WebConsole role=admin - mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version} mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.console/${project.version} mvn:org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/${felix.memoryusage.webconsole.plugin.version} @@ -1429,7 +1429,6 @@ org.quartz.jobStore.class=org.quartz.simpl.RAMJobStore org.apache.felix.eventadmin.AddTimestamp=true org.apache.felix.eventadmin.AddSubject=true - mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version} mvn:org.apache.karaf.services/org.apache.karaf.services.eventadmin/${project.version} shell @@ -1468,7 +1467,6 @@ org.apache.felix.eventadmin.AddSubject=true mvn:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} mvn:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} mvn:org.osgi/org.osgi.service.component/${org.osgi.service.component.version} - mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version} mvn:org.apache.felix/org.apache.felix.scr/${felix.scr.version} management diff --git a/config/command/pom.xml b/config/command/pom.xml new file mode 100644 index 00000000000..b0d37b38dd7 --- /dev/null +++ b/config/command/pom.xml @@ -0,0 +1,139 @@ + + + + + + 4.0.0 + + + org.apache.karaf.config + config + 4.4.5-SNAPSHOT + ../pom.xml + + + org.apache.karaf.config + org.apache.karaf.config.command + bundle + Apache Karaf :: ConfigAdmin :: Command + This bundle provides Karaf Config shell commands + + + ${basedir}/../etc/appended-resources + + + + + + org.apache.karaf + karaf-bom + ${project.version} + pom + import + + + + + + + org.osgi + osgi.core + provided + + + org.osgi + org.osgi.service.cm + provided + + + org.osgi + org.osgi.service.metatype + provided + + + + org.apache.felix + org.apache.felix.utils + + + + org.apache.karaf.config + org.apache.karaf.config.core + + + + org.apache.karaf.shell + org.apache.karaf.shell.core + true + + + + org.slf4j + slf4j-jdk14 + test + + + + + + + ${project.basedir}/src/main/resources + + **/* + + + + ${project.basedir}/src/main/resources + true + + **/*.info + + + + + + org.apache.karaf.tooling + karaf-services-maven-plugin + + + org.apache.felix + maven-bundle-plugin + + + + org.apache.karaf.config.command* + + + !org.apache.karaf.config.command, + !org.apache.karaf.config.command.completers, + org.apache.felix.utils.properties, + org.osgi.framework;version="[1,3)", + org.apache.karaf.config.core*, + * + + + org.apache.karaf.util + + + + + + + + diff --git a/config/src/main/java/org/apache/karaf/config/command/CancelCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/CancelCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/CancelCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/CancelCommand.java diff --git a/config/src/main/java/org/apache/karaf/config/command/ConfigCommandSupport.java b/config/command/src/main/java/org/apache/karaf/config/command/ConfigCommandSupport.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/ConfigCommandSupport.java rename to config/command/src/main/java/org/apache/karaf/config/command/ConfigCommandSupport.java diff --git a/config/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java b/config/command/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java rename to config/command/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java index 533ea933ccd..18d880482be 100644 --- a/config/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java +++ b/config/command/src/main/java/org/apache/karaf/config/command/ConfigPropertyCommandSupport.java @@ -16,8 +16,8 @@ */ package org.apache.karaf.config.command; -import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.config.command.completers.ConfigurationCompleter; +import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.shell.api.action.Completion; import org.apache.karaf.shell.api.action.Option; diff --git a/config/src/main/java/org/apache/karaf/config/command/DeleteCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/DeleteCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/DeleteCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/DeleteCommand.java diff --git a/config/src/main/java/org/apache/karaf/config/command/EditCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/EditCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/EditCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/EditCommand.java index fe3d1b2e0e5..465421709ab 100644 --- a/config/src/main/java/org/apache/karaf/config/command/EditCommand.java +++ b/config/command/src/main/java/org/apache/karaf/config/command/EditCommand.java @@ -16,8 +16,8 @@ */ package org.apache.karaf.config.command; -import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.config.command.completers.ConfigurationCompleter; +import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.shell.api.action.Argument; import org.apache.karaf.shell.api.action.Command; import org.apache.karaf.shell.api.action.Completion; diff --git a/config/src/main/java/org/apache/karaf/config/command/ExistsCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/ExistsCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/ExistsCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/ExistsCommand.java diff --git a/config/src/main/java/org/apache/karaf/config/command/InstallCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/InstallCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/InstallCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/InstallCommand.java diff --git a/config/src/main/java/org/apache/karaf/config/command/ListCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/ListCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/ListCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/ListCommand.java diff --git a/config/src/main/java/org/apache/karaf/config/command/MetaCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/MetaCommand.java similarity index 96% rename from config/src/main/java/org/apache/karaf/config/command/MetaCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/MetaCommand.java index 165aea3d6a7..fc552f67bd8 100644 --- a/config/src/main/java/org/apache/karaf/config/command/MetaCommand.java +++ b/config/command/src/main/java/org/apache/karaf/config/command/MetaCommand.java @@ -16,8 +16,6 @@ */ package org.apache.karaf.config.command; -import static org.apache.karaf.config.core.impl.MetaServiceCaller.doWithMetaType; - import java.io.IOException; import java.util.Dictionary; import java.util.HashMap; @@ -27,7 +25,8 @@ import java.util.function.Function; import org.apache.karaf.config.command.completers.MetaCompleter; -import org.apache.karaf.config.core.impl.MetaServiceCaller.MetaInfo; +import org.apache.karaf.config.core.MetaServiceCaller; +import org.apache.karaf.config.core.MetaServiceCaller.MetaInfo; import org.apache.karaf.shell.api.action.Argument; import org.apache.karaf.shell.api.action.Command; import org.apache.karaf.shell.api.action.Completion; @@ -76,9 +75,9 @@ public MetaCommand() { public Object doExecute() throws Exception { try { if (create) { - doWithMetaType(context, pid, new Create()); + MetaServiceCaller.doWithMetaType(context, pid, new Create()); } else { - doWithMetaType(context, pid, new Print()); + MetaServiceCaller.doWithMetaType(context, pid, new Print()); } return null; } catch (Throwable e) { diff --git a/config/src/main/java/org/apache/karaf/config/command/PropAppendCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/PropAppendCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/PropAppendCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/PropAppendCommand.java index 6b004315ac3..9c05818c016 100644 --- a/config/src/main/java/org/apache/karaf/config/command/PropAppendCommand.java +++ b/config/command/src/main/java/org/apache/karaf/config/command/PropAppendCommand.java @@ -18,8 +18,8 @@ import java.util.Collection; -import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.config.command.completers.ConfigurationPropertyCompleter; +import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.shell.api.action.Argument; import org.apache.karaf.shell.api.action.Command; import org.apache.karaf.shell.api.action.Completion; diff --git a/config/src/main/java/org/apache/karaf/config/command/PropDelCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/PropDelCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/PropDelCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/PropDelCommand.java diff --git a/config/src/main/java/org/apache/karaf/config/command/PropGetCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/PropGetCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/PropGetCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/PropGetCommand.java index 48d453ea8d4..968602ee02f 100644 --- a/config/src/main/java/org/apache/karaf/config/command/PropGetCommand.java +++ b/config/command/src/main/java/org/apache/karaf/config/command/PropGetCommand.java @@ -16,8 +16,8 @@ */ package org.apache.karaf.config.command; -import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.config.command.completers.ConfigurationPropertyCompleter; +import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.shell.api.action.Argument; import org.apache.karaf.shell.api.action.Command; import org.apache.karaf.shell.api.action.Completion; diff --git a/config/src/main/java/org/apache/karaf/config/command/PropListCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/PropListCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/PropListCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/PropListCommand.java diff --git a/config/src/main/java/org/apache/karaf/config/command/PropSetCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/PropSetCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/PropSetCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/PropSetCommand.java index 1108bda67db..77f55498407 100644 --- a/config/src/main/java/org/apache/karaf/config/command/PropSetCommand.java +++ b/config/command/src/main/java/org/apache/karaf/config/command/PropSetCommand.java @@ -16,8 +16,8 @@ */ package org.apache.karaf.config.command; -import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.config.command.completers.ConfigurationPropertyCompleter; +import org.apache.felix.utils.properties.TypedProperties; import org.apache.karaf.shell.api.action.Argument; import org.apache.karaf.shell.api.action.Command; import org.apache.karaf.shell.api.action.Completion; diff --git a/config/src/main/java/org/apache/karaf/config/command/UpdateCommand.java b/config/command/src/main/java/org/apache/karaf/config/command/UpdateCommand.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/UpdateCommand.java rename to config/command/src/main/java/org/apache/karaf/config/command/UpdateCommand.java diff --git a/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationCompleter.java b/config/command/src/main/java/org/apache/karaf/config/command/completers/ConfigurationCompleter.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationCompleter.java rename to config/command/src/main/java/org/apache/karaf/config/command/completers/ConfigurationCompleter.java diff --git a/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java b/config/command/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java similarity index 96% rename from config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java rename to config/command/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java index b42a0cf1a08..9ae225158f8 100644 --- a/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java +++ b/config/command/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java @@ -19,8 +19,6 @@ package org.apache.karaf.config.command.completers; -import static org.apache.karaf.config.core.impl.MetaServiceCaller.doWithMetaType; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -33,7 +31,8 @@ import java.util.Set; import org.apache.karaf.config.command.ConfigCommandSupport; -import org.apache.karaf.config.core.impl.MetaServiceCaller.MetaInfo; +import org.apache.karaf.config.core.MetaServiceCaller; +import org.apache.karaf.config.core.MetaServiceCaller.MetaInfo; import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; import org.apache.karaf.shell.api.console.CommandLine; @@ -142,7 +141,7 @@ private Set getPropertyNames(String pid) { private List getMetaTypeProperties(String pid){ try { - return doWithMetaType(context, pid, this::collectMetaConfigProperties); + return MetaServiceCaller.doWithMetaType(context, pid, this::collectMetaConfigProperties); } catch (Throwable e) { Throwable ncdfe = e; while (ncdfe != null && !(ncdfe instanceof NoClassDefFoundError)) { diff --git a/config/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java b/config/command/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java similarity index 98% rename from config/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java rename to config/command/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java index c35ccde1a82..3df9e1e26a6 100644 --- a/config/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java +++ b/config/command/src/main/java/org/apache/karaf/config/command/completers/MetaCompleter.java @@ -18,7 +18,7 @@ import java.util.List; -import org.apache.karaf.config.core.impl.MetaServiceCaller; +import org.apache.karaf.config.core.MetaServiceCaller; import org.apache.karaf.shell.api.action.lifecycle.Init; import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; diff --git a/config/src/main/resources/OSGI-INF/bundle.info b/config/command/src/main/resources/OSGI-INF/bundle.info similarity index 100% rename from config/src/main/resources/OSGI-INF/bundle.info rename to config/command/src/main/resources/OSGI-INF/bundle.info diff --git a/config/src/main/resources/org/apache/karaf/config/command/edit.txt b/config/command/src/main/resources/command/edit.txt similarity index 100% rename from config/src/main/resources/org/apache/karaf/config/command/edit.txt rename to config/command/src/main/resources/command/edit.txt diff --git a/config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java b/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java similarity index 100% rename from config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java rename to config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java diff --git a/config/src/test/java/org/apache/karaf/config/command/MockCommandSession.java b/config/command/src/test/java/org/apache/karaf/config/command/MockCommandSession.java similarity index 100% rename from config/src/test/java/org/apache/karaf/config/command/MockCommandSession.java rename to config/command/src/test/java/org/apache/karaf/config/command/MockCommandSession.java diff --git a/config/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java b/config/command/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java similarity index 100% rename from config/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java rename to config/command/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java diff --git a/config/core/pom.xml b/config/core/pom.xml new file mode 100644 index 00000000000..0018d91cd26 --- /dev/null +++ b/config/core/pom.xml @@ -0,0 +1,164 @@ + + + + + + 4.0.0 + + + org.apache.karaf.config + config + 4.4.5-SNAPSHOT + ../pom.xml + + + org.apache.karaf.config + org.apache.karaf.config.core + bundle + Apache Karaf :: ConfigAdmin :: Core + This bundle provides Karaf services + + + ${basedir}/../etc/appended-resources + + + + + + org.apache.karaf + karaf-bom + ${project.version} + pom + import + + + + + + + org.osgi + osgi.core + provided + + + org.osgi + org.osgi.service.cm + provided + + + org.osgi + org.osgi.service.metatype + provided + + + org.osgi + org.osgi.util.converter + 1.0.9 + provided + + + + org.slf4j + slf4j-api + + + + org.apache.karaf + org.apache.karaf.util + + + org.apache.felix + org.apache.felix.cm.json + + + org.apache.sling + org.apache.sling.commons.johnzon + + + org.apache.geronimo.specs + geronimo-json_1.1_spec + 1.5 + + + org.apache.felix + org.apache.felix.fileinstall + + + + org.apache.karaf.shell + org.apache.karaf.shell.core + true + + + + org.slf4j + slf4j-jdk14 + test + + + + + + + ${project.basedir}/src/main/resources + + **/* + + + + ${project.basedir}/src/main/resources + true + + **/*.info + + + + + + org.apache.karaf.tooling + karaf-services-maven-plugin + + + org.apache.felix + maven-bundle-plugin + + + + org.apache.karaf.config.core, + org.apache.felix.utils.properties;version="${felix.utils.version}" + + + org.osgi.service.metatype, + org.osgi.framework;version="[1,3)", + * + + + org.apache.karaf.config.core.impl, + org.apache.karaf.config.core.impl.osgi, + org.apache.karaf.util, + org.apache.karaf.util.config, + org.apache.felix.utils.collections + + + + + + + + diff --git a/config/src/main/java/org/apache/karaf/config/core/ConfigMBean.java b/config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/core/ConfigMBean.java rename to config/core/src/main/java/org/apache/karaf/config/core/ConfigMBean.java diff --git a/config/src/main/java/org/apache/karaf/config/core/ConfigRepository.java b/config/core/src/main/java/org/apache/karaf/config/core/ConfigRepository.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/core/ConfigRepository.java rename to config/core/src/main/java/org/apache/karaf/config/core/ConfigRepository.java diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/MetaServiceCaller.java b/config/core/src/main/java/org/apache/karaf/config/core/MetaServiceCaller.java similarity index 99% rename from config/src/main/java/org/apache/karaf/config/core/impl/MetaServiceCaller.java rename to config/core/src/main/java/org/apache/karaf/config/core/MetaServiceCaller.java index 87efeeba179..e98d53eeecf 100644 --- a/config/src/main/java/org/apache/karaf/config/core/impl/MetaServiceCaller.java +++ b/config/core/src/main/java/org/apache/karaf/config/core/MetaServiceCaller.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.karaf.config.core.impl; +package org.apache.karaf.config.core; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java b/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java rename to config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java b/config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java rename to config/core/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/JsonConfigInstaller.java b/config/core/src/main/java/org/apache/karaf/config/core/impl/JsonConfigInstaller.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/core/impl/JsonConfigInstaller.java rename to config/core/src/main/java/org/apache/karaf/config/core/impl/JsonConfigInstaller.java diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/KarafConfigurationPlugin.java b/config/core/src/main/java/org/apache/karaf/config/core/impl/KarafConfigurationPlugin.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/core/impl/KarafConfigurationPlugin.java rename to config/core/src/main/java/org/apache/karaf/config/core/impl/KarafConfigurationPlugin.java diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/osgi/Activator.java b/config/core/src/main/java/org/apache/karaf/config/core/impl/osgi/Activator.java similarity index 100% rename from config/src/main/java/org/apache/karaf/config/core/impl/osgi/Activator.java rename to config/core/src/main/java/org/apache/karaf/config/core/impl/osgi/Activator.java diff --git a/config/src/main/resources/OSGI-INF/metatype/metatype.properties b/config/core/src/main/resources/OSGI-INF/metatype/metatype.properties similarity index 90% rename from config/src/main/resources/OSGI-INF/metatype/metatype.properties rename to config/core/src/main/resources/OSGI-INF/metatype/metatype.properties index 3bce187b350..662d2a85a16 100644 --- a/config/src/main/resources/OSGI-INF/metatype/metatype.properties +++ b/config/core/src/main/resources/OSGI-INF/metatype/metatype.properties @@ -21,8 +21,8 @@ # This file contains localization strings for configuration labels and # descriptions as used in the metatype.xml descriptor -config.name = Apache Karaf Shell Config -config.description = Configuration of Apache Karaf Shell Config +config.name = Apache Karaf Config +config.description = Configuration of Apache Karaf Config storage.name = Storage directory storage.description = the directory used as a storage for configurations diff --git a/config/src/main/resources/OSGI-INF/metatype/metatype.xml b/config/core/src/main/resources/OSGI-INF/metatype/metatype.xml similarity index 100% rename from config/src/main/resources/OSGI-INF/metatype/metatype.xml rename to config/core/src/main/resources/OSGI-INF/metatype/metatype.xml diff --git a/config/src/test/java/org/apache/karaf/config/core/impl/ConfigMBeanImplTest.java b/config/core/src/test/java/org/apache/karaf/config/core/impl/ConfigMBeanImplTest.java similarity index 100% rename from config/src/test/java/org/apache/karaf/config/core/impl/ConfigMBeanImplTest.java rename to config/core/src/test/java/org/apache/karaf/config/core/impl/ConfigMBeanImplTest.java diff --git a/config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java b/config/core/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java similarity index 100% rename from config/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java rename to config/core/src/test/java/org/apache/karaf/config/core/impl/FelixFileInstallFilenameTest.java diff --git a/config/src/test/java/org/apache/karaf/config/core/impl/JsonConfigInstallerTest.java b/config/core/src/test/java/org/apache/karaf/config/core/impl/JsonConfigInstallerTest.java similarity index 100% rename from config/src/test/java/org/apache/karaf/config/core/impl/JsonConfigInstallerTest.java rename to config/core/src/test/java/org/apache/karaf/config/core/impl/JsonConfigInstallerTest.java diff --git a/config/src/test/java/org/apache/karaf/config/core/impl/KarafConfigurationPluginTest.java b/config/core/src/test/java/org/apache/karaf/config/core/impl/KarafConfigurationPluginTest.java similarity index 100% rename from config/src/test/java/org/apache/karaf/config/core/impl/KarafConfigurationPluginTest.java rename to config/core/src/test/java/org/apache/karaf/config/core/impl/KarafConfigurationPluginTest.java diff --git a/config/src/test/resources/org.example.Arrays~no_update_required.cfg.json b/config/core/src/test/resources/org.example.Arrays~no_update_required.cfg.json similarity index 100% rename from config/src/test/resources/org.example.Arrays~no_update_required.cfg.json rename to config/core/src/test/resources/org.example.Arrays~no_update_required.cfg.json diff --git a/config/src/test/resources/org.example.Arrays~update_required.cfg.json b/config/core/src/test/resources/org.example.Arrays~update_required.cfg.json similarity index 100% rename from config/src/test/resources/org.example.Arrays~update_required.cfg.json rename to config/core/src/test/resources/org.example.Arrays~update_required.cfg.json diff --git a/config/src/test/resources/test.cfg b/config/core/src/test/resources/test.cfg similarity index 100% rename from config/src/test/resources/test.cfg rename to config/core/src/test/resources/test.cfg diff --git a/config/pom.xml b/config/pom.xml index a268df7d999..4ac05874f70 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -29,137 +29,13 @@ org.apache.karaf.config - org.apache.karaf.config.core - bundle - Apache Karaf :: ConfigAdmin :: Core - This bundle provides Karaf services + config + pom + Apache Karaf :: ConfigAdmin - - ${basedir}/../etc/appended-resources - + + core + command + - - - - org.apache.karaf - karaf-bom - ${project.version} - pom - import - - - - - - - org.osgi - osgi.core - provided - - - org.osgi - org.osgi.service.cm - provided - - - org.osgi - org.osgi.service.metatype - provided - - - org.osgi - org.osgi.util.converter - 1.0.9 - provided - - - - org.slf4j - slf4j-api - - - - org.apache.karaf - org.apache.karaf.util - - - org.apache.felix - org.apache.felix.cm.json - - - org.apache.sling - org.apache.sling.commons.johnzon - - - org.apache.geronimo.specs - geronimo-json_1.1_spec - 1.5 - - - org.apache.felix - org.apache.felix.fileinstall - - - - org.apache.karaf.shell - org.apache.karaf.shell.core - true - - - - org.slf4j - slf4j-jdk14 - test - - - - - - - ${project.basedir}/src/main/resources - - **/* - - - - ${project.basedir}/src/main/resources - true - - **/*.info - - - - - - org.apache.karaf.tooling - karaf-services-maven-plugin - - - org.apache.felix - maven-bundle-plugin - - - - org.apache.karaf.config.command*, - org.apache.karaf.config.core, - org.apache.felix.utils.properties;version="${felix.utils.version}" - - - org.osgi.service.metatype;resolution:=optional, - org.osgi.framework;version="[1,3)", - * - - - org.apache.karaf.config.core.impl, - org.apache.karaf.config.core.impl.osgi, - org.apache.karaf.util, - org.apache.karaf.util.config, - org.apache.felix.utils.collections - - - - - - - - + \ No newline at end of file From 8c7bec476b2cccedc4cb2da690ddab0eda5fa0a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 4 Jan 2024 18:44:11 +0100 Subject: [PATCH 030/440] Update RELEASE-NOTES.md in preparation for 4.4.5 release --- RELEASE-NOTES.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index ca7227a0bea..285bcd08d1a 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -17,6 +17,48 @@ under the License. --> +## Apache Karaf 4.4.5 + +This is a maintenance release on the 4.4.x series. It includes a bunch of dependency updates and fixes. + +### ChangeLog + +#### Bug + * [KARAF-6210] - NoClassDefFoundError: org/apache/karaf/shell/api/action/Action when starting Karaf + * [KARAF-6606] - felix.fileinstall.filename property is not available via ConfigMBean + * [KARAF-7753] - Key authentication doesn't work with ecdsa keys + * [KARAF-7769] - Karaf webconsole plugins don't work since Felix WebConsole update + * [KARAF-7773] - WAB ServletContextListener.contextInitialized invoked multiple times during re-deploy (and with wrong context) + * [KARAF-7775] - Installing shell feature causes org.apache.karaf.config.core refresh + * [KARAF-7779] - Problem installing feature with fragment bundle for existing host bundle + +#### Improvement + * [KARAF-7751] - fix additional Reproducible Builds issues + +#### Dependency upgrade + * [KARAF-7727] - Upgrade to org.osgi.util.promise 1.3.0 + * [KARAF-7755] - Upgrade maven-compiler-plugin to 3.11.0 + * [KARAF-7757] - Upgrade maven-enforcer-plugin to 3.4.1 + * [KARAF-7758] - Upgrade maven-surefire-plugin to 3.1.2 + * [KARAF-7759] - Upgrade maven-remote-resources-plugin to 3.1.0 + * [KARAF-7760] - Upgrade maven-source-plugin to 3.3.0 + * [KARAF-7761] - Upgrade maven-resources-plugin to 3.3.1 + * [KARAF-7762] - Upgrade build-helper-maven-plugin to 3.4.0 + * [KARAF-7771] - Upgrade to ASM 9.6 + * [KARAF-7772] - Upgrade to sshd 2.11.0 + * [KARAF-7781] - Upgrade to maven-plugin-annotations 3.10.2 + * [KARAF-7782] - Upgrade to commons-io 2.15.1 + * [KARAF-7783] - Upgrade to commons-logging 1.3.0 + * [KARAF-7784] - Upgrade to JNA 5.14.0 + * [KARAF-7785] - Upgrade to Aries Proxy 1.1.14 + * [KARAF-7786] - Upgrade to Aries SpiFly 1.3.7 + * [KARAF-7787] - Upgrade to commons-compress 1.25.0 + * [KARAF-7788] - Upgrade to commons-lang3 3.14.0 + * [KARAF-7789] - Upgrade to xbean 4.24 + * [KARAF-7790] - Upgrade to jansi 2.4.1 + * [KARAF-7791] - Upgrade to Pax Web 8.0.24 / Jetty 9.4.53.v20231009 + * [KARAF-7793] - Upgrade to PAX Logging 2.2.6 + ## Apache Karaf 4.4.4 This is a maintenance release on the 4.4.x series. It includes a bunch of dependency updates and fixes. From baba1dc2d5b496f5ab36cc89010eb7bd1a4b4f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Fri, 5 Jan 2024 19:20:58 +0100 Subject: [PATCH 031/440] [maven-release-plugin] prepare release karaf-4.4.5 --- archetypes/assembly/pom.xml | 2 +- archetypes/blueprint/pom.xml | 2 +- archetypes/bundle/pom.xml | 2 +- archetypes/command/pom.xml | 2 +- archetypes/feature/pom.xml | 2 +- archetypes/kar/pom.xml | 2 +- archetypes/pom.xml | 2 +- assemblies/apache-karaf-minimal/pom.xml | 2 +- assemblies/apache-karaf/pom.xml | 2 +- assemblies/features/base/pom.xml | 2 +- assemblies/features/enterprise/pom.xml | 2 +- assemblies/features/framework/pom.xml | 2 +- assemblies/features/pom.xml | 2 +- assemblies/features/specs/pom.xml | 2 +- assemblies/features/spring-legacy/pom.xml | 2 +- assemblies/features/spring/pom.xml | 2 +- assemblies/features/standard/pom.xml | 2 +- assemblies/features/static/pom.xml | 2 +- assemblies/pom.xml | 2 +- audit/pom.xml | 2 +- bom/pom.xml | 2 +- bundle/blueprintstate/pom.xml | 2 +- bundle/core/pom.xml | 2 +- bundle/pom.xml | 2 +- bundle/springstate/pom.xml | 2 +- client/pom.xml | 2 +- config/command/pom.xml | 2 +- config/core/pom.xml | 2 +- config/pom.xml | 2 +- deployer/blueprint/pom.xml | 2 +- deployer/features/pom.xml | 2 +- deployer/kar/pom.xml | 2 +- deployer/pom.xml | 2 +- deployer/spring/pom.xml | 2 +- deployer/wrap/pom.xml | 2 +- diagnostic/boot/pom.xml | 2 +- diagnostic/core/pom.xml | 2 +- diagnostic/pom.xml | 2 +- docker/pom.xml | 2 +- event/pom.xml | 2 +- .../karaf-blueprint-example-client/pom.xml | 2 +- .../karaf-blueprint-example-common/pom.xml | 2 +- .../karaf-blueprint-example-features/pom.xml | 2 +- .../karaf-blueprint-example-provider/pom.xml | 2 +- examples/karaf-blueprint-example/pom.xml | 2 +- examples/karaf-branding-example/pom.xml | 2 +- .../karaf-bundle-example-client/pom.xml | 2 +- .../karaf-bundle-example-common/pom.xml | 2 +- .../karaf-bundle-example-features/pom.xml | 2 +- .../karaf-bundle-example-provider/pom.xml | 2 +- examples/karaf-bundle-example/pom.xml | 2 +- .../karaf-camel-example-blueprint/pom.xml | 2 +- .../karaf-camel-example-features/pom.xml | 2 +- .../karaf-camel-example/karaf-camel-example-java/pom.xml | 2 +- examples/karaf-camel-example/pom.xml | 2 +- examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml | 2 +- .../karaf-cdi-example/karaf-cdi-example-consumer/pom.xml | 2 +- .../karaf-cdi-example/karaf-cdi-example-features/pom.xml | 2 +- .../karaf-cdi-example/karaf-cdi-example-provider/pom.xml | 2 +- examples/karaf-cdi-example/pom.xml | 2 +- .../karaf-command-example/karaf-command-example-api/pom.xml | 2 +- .../karaf-command-example-command/pom.xml | 2 +- .../karaf-command-example-features/pom.xml | 2 +- .../karaf-command-example-provider/pom.xml | 2 +- examples/karaf-command-example/pom.xml | 2 +- .../karaf-config-example-blueprint/pom.xml | 2 +- .../karaf-config-example-features/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/karaf-config-example-scr/pom.xml | 2 +- .../karaf-config-example-static/pom.xml | 2 +- examples/karaf-config-example/pom.xml | 2 +- examples/karaf-deployer-example/pom.xml | 2 +- .../karaf-docker-example/karaf-docker-example-app/pom.xml | 2 +- .../karaf-docker-example-dynamic-dist/pom.xml | 2 +- .../karaf-docker-example-static-dist/pom.xml | 2 +- examples/karaf-docker-example/pom.xml | 2 +- examples/karaf-dump-example/pom.xml | 2 +- .../karaf-graphql-example/karaf-graphql-example-api/pom.xml | 2 +- .../karaf-graphql-example-commands/pom.xml | 2 +- .../karaf-graphql-example-core/pom.xml | 2 +- .../karaf-graphql-example-features/pom.xml | 2 +- .../karaf-graphql-example-scr-servlet/pom.xml | 2 +- .../karaf-graphql-example-websocket/pom.xml | 2 +- examples/karaf-graphql-example/pom.xml | 2 +- .../karaf-http-resource-example-features/pom.xml | 2 +- .../karaf-http-resource-example-whiteboard/pom.xml | 2 +- examples/karaf-http-resource-example/pom.xml | 2 +- examples/karaf-itest-example/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml | 2 +- .../karaf-jaas-example/karaf-jaas-example-features/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml | 2 +- examples/karaf-jaas-example/pom.xml | 2 +- examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-command/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-features/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml | 2 +- examples/karaf-jdbc-example/pom.xml | 2 +- .../karaf-jms-example/karaf-jms-example-command/pom.xml | 2 +- .../karaf-jms-example/karaf-jms-example-features/pom.xml | 2 +- examples/karaf-jms-example/pom.xml | 2 +- .../karaf-jpa-example/karaf-jpa-example-command/pom.xml | 2 +- .../karaf-jpa-example/karaf-jpa-example-features/pom.xml | 2 +- .../karaf-jpa-example-provider-api/pom.xml | 2 +- .../pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint-hibernate/pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint-openjpa/pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-eclipselink/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-hibernate/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-openjpa/pom.xml | 2 +- .../karaf-jpa-example-provider-ds/pom.xml | 2 +- .../karaf-jpa-example/karaf-jpa-example-provider/pom.xml | 2 +- examples/karaf-jpa-example/pom.xml | 2 +- .../karaf-log-appender-example-core/pom.xml | 2 +- .../karaf-log-appender-example-features/pom.xml | 2 +- examples/karaf-log-appender-example/pom.xml | 2 +- .../karaf-maven-example-run-bundle/pom.xml | 2 +- .../karaf-maven-example/karaf-maven-example-run/pom.xml | 2 +- examples/karaf-maven-example/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-api/pom.xml | 2 +- .../karaf-mbean-example-blueprint/pom.xml | 2 +- .../karaf-mbean-example-features/pom.xml | 2 +- .../karaf-mbean-example-provider/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-scr/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-simple/pom.xml | 2 +- examples/karaf-mbean-example/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-api/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-command/pom.xml | 2 +- .../karaf-redis-example-features/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-service/pom.xml | 2 +- examples/karaf-redis-example/pom.xml | 2 +- examples/karaf-rest-example/karaf-rest-example-api/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-blueprint/pom.xml | 2 +- .../karaf-rest-example-client-cxf/pom.xml | 2 +- .../karaf-rest-example-client-http/pom.xml | 2 +- .../karaf-rest-example-client-jersey/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-client/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-features/pom.xml | 2 +- examples/karaf-rest-example/karaf-rest-example-scr/pom.xml | 2 +- .../karaf-rest-example-whiteboard/pom.xml | 2 +- examples/karaf-rest-example/pom.xml | 2 +- .../karaf-scheduler-example-features/pom.xml | 2 +- .../karaf-scheduler-example-runnable/pom.xml | 2 +- examples/karaf-scheduler-example/pom.xml | 2 +- examples/karaf-scr-example/karaf-scr-example-api/pom.xml | 2 +- examples/karaf-scr-example/karaf-scr-example-client/pom.xml | 2 +- .../karaf-scr-example/karaf-scr-example-features/pom.xml | 2 +- .../karaf-scr-example/karaf-scr-example-provider/pom.xml | 2 +- examples/karaf-scr-example/pom.xml | 2 +- .../karaf-servlet-example-annotation/pom.xml | 2 +- .../karaf-servlet-example-blueprint/pom.xml | 2 +- .../karaf-servlet-example-features/pom.xml | 2 +- .../karaf-servlet-example-registration/pom.xml | 2 +- .../karaf-servlet-example/karaf-servlet-example-scr/pom.xml | 2 +- .../karaf-servlet-example-upload/pom.xml | 2 +- examples/karaf-servlet-example/pom.xml | 2 +- examples/karaf-soap-example/karaf-soap-example-api/pom.xml | 2 +- .../karaf-soap-example/karaf-soap-example-blueprint/pom.xml | 2 +- .../karaf-soap-example/karaf-soap-example-client/pom.xml | 2 +- .../karaf-soap-example/karaf-soap-example-features/pom.xml | 2 +- examples/karaf-soap-example/karaf-soap-example-scr/pom.xml | 2 +- examples/karaf-soap-example/pom.xml | 2 +- .../karaf-url-namespace-handler-example-core/pom.xml | 2 +- .../karaf-url-namespace-handler-example-features/pom.xml | 2 +- examples/karaf-url-namespace-handler-example/pom.xml | 2 +- .../karaf-war-example/karaf-war-example-features/pom.xml | 2 +- examples/karaf-war-example/karaf-war-example-webapp/pom.xml | 2 +- examples/karaf-war-example/pom.xml | 2 +- examples/karaf-websocket-example/pom.xml | 2 +- examples/pom.xml | 2 +- features/command/pom.xml | 2 +- features/core/pom.xml | 2 +- features/extension/pom.xml | 2 +- features/pom.xml | 2 +- http/pom.xml | 2 +- instance/pom.xml | 2 +- itests/common/pom.xml | 2 +- itests/pom.xml | 2 +- itests/test/pom.xml | 2 +- jaas/blueprint/config/pom.xml | 2 +- jaas/blueprint/jasypt/pom.xml | 2 +- jaas/blueprint/pom.xml | 2 +- jaas/boot/pom.xml | 2 +- jaas/command/pom.xml | 2 +- jaas/config/pom.xml | 2 +- jaas/jasypt/pom.xml | 2 +- jaas/modules/pom.xml | 2 +- jaas/pom.xml | 2 +- jaas/spring-security-crypto/pom.xml | 2 +- jdbc/pom.xml | 2 +- jms/pom.xml | 2 +- jndi/pom.xml | 2 +- kar/pom.xml | 2 +- log/pom.xml | 2 +- main/pom.xml | 2 +- management/pom.xml | 2 +- management/server/pom.xml | 2 +- manual/pom.xml | 2 +- maven/core/pom.xml | 2 +- maven/pom.xml | 2 +- obr/pom.xml | 2 +- package/pom.xml | 2 +- pom.xml | 6 +++--- profile/pom.xml | 2 +- scheduler/pom.xml | 2 +- scr/management/pom.xml | 2 +- scr/pom.xml | 2 +- scr/state/pom.xml | 2 +- service/core/pom.xml | 2 +- service/guard/pom.xml | 2 +- service/pom.xml | 2 +- services/coordinator/pom.xml | 2 +- services/eventadmin/pom.xml | 2 +- services/interceptor/api/pom.xml | 2 +- services/interceptor/impl/pom.xml | 2 +- services/interceptor/pom.xml | 2 +- services/pom.xml | 2 +- services/staticcm/pom.xml | 2 +- shell/commands/pom.xml | 2 +- shell/console/pom.xml | 2 +- shell/core/pom.xml | 2 +- shell/groovy/pom.xml | 2 +- shell/pom.xml | 2 +- shell/ssh/pom.xml | 2 +- shell/table/pom.xml | 2 +- specs/activator/pom.xml | 2 +- specs/java.xml.ws/pom.xml | 2 +- specs/java.xml/pom.xml | 2 +- specs/locator/pom.xml | 2 +- specs/pom.xml | 2 +- subsystem/pom.xml | 2 +- system/pom.xml | 2 +- tooling/karaf-maven-plugin/pom.xml | 2 +- tooling/karaf-services-maven-plugin/pom.xml | 2 +- tooling/pom.xml | 2 +- tooling/utils/pom.xml | 2 +- util/pom.xml | 2 +- web/pom.xml | 2 +- webconsole/console/pom.xml | 2 +- webconsole/features/pom.xml | 2 +- webconsole/gogo/pom.xml | 2 +- webconsole/http/pom.xml | 2 +- webconsole/instance/pom.xml | 2 +- webconsole/pom.xml | 2 +- wrapper/pom.xml | 2 +- 248 files changed, 250 insertions(+), 250 deletions(-) diff --git a/archetypes/assembly/pom.xml b/archetypes/assembly/pom.xml index a451a8839c1..d63f5859873 100644 --- a/archetypes/assembly/pom.xml +++ b/archetypes/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5-SNAPSHOT + 4.4.5 org.apache.karaf.archetypes diff --git a/archetypes/blueprint/pom.xml b/archetypes/blueprint/pom.xml index c36feef11ae..82c834724b7 100644 --- a/archetypes/blueprint/pom.xml +++ b/archetypes/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/archetypes/bundle/pom.xml b/archetypes/bundle/pom.xml index 94add38b9a6..5c73b17ff8a 100644 --- a/archetypes/bundle/pom.xml +++ b/archetypes/bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/archetypes/command/pom.xml b/archetypes/command/pom.xml index 8fe502ffa6d..e39f4c9c192 100644 --- a/archetypes/command/pom.xml +++ b/archetypes/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/archetypes/feature/pom.xml b/archetypes/feature/pom.xml index 36fb8763a40..b1f03a9a090 100644 --- a/archetypes/feature/pom.xml +++ b/archetypes/feature/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/archetypes/kar/pom.xml b/archetypes/kar/pom.xml index 405d53f9072..0f06536dc9b 100644 --- a/archetypes/kar/pom.xml +++ b/archetypes/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 5c8e833ba80..85bd7a6ea9d 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml index ff2767a9084..50b2f15c737 100644 --- a/assemblies/apache-karaf-minimal/pom.xml +++ b/assemblies/apache-karaf-minimal/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index 2b21cb21bfc..0afd161ee90 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml index 4ce530ef712..4799b0f6e3e 100644 --- a/assemblies/features/base/pom.xml +++ b/assemblies/features/base/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml index 74fd093221c..d0ce7dfbb14 100644 --- a/assemblies/features/enterprise/pom.xml +++ b/assemblies/features/enterprise/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml index 7bc9cab2e14..2a6086ddb24 100644 --- a/assemblies/features/framework/pom.xml +++ b/assemblies/features/framework/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/features/pom.xml b/assemblies/features/pom.xml index 8b90d540562..4c6ee25a34a 100644 --- a/assemblies/features/pom.xml +++ b/assemblies/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/features/specs/pom.xml b/assemblies/features/specs/pom.xml index 906c231d998..0733c2ff366 100644 --- a/assemblies/features/specs/pom.xml +++ b/assemblies/features/specs/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/features/spring-legacy/pom.xml b/assemblies/features/spring-legacy/pom.xml index 0ed5a66b3fa..4ff57335005 100644 --- a/assemblies/features/spring-legacy/pom.xml +++ b/assemblies/features/spring-legacy/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml index 9df0279f402..70d4e1992dd 100644 --- a/assemblies/features/spring/pom.xml +++ b/assemblies/features/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index 6c6b7700812..7cd92c645a0 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/features/static/pom.xml b/assemblies/features/static/pom.xml index 48b6f4929b7..f4add6fd26a 100644 --- a/assemblies/features/static/pom.xml +++ b/assemblies/features/static/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/assemblies/pom.xml b/assemblies/pom.xml index ff687c32941..d848004aba2 100644 --- a/assemblies/pom.xml +++ b/assemblies/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/audit/pom.xml b/audit/pom.xml index fddfff0bb45..1eaf3ea0f3d 100644 --- a/audit/pom.xml +++ b/audit/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index 176474e22d0..129adc01f82 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/bundle/blueprintstate/pom.xml b/bundle/blueprintstate/pom.xml index 20b1b02387c..43a13aa306a 100644 --- a/bundle/blueprintstate/pom.xml +++ b/bundle/blueprintstate/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml index 81a9923fca3..f45c2ff4791 100644 --- a/bundle/core/pom.xml +++ b/bundle/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/bundle/pom.xml b/bundle/pom.xml index f7d95ce9a27..ae5398356ea 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/bundle/springstate/pom.xml b/bundle/springstate/pom.xml index 73f87f0cfe1..a720bec1019 100644 --- a/bundle/springstate/pom.xml +++ b/bundle/springstate/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index 9d25fb85d01..746f2bf9a1d 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/config/command/pom.xml b/config/command/pom.xml index b0d37b38dd7..df550ecd89b 100644 --- a/config/command/pom.xml +++ b/config/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.config config - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/config/core/pom.xml b/config/core/pom.xml index 0018d91cd26..0b97de1cd1f 100644 --- a/config/core/pom.xml +++ b/config/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.config config - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/config/pom.xml b/config/pom.xml index 4ac05874f70..4b8bcdbd25a 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml index 0d83af98af6..e28db3abc64 100644 --- a/deployer/blueprint/pom.xml +++ b/deployer/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml index 66d6efaa0dd..149d4d50cf9 100644 --- a/deployer/features/pom.xml +++ b/deployer/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/deployer/kar/pom.xml b/deployer/kar/pom.xml index 6b60c2019ff..3174f86ee74 100644 --- a/deployer/kar/pom.xml +++ b/deployer/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/deployer/pom.xml b/deployer/pom.xml index 56cc4d1f5a9..94e8a3c761b 100644 --- a/deployer/pom.xml +++ b/deployer/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/deployer/spring/pom.xml b/deployer/spring/pom.xml index 6b53c45f9db..ac763f87a42 100644 --- a/deployer/spring/pom.xml +++ b/deployer/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/deployer/wrap/pom.xml b/deployer/wrap/pom.xml index 63b75b278f6..c413e815c0e 100644 --- a/deployer/wrap/pom.xml +++ b/deployer/wrap/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/diagnostic/boot/pom.xml b/diagnostic/boot/pom.xml index 1961f40e186..691202f5869 100644 --- a/diagnostic/boot/pom.xml +++ b/diagnostic/boot/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.diagnostic diagnostic - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml index 6d106d0f237..2a21ac7c679 100644 --- a/diagnostic/core/pom.xml +++ b/diagnostic/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.diagnostic diagnostic - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/diagnostic/pom.xml b/diagnostic/pom.xml index b239f45d290..ee86fc9887a 100644 --- a/diagnostic/pom.xml +++ b/diagnostic/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/docker/pom.xml b/docker/pom.xml index b55d51b42e5..de116a860dc 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/event/pom.xml b/event/pom.xml index 4427fd17b35..d45d37d8f27 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml index 6396f4b3b3d..38d5c6b497c 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml index 791dc5c7db6..e9b9a97c86c 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml index c77f856f83e..cc06a1c6ffa 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml index 6bd13670ae9..ee09b8b6029 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-blueprint-example/pom.xml b/examples/karaf-blueprint-example/pom.xml index 871ffd6ce16..45c748efeb5 100644 --- a/examples/karaf-blueprint-example/pom.xml +++ b/examples/karaf-blueprint-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-branding-example/pom.xml b/examples/karaf-branding-example/pom.xml index 28904b60f8e..307b82df182 100644 --- a/examples/karaf-branding-example/pom.xml +++ b/examples/karaf-branding-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml index 6103948b7b1..ebe589b514d 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml index 86edc83c161..9130401b6b5 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml index 23319f5e932..0362d7829cb 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml index bddd5c0ba49..8d254cdbd91 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-bundle-example/pom.xml b/examples/karaf-bundle-example/pom.xml index 132b7418307..7768153f20c 100644 --- a/examples/karaf-bundle-example/pom.xml +++ b/examples/karaf-bundle-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml b/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml index 691b77fa43a..2f66a36b5dc 100644 --- a/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-features/pom.xml b/examples/karaf-camel-example/karaf-camel-example-features/pom.xml index 5bf1afb786a..26409e9b061 100644 --- a/examples/karaf-camel-example/karaf-camel-example-features/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml index b6a602a2b02..848606e5ceb 100644 --- a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-camel-example/pom.xml b/examples/karaf-camel-example/pom.xml index ea594e2c099..c96efe7754f 100644 --- a/examples/karaf-camel-example/pom.xml +++ b/examples/karaf-camel-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml index ac2ef8ad3bd..6c0d72413d5 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml index aaad1a0e618..ab25fbed20f 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml index b523936edd9..dd96db0d3ea 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml index 4dbb5d1f6dd..35ae602cf5b 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-cdi-example/pom.xml b/examples/karaf-cdi-example/pom.xml index cb5433ca943..8e318bc0da9 100644 --- a/examples/karaf-cdi-example/pom.xml +++ b/examples/karaf-cdi-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-api/pom.xml b/examples/karaf-command-example/karaf-command-example-api/pom.xml index 75466d29fe9..cc88ddebd8d 100644 --- a/examples/karaf-command-example/karaf-command-example-api/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-command/pom.xml b/examples/karaf-command-example/karaf-command-example-command/pom.xml index 6a779c94e62..1620258c5bc 100644 --- a/examples/karaf-command-example/karaf-command-example-command/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-features/pom.xml b/examples/karaf-command-example/karaf-command-example-features/pom.xml index 9081fc0f146..1813d2a452d 100644 --- a/examples/karaf-command-example/karaf-command-example-features/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-provider/pom.xml b/examples/karaf-command-example/karaf-command-example-provider/pom.xml index 5a177652370..1596665b02c 100644 --- a/examples/karaf-command-example/karaf-command-example-provider/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-command-example/pom.xml b/examples/karaf-command-example/pom.xml index 023a201d386..5752ac3bbc0 100644 --- a/examples/karaf-command-example/pom.xml +++ b/examples/karaf-command-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml b/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml index 5874d8cab50..dd5be716bf9 100644 --- a/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-features/pom.xml b/examples/karaf-config-example/karaf-config-example-features/pom.xml index 0a871fd3249..34249dc4923 100644 --- a/examples/karaf-config-example/karaf-config-example-features/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-listener/pom.xml b/examples/karaf-config-example/karaf-config-example-listener/pom.xml index 33f4abf9d9a..2fd9ee4a378 100644 --- a/examples/karaf-config-example/karaf-config-example-listener/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-listener/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml b/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml index 4347a163eeb..bca76233414 100644 --- a/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-managed/pom.xml b/examples/karaf-config-example/karaf-config-example-managed/pom.xml index 87dec3c5296..945da844c2f 100644 --- a/examples/karaf-config-example/karaf-config-example-managed/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-managed/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-scr/pom.xml b/examples/karaf-config-example/karaf-config-example-scr/pom.xml index 5c9f4d88e36..15c66b3a31a 100644 --- a/examples/karaf-config-example/karaf-config-example-scr/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-static/pom.xml b/examples/karaf-config-example/karaf-config-example-static/pom.xml index d9e4a230154..3eaa184f42c 100644 --- a/examples/karaf-config-example/karaf-config-example-static/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-static/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-config-example/pom.xml b/examples/karaf-config-example/pom.xml index 742b9da474f..bba367f58a7 100644 --- a/examples/karaf-config-example/pom.xml +++ b/examples/karaf-config-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-deployer-example/pom.xml b/examples/karaf-deployer-example/pom.xml index 33efdb55ecf..6ef9cd183b3 100644 --- a/examples/karaf-deployer-example/pom.xml +++ b/examples/karaf-deployer-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml index fb0018fab56..a85fd5e3eea 100644 --- a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml index ef3831405e5..cf866b795c2 100644 --- a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml index 4fd5ef22046..c2fc8a72aab 100644 --- a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-docker-example/pom.xml b/examples/karaf-docker-example/pom.xml index d76ce72dfe0..cf98fcda428 100644 --- a/examples/karaf-docker-example/pom.xml +++ b/examples/karaf-docker-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-dump-example/pom.xml b/examples/karaf-dump-example/pom.xml index a9b24a8bad8..f0079cb23c6 100644 --- a/examples/karaf-dump-example/pom.xml +++ b/examples/karaf-dump-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml index ccb2c3d439d..6783ef089f6 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-graphql-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml index 0d766262b8e..9642d99e6a3 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-graphql-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml index a37eebe724d..7266578adde 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml index 0227c07cef8..82182a9ce8c 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml index 1689562a938..5513b576546 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml index 74721328150..69af12f2cad 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-graphql-example/pom.xml b/examples/karaf-graphql-example/pom.xml index 5e9dcb34015..ac0e23a21f5 100644 --- a/examples/karaf-graphql-example/pom.xml +++ b/examples/karaf-graphql-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml b/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml index f6d8862e516..02d99b67ebe 100644 --- a/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml +++ b/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-http-resource-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml b/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml index 28bbb35829e..a4e34033310 100644 --- a/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml +++ b/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-http-resource-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-http-resource-example/pom.xml b/examples/karaf-http-resource-example/pom.xml index ec93d13270f..49d4ff7aab3 100644 --- a/examples/karaf-http-resource-example/pom.xml +++ b/examples/karaf-http-resource-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-itest-example/pom.xml b/examples/karaf-itest-example/pom.xml index f231f02d69b..10c1c4e94d8 100644 --- a/examples/karaf-itest-example/pom.xml +++ b/examples/karaf-itest-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml index 4e0d2ff18aa..c9734823248 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml index 64555e640de..c9c5c8e10e4 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml index 51786a73945..27d360610ca 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml index fe3af2fb2bc..fdb9273dea1 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jaas-example/pom.xml b/examples/karaf-jaas-example/pom.xml index ac47506054f..68731e6ccd1 100644 --- a/examples/karaf-jaas-example/pom.xml +++ b/examples/karaf-jaas-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml index b81fa34d4da..aa1a2e34a93 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml index a66259c2951..37fda66427a 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml index 7fe9c6aecdf..23751e74e3f 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml index 4d4014baf94..50b75596dd1 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jdbc-example/pom.xml b/examples/karaf-jdbc-example/pom.xml index 8e650d8f261..c136c87c234 100644 --- a/examples/karaf-jdbc-example/pom.xml +++ b/examples/karaf-jdbc-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml index 83d3ba63e15..c9ac3aa0b5f 100644 --- a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml +++ b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jms-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jms-example/karaf-jms-example-features/pom.xml b/examples/karaf-jms-example/karaf-jms-example-features/pom.xml index b5c5275979e..235679ce051 100644 --- a/examples/karaf-jms-example/karaf-jms-example-features/pom.xml +++ b/examples/karaf-jms-example/karaf-jms-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jms-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jms-example/pom.xml b/examples/karaf-jms-example/pom.xml index dbf5506436c..3285340b8ff 100644 --- a/examples/karaf-jms-example/pom.xml +++ b/examples/karaf-jms-example/pom.xml @@ -25,7 +25,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml index dc7426fc9ef..37344cdf79d 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml index fc79b9d646b..a4dbb1327ea 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml index f467c70c995..ef4560c317b 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml index 9cbf639bf06..9ef9c26095d 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml index 0727581d0f8..6293d7a3edb 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml index 563e5ed1096..c830996532b 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml index 34b69bcd508..88215c37fa3 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml index 535466d28c6..c403388143b 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml index 053d73e514a..12ceef3cc38 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml index 62027150327..ea8eaf8d300 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml index 788d906fd12..1c6694efe7a 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml index fc62f5c7400..99d727ebd80 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-jpa-example/pom.xml b/examples/karaf-jpa-example/pom.xml index 73a4691e8bc..99b2d8a9ca4 100644 --- a/examples/karaf-jpa-example/pom.xml +++ b/examples/karaf-jpa-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml b/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml index b5b9e6adb12..6e6be4ae5ae 100644 --- a/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml +++ b/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-log-appender-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml b/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml index c3937795f16..b23d924351c 100644 --- a/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml +++ b/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-log-appender-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-log-appender-example/pom.xml b/examples/karaf-log-appender-example/pom.xml index ce19baf44df..323995920f0 100644 --- a/examples/karaf-log-appender-example/pom.xml +++ b/examples/karaf-log-appender-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml b/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml index 104ec7381d2..77b03924c9a 100644 --- a/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml +++ b/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-maven-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-maven-example/karaf-maven-example-run/pom.xml b/examples/karaf-maven-example/karaf-maven-example-run/pom.xml index 39702f652c6..3e0ff987189 100644 --- a/examples/karaf-maven-example/karaf-maven-example-run/pom.xml +++ b/examples/karaf-maven-example/karaf-maven-example-run/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-maven-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-maven-example/pom.xml b/examples/karaf-maven-example/pom.xml index 3c627c5e709..9713b56d55e 100644 --- a/examples/karaf-maven-example/pom.xml +++ b/examples/karaf-maven-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml index f25c560202f..5ee532eaa5c 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml index 13a558f03c2..c29e75983e3 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml index 53969d8e680..38bc377bd4b 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml index 008a0a650c8..ba508932ae3 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml index cd66e957e0f..9c80f7b7369 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml index 72f0d3e5cf2..5a90d0336d8 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-mbean-example/pom.xml b/examples/karaf-mbean-example/pom.xml index 4f3839315a9..69fb30c5bfb 100644 --- a/examples/karaf-mbean-example/pom.xml +++ b/examples/karaf-mbean-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-api/pom.xml b/examples/karaf-redis-example/karaf-redis-example-api/pom.xml index 081d3a383ee..00f66f1dcaa 100644 --- a/examples/karaf-redis-example/karaf-redis-example-api/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-command/pom.xml b/examples/karaf-redis-example/karaf-redis-example-command/pom.xml index 74bc8fdacb1..e9775b76037 100644 --- a/examples/karaf-redis-example/karaf-redis-example-command/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-features/pom.xml b/examples/karaf-redis-example/karaf-redis-example-features/pom.xml index 089518758ab..11e6362e240 100644 --- a/examples/karaf-redis-example/karaf-redis-example-features/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-service/pom.xml b/examples/karaf-redis-example/karaf-redis-example-service/pom.xml index 49d9d78719b..9f64f2a95aa 100644 --- a/examples/karaf-redis-example/karaf-redis-example-service/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-service/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-redis-example/pom.xml b/examples/karaf-redis-example/pom.xml index 19ef7f6d622..b4cc9aa5ea5 100644 --- a/examples/karaf-redis-example/pom.xml +++ b/examples/karaf-redis-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-api/pom.xml b/examples/karaf-rest-example/karaf-rest-example-api/pom.xml index e012bab7300..afb25590082 100644 --- a/examples/karaf-rest-example/karaf-rest-example-api/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml index 52cba0dda31..ff4231a25e0 100644 --- a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml index bfc8adfd073..d2b216de8e3 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml @@ -17,7 +17,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml index 204630a8569..67c7166dfa6 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml index ecfb5015b6b..128cf5ed110 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/pom.xml index 1405e3a8d28..c509e74f8dc 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-features/pom.xml b/examples/karaf-rest-example/karaf-rest-example-features/pom.xml index 68e06f59760..02fa6efe928 100644 --- a/examples/karaf-rest-example/karaf-rest-example-features/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml index f3f65f35afe..21315bfaf7e 100644 --- a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml index cd2e4fa0947..c9eaf994494 100644 --- a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-rest-example/pom.xml b/examples/karaf-rest-example/pom.xml index 0a87d092fc0..0accf23d9f0 100644 --- a/examples/karaf-rest-example/pom.xml +++ b/examples/karaf-rest-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml b/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml index b4439b955f1..2f7e47e4f01 100644 --- a/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml +++ b/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scheduler-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml b/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml index 45d20592ce3..16435e03f4a 100644 --- a/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml +++ b/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scheduler-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-scheduler-example/pom.xml b/examples/karaf-scheduler-example/pom.xml index 15a921a946b..ea4ed68be02 100644 --- a/examples/karaf-scheduler-example/pom.xml +++ b/examples/karaf-scheduler-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-api/pom.xml b/examples/karaf-scr-example/karaf-scr-example-api/pom.xml index b6cb9494f35..9fa7c2d9563 100644 --- a/examples/karaf-scr-example/karaf-scr-example-api/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-client/pom.xml b/examples/karaf-scr-example/karaf-scr-example-client/pom.xml index 3cb24dd16f0..a63bdc12a9c 100644 --- a/examples/karaf-scr-example/karaf-scr-example-client/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-features/pom.xml b/examples/karaf-scr-example/karaf-scr-example-features/pom.xml index e3a64bd4c98..5584421555f 100644 --- a/examples/karaf-scr-example/karaf-scr-example-features/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml b/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml index be292877297..548614a3e93 100644 --- a/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-scr-example/pom.xml b/examples/karaf-scr-example/pom.xml index b6fd550de71..75ca46c70c4 100644 --- a/examples/karaf-scr-example/pom.xml +++ b/examples/karaf-scr-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml index befcae8facf..e88fd142014 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml index 393298d157e..a3a53d100c0 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml index 09a9eab26f7..b28ef3ecd72 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml index 978c6844885..16432988969 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml index 4c9d64cf8cd..4be7158e604 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml index 53d8c99ea17..7ffab6c8e6c 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-servlet-example/pom.xml b/examples/karaf-servlet-example/pom.xml index 5e18ab948b8..42f6a11737e 100644 --- a/examples/karaf-servlet-example/pom.xml +++ b/examples/karaf-servlet-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-api/pom.xml b/examples/karaf-soap-example/karaf-soap-example-api/pom.xml index d5f33cd68e3..4952b539d42 100644 --- a/examples/karaf-soap-example/karaf-soap-example-api/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml index 2d40eaf0981..e79b64821c2 100644 --- a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-client/pom.xml b/examples/karaf-soap-example/karaf-soap-example-client/pom.xml index e1e70173f62..f4083fb2022 100644 --- a/examples/karaf-soap-example/karaf-soap-example-client/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-features/pom.xml b/examples/karaf-soap-example/karaf-soap-example-features/pom.xml index 00d8600c81d..3a7fe584c17 100644 --- a/examples/karaf-soap-example/karaf-soap-example-features/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml index 45d2b8134f8..95a18b35547 100644 --- a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-soap-example/pom.xml b/examples/karaf-soap-example/pom.xml index ae3fc92c250..300d74c081e 100644 --- a/examples/karaf-soap-example/pom.xml +++ b/examples/karaf-soap-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml index 31545ef8cb7..241fdc7c89a 100644 --- a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml +++ b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-url-namespace-handler-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml index 8d3154971ac..2a8f4ecdb92 100644 --- a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml +++ b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-url-namespace-handler-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/pom.xml b/examples/karaf-url-namespace-handler-example/pom.xml index 117cecac3de..384c24385aa 100644 --- a/examples/karaf-url-namespace-handler-example/pom.xml +++ b/examples/karaf-url-namespace-handler-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-war-example/karaf-war-example-features/pom.xml b/examples/karaf-war-example/karaf-war-example-features/pom.xml index 4a83fb7dd28..e6a68045f4d 100644 --- a/examples/karaf-war-example/karaf-war-example-features/pom.xml +++ b/examples/karaf-war-example/karaf-war-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-war-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-war-example/karaf-war-example-webapp/pom.xml b/examples/karaf-war-example/karaf-war-example-webapp/pom.xml index 64aade03537..4a740e02f00 100644 --- a/examples/karaf-war-example/karaf-war-example-webapp/pom.xml +++ b/examples/karaf-war-example/karaf-war-example-webapp/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-war-example - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-war-example/pom.xml b/examples/karaf-war-example/pom.xml index 187617e87b8..90391fa9e8f 100644 --- a/examples/karaf-war-example/pom.xml +++ b/examples/karaf-war-example/pom.xml @@ -25,7 +25,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/karaf-websocket-example/pom.xml b/examples/karaf-websocket-example/pom.xml index bcc2c801083..8f59c1873c2 100644 --- a/examples/karaf-websocket-example/pom.xml +++ b/examples/karaf-websocket-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index c48af8d92c9..a719924f30d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/features/command/pom.xml b/features/command/pom.xml index 02d931c59cb..7a876a05e3c 100644 --- a/features/command/pom.xml +++ b/features/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/features/core/pom.xml b/features/core/pom.xml index 1ce14ebc1cd..adf3174cc21 100644 --- a/features/core/pom.xml +++ b/features/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/features/extension/pom.xml b/features/extension/pom.xml index f2e54fd7fd7..47775d0fa71 100644 --- a/features/extension/pom.xml +++ b/features/extension/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/features/pom.xml b/features/pom.xml index dd8c58fdcc1..4225cde9f35 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/http/pom.xml b/http/pom.xml index 92fd22aa1b7..59d43de94db 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/instance/pom.xml b/instance/pom.xml index 9ab77b497ec..f7830ef418a 100644 --- a/instance/pom.xml +++ b/instance/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/itests/common/pom.xml b/itests/common/pom.xml index 26953f2b26d..93d854f3422 100644 --- a/itests/common/pom.xml +++ b/itests/common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.itests itests - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/itests/pom.xml b/itests/pom.xml index acfc477378f..8f95edb683e 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/itests/test/pom.xml b/itests/test/pom.xml index d71c0e4125c..54d705173e8 100644 --- a/itests/test/pom.xml +++ b/itests/test/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.itests itests - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jaas/blueprint/config/pom.xml b/jaas/blueprint/config/pom.xml index e183871ca7c..89bb1d1aa64 100644 --- a/jaas/blueprint/config/pom.xml +++ b/jaas/blueprint/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas.blueprint blueprint - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jaas/blueprint/jasypt/pom.xml b/jaas/blueprint/jasypt/pom.xml index fcde4ecf3eb..d00b7866c3b 100644 --- a/jaas/blueprint/jasypt/pom.xml +++ b/jaas/blueprint/jasypt/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas.blueprint blueprint - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jaas/blueprint/pom.xml b/jaas/blueprint/pom.xml index cf7a33343d8..2c0e00dc554 100644 --- a/jaas/blueprint/pom.xml +++ b/jaas/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jaas/boot/pom.xml b/jaas/boot/pom.xml index 398ec724b95..b350b5643aa 100644 --- a/jaas/boot/pom.xml +++ b/jaas/boot/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jaas/command/pom.xml b/jaas/command/pom.xml index 051dbc61061..cbedfcb7f1c 100644 --- a/jaas/command/pom.xml +++ b/jaas/command/pom.xml @@ -24,7 +24,7 @@ jaas org.apache.karaf.jaas - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jaas/config/pom.xml b/jaas/config/pom.xml index 24fcc702674..c54e32b20b2 100644 --- a/jaas/config/pom.xml +++ b/jaas/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml index 1b2410ec8e9..45735b495c5 100644 --- a/jaas/jasypt/pom.xml +++ b/jaas/jasypt/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml index 625e3795f0f..061552514f5 100644 --- a/jaas/modules/pom.xml +++ b/jaas/modules/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jaas/pom.xml b/jaas/pom.xml index e671e08c5e8..b7957310357 100644 --- a/jaas/pom.xml +++ b/jaas/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jaas/spring-security-crypto/pom.xml b/jaas/spring-security-crypto/pom.xml index 27b18c79fe6..159e16c796c 100644 --- a/jaas/spring-security-crypto/pom.xml +++ b/jaas/spring-security-crypto/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 3020c3cb0fd..3ccf5d64da5 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jms/pom.xml b/jms/pom.xml index 875f3ea97ff..a4d84c8e05d 100644 --- a/jms/pom.xml +++ b/jms/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/jndi/pom.xml b/jndi/pom.xml index bea0735b4a3..971356bbbe6 100644 --- a/jndi/pom.xml +++ b/jndi/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/kar/pom.xml b/kar/pom.xml index b8879ee1b32..bfb95bd92db 100644 --- a/kar/pom.xml +++ b/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/log/pom.xml b/log/pom.xml index 85e0ed80cb5..49fe6a1c904 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/main/pom.xml b/main/pom.xml index 83937d8c61e..c1632e87911 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/management/pom.xml b/management/pom.xml index 13c5b06b7d4..0b4c35cc477 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/management/server/pom.xml b/management/server/pom.xml index 615956fc88e..ba305b44217 100644 --- a/management/server/pom.xml +++ b/management/server/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.management management - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/manual/pom.xml b/manual/pom.xml index 09625558467..759271846b1 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -17,7 +17,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/maven/core/pom.xml b/maven/core/pom.xml index cae5d13a8d9..a60d38f3124 100644 --- a/maven/core/pom.xml +++ b/maven/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../../pom.xml diff --git a/maven/pom.xml b/maven/pom.xml index c8ab8b883b7..0b34b858c71 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/obr/pom.xml b/obr/pom.xml index d772172e89d..3271888206d 100644 --- a/obr/pom.xml +++ b/obr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/package/pom.xml b/package/pom.xml index 8804fab6e63..f3177f229e6 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/pom.xml b/pom.xml index d87d57f5a40..7f0ec595a17 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.karaf karaf pom - 4.4.5-SNAPSHOT + 4.4.5 Apache Karaf 2007 @@ -84,7 +84,7 @@ ${scm.connection} ${scm.developerConnection} ${scm.url} - HEAD + karaf-4.4.5 @@ -150,7 +150,7 @@ - 1 + 1704471561 scm:git:https://gitbox.apache.org/repos/asf/karaf.git scm:git:https://gitbox.apache.org/repos/asf/karaf.git diff --git a/profile/pom.xml b/profile/pom.xml index fd2f15cc3ab..97157b0c4e0 100644 --- a/profile/pom.xml +++ b/profile/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/scheduler/pom.xml b/scheduler/pom.xml index 2a2038d4041..7bf40770fe7 100644 --- a/scheduler/pom.xml +++ b/scheduler/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/scr/management/pom.xml b/scr/management/pom.xml index 3f7031e4e0b..7ec8f9ca0c7 100644 --- a/scr/management/pom.xml +++ b/scr/management/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.scr scr - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/scr/pom.xml b/scr/pom.xml index 685adfbf7d7..c00a0e2ca04 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/scr/state/pom.xml b/scr/state/pom.xml index 25e33a985ba..e89e4f1c42c 100644 --- a/scr/state/pom.xml +++ b/scr/state/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.scr scr - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/service/core/pom.xml b/service/core/pom.xml index eb66b4ea536..bb3f753cc95 100644 --- a/service/core/pom.xml +++ b/service/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.service service - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/service/guard/pom.xml b/service/guard/pom.xml index d24303d7225..a28d84e5a56 100644 --- a/service/guard/pom.xml +++ b/service/guard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.service service - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/service/pom.xml b/service/pom.xml index 05934cd29c1..4a6bb216dec 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/services/coordinator/pom.xml b/services/coordinator/pom.xml index 630558f5250..ecdafd1cc57 100644 --- a/services/coordinator/pom.xml +++ b/services/coordinator/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.5-SNAPSHOT + 4.4.5 ../../pom.xml diff --git a/services/eventadmin/pom.xml b/services/eventadmin/pom.xml index 264550a98df..aca56a3d0a9 100644 --- a/services/eventadmin/pom.xml +++ b/services/eventadmin/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.5-SNAPSHOT + 4.4.5 ../../pom.xml diff --git a/services/interceptor/api/pom.xml b/services/interceptor/api/pom.xml index f0add48f170..18b6273db4e 100644 --- a/services/interceptor/api/pom.xml +++ b/services/interceptor/api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services org.apache.karaf.services.interceptor - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/services/interceptor/impl/pom.xml b/services/interceptor/impl/pom.xml index 7335186d3da..63c3eb96c2b 100644 --- a/services/interceptor/impl/pom.xml +++ b/services/interceptor/impl/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services org.apache.karaf.services.interceptor - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/services/interceptor/pom.xml b/services/interceptor/pom.xml index cb1661cf216..eedafa1c3e4 100644 --- a/services/interceptor/pom.xml +++ b/services/interceptor/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services services - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/services/pom.xml b/services/pom.xml index a1e3454bf99..a441b3875e0 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/services/staticcm/pom.xml b/services/staticcm/pom.xml index 094b7344869..55bab75a125 100644 --- a/services/staticcm/pom.xml +++ b/services/staticcm/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.5-SNAPSHOT + 4.4.5 ../../pom.xml diff --git a/shell/commands/pom.xml b/shell/commands/pom.xml index 6de55a9c845..a1d867aecae 100644 --- a/shell/commands/pom.xml +++ b/shell/commands/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/shell/console/pom.xml b/shell/console/pom.xml index 63db1f08f2d..93000b9c811 100644 --- a/shell/console/pom.xml +++ b/shell/console/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/shell/core/pom.xml b/shell/core/pom.xml index b89b4e2074d..9729a4cd372 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/shell/groovy/pom.xml b/shell/groovy/pom.xml index 192ad37df9e..337e3d3294d 100644 --- a/shell/groovy/pom.xml +++ b/shell/groovy/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/shell/pom.xml b/shell/pom.xml index 44a576d025c..59b61a487fd 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index dbd147ddc45..bb08b9f4504 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/shell/table/pom.xml b/shell/table/pom.xml index 91e47e61a84..bf49c96ffa8 100644 --- a/shell/table/pom.xml +++ b/shell/table/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/specs/activator/pom.xml b/specs/activator/pom.xml index 5a546dac7af..f4b61160234 100644 --- a/specs/activator/pom.xml +++ b/specs/activator/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.5-SNAPSHOT + 4.4.5 org.apache.karaf.specs.activator diff --git a/specs/java.xml.ws/pom.xml b/specs/java.xml.ws/pom.xml index c15efd95269..38d4146038d 100644 --- a/specs/java.xml.ws/pom.xml +++ b/specs/java.xml.ws/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.5-SNAPSHOT + 4.4.5 org.apache.karaf.specs.java.xml.ws diff --git a/specs/java.xml/pom.xml b/specs/java.xml/pom.xml index 2b7a506df4b..5689002ad14 100644 --- a/specs/java.xml/pom.xml +++ b/specs/java.xml/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.5-SNAPSHOT + 4.4.5 org.apache.karaf.specs.java.xml diff --git a/specs/locator/pom.xml b/specs/locator/pom.xml index fd5f9ade915..3d8ad45ef3d 100644 --- a/specs/locator/pom.xml +++ b/specs/locator/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.5-SNAPSHOT + 4.4.5 org.apache.karaf.specs.locator diff --git a/specs/pom.xml b/specs/pom.xml index ae3f4f6d2ee..bba53622106 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/subsystem/pom.xml b/subsystem/pom.xml index ba2797b233f..d650afbc95a 100644 --- a/subsystem/pom.xml +++ b/subsystem/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 org.apache.karaf.subsystem diff --git a/system/pom.xml b/system/pom.xml index ed8963ef6b3..8bccab53bca 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index b6017243ce2..9b1e0d64784 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/tooling/karaf-services-maven-plugin/pom.xml b/tooling/karaf-services-maven-plugin/pom.xml index 9c850c55427..5fb5925e987 100644 --- a/tooling/karaf-services-maven-plugin/pom.xml +++ b/tooling/karaf-services-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/tooling/pom.xml b/tooling/pom.xml index 96d717b4abd..a3fdc0069f1 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/tooling/utils/pom.xml b/tooling/utils/pom.xml index 2aa49ac40d6..25f9997e49b 100644 --- a/tooling/utils/pom.xml +++ b/tooling/utils/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.5-SNAPSHOT + 4.4.5 org.apache.karaf.tools.utils diff --git a/util/pom.xml b/util/pom.xml index e96b8554986..616062d6b16 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/web/pom.xml b/web/pom.xml index f9f83c617af..eac3ba9ca02 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml index 05b4e669030..e7fb320a64d 100644 --- a/webconsole/console/pom.xml +++ b/webconsole/console/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml index 41d5fcb6bab..a09385f6e50 100644 --- a/webconsole/features/pom.xml +++ b/webconsole/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/webconsole/gogo/pom.xml b/webconsole/gogo/pom.xml index 8b75ffad227..0fd010ba079 100644 --- a/webconsole/gogo/pom.xml +++ b/webconsole/gogo/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/webconsole/http/pom.xml b/webconsole/http/pom.xml index 18c0a593b80..cd327fbaf8a 100644 --- a/webconsole/http/pom.xml +++ b/webconsole/http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/webconsole/instance/pom.xml b/webconsole/instance/pom.xml index fd997910498..59e13267d25 100644 --- a/webconsole/instance/pom.xml +++ b/webconsole/instance/pom.xml @@ -19,7 +19,7 @@ org.apache.karaf.webconsole webconsole - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/webconsole/pom.xml b/webconsole/pom.xml index 6a1e4b13899..b0e63e88e62 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml diff --git a/wrapper/pom.xml b/wrapper/pom.xml index 46d1ccb1fc8..deaf0c95da7 100644 --- a/wrapper/pom.xml +++ b/wrapper/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5-SNAPSHOT + 4.4.5 ../pom.xml From d5c1a61573955d84b79f52c2778e7598345825dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Fri, 5 Jan 2024 19:21:12 +0100 Subject: [PATCH 032/440] [maven-release-plugin] prepare for next development iteration --- archetypes/assembly/pom.xml | 2 +- archetypes/blueprint/pom.xml | 2 +- archetypes/bundle/pom.xml | 2 +- archetypes/command/pom.xml | 2 +- archetypes/feature/pom.xml | 2 +- archetypes/kar/pom.xml | 2 +- archetypes/pom.xml | 2 +- assemblies/apache-karaf-minimal/pom.xml | 2 +- assemblies/apache-karaf/pom.xml | 2 +- assemblies/features/base/pom.xml | 2 +- assemblies/features/enterprise/pom.xml | 2 +- assemblies/features/framework/pom.xml | 2 +- assemblies/features/pom.xml | 2 +- assemblies/features/specs/pom.xml | 2 +- assemblies/features/spring-legacy/pom.xml | 2 +- assemblies/features/spring/pom.xml | 2 +- assemblies/features/standard/pom.xml | 2 +- assemblies/features/static/pom.xml | 2 +- assemblies/pom.xml | 2 +- audit/pom.xml | 2 +- bom/pom.xml | 2 +- bundle/blueprintstate/pom.xml | 2 +- bundle/core/pom.xml | 2 +- bundle/pom.xml | 2 +- bundle/springstate/pom.xml | 2 +- client/pom.xml | 2 +- config/command/pom.xml | 2 +- config/core/pom.xml | 2 +- config/pom.xml | 2 +- deployer/blueprint/pom.xml | 2 +- deployer/features/pom.xml | 2 +- deployer/kar/pom.xml | 2 +- deployer/pom.xml | 2 +- deployer/spring/pom.xml | 2 +- deployer/wrap/pom.xml | 2 +- diagnostic/boot/pom.xml | 2 +- diagnostic/core/pom.xml | 2 +- diagnostic/pom.xml | 2 +- docker/pom.xml | 2 +- event/pom.xml | 2 +- .../karaf-blueprint-example-client/pom.xml | 2 +- .../karaf-blueprint-example-common/pom.xml | 2 +- .../karaf-blueprint-example-features/pom.xml | 2 +- .../karaf-blueprint-example-provider/pom.xml | 2 +- examples/karaf-blueprint-example/pom.xml | 2 +- examples/karaf-branding-example/pom.xml | 2 +- .../karaf-bundle-example/karaf-bundle-example-client/pom.xml | 2 +- .../karaf-bundle-example/karaf-bundle-example-common/pom.xml | 2 +- .../karaf-bundle-example-features/pom.xml | 2 +- .../karaf-bundle-example-provider/pom.xml | 2 +- examples/karaf-bundle-example/pom.xml | 2 +- .../karaf-camel-example/karaf-camel-example-blueprint/pom.xml | 2 +- .../karaf-camel-example/karaf-camel-example-features/pom.xml | 2 +- examples/karaf-camel-example/karaf-camel-example-java/pom.xml | 2 +- examples/karaf-camel-example/pom.xml | 2 +- examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml | 2 +- examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml | 2 +- examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml | 2 +- examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml | 2 +- examples/karaf-cdi-example/pom.xml | 2 +- .../karaf-command-example/karaf-command-example-api/pom.xml | 2 +- .../karaf-command-example-command/pom.xml | 2 +- .../karaf-command-example-features/pom.xml | 2 +- .../karaf-command-example-provider/pom.xml | 2 +- examples/karaf-command-example/pom.xml | 2 +- .../karaf-config-example-blueprint/pom.xml | 2 +- .../karaf-config-example-features/pom.xml | 2 +- .../karaf-config-example-listener/pom.xml | 2 +- .../karaf-config-example-managed-factory/pom.xml | 2 +- .../karaf-config-example/karaf-config-example-managed/pom.xml | 2 +- .../karaf-config-example/karaf-config-example-scr/pom.xml | 2 +- .../karaf-config-example/karaf-config-example-static/pom.xml | 2 +- examples/karaf-config-example/pom.xml | 2 +- examples/karaf-deployer-example/pom.xml | 2 +- .../karaf-docker-example/karaf-docker-example-app/pom.xml | 2 +- .../karaf-docker-example-dynamic-dist/pom.xml | 2 +- .../karaf-docker-example-static-dist/pom.xml | 2 +- examples/karaf-docker-example/pom.xml | 2 +- examples/karaf-dump-example/pom.xml | 2 +- .../karaf-graphql-example/karaf-graphql-example-api/pom.xml | 2 +- .../karaf-graphql-example-commands/pom.xml | 2 +- .../karaf-graphql-example/karaf-graphql-example-core/pom.xml | 2 +- .../karaf-graphql-example-features/pom.xml | 2 +- .../karaf-graphql-example-scr-servlet/pom.xml | 2 +- .../karaf-graphql-example-websocket/pom.xml | 2 +- examples/karaf-graphql-example/pom.xml | 2 +- .../karaf-http-resource-example-features/pom.xml | 2 +- .../karaf-http-resource-example-whiteboard/pom.xml | 2 +- examples/karaf-http-resource-example/pom.xml | 2 +- examples/karaf-itest-example/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml | 2 +- .../karaf-jaas-example/karaf-jaas-example-features/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml | 2 +- examples/karaf-jaas-example/pom.xml | 2 +- examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-command/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-features/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml | 2 +- examples/karaf-jdbc-example/pom.xml | 2 +- examples/karaf-jms-example/karaf-jms-example-command/pom.xml | 2 +- examples/karaf-jms-example/karaf-jms-example-features/pom.xml | 2 +- examples/karaf-jms-example/pom.xml | 2 +- examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml | 2 +- examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml | 2 +- .../karaf-jpa-example-provider-api/pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint-eclipselink/pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint-hibernate/pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint-openjpa/pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-eclipselink/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-hibernate/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-openjpa/pom.xml | 2 +- .../karaf-jpa-example-provider-ds/pom.xml | 2 +- examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml | 2 +- examples/karaf-jpa-example/pom.xml | 2 +- .../karaf-log-appender-example-core/pom.xml | 2 +- .../karaf-log-appender-example-features/pom.xml | 2 +- examples/karaf-log-appender-example/pom.xml | 2 +- .../karaf-maven-example-run-bundle/pom.xml | 2 +- examples/karaf-maven-example/karaf-maven-example-run/pom.xml | 2 +- examples/karaf-maven-example/pom.xml | 2 +- examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-features/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-provider/pom.xml | 2 +- examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-simple/pom.xml | 2 +- examples/karaf-mbean-example/pom.xml | 2 +- examples/karaf-redis-example/karaf-redis-example-api/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-command/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-features/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-service/pom.xml | 2 +- examples/karaf-redis-example/pom.xml | 2 +- examples/karaf-rest-example/karaf-rest-example-api/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-blueprint/pom.xml | 2 +- .../karaf-rest-example-client-cxf/pom.xml | 2 +- .../karaf-rest-example-client-http/pom.xml | 2 +- .../karaf-rest-example-client-jersey/pom.xml | 2 +- examples/karaf-rest-example/karaf-rest-example-client/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-features/pom.xml | 2 +- examples/karaf-rest-example/karaf-rest-example-scr/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-whiteboard/pom.xml | 2 +- examples/karaf-rest-example/pom.xml | 2 +- .../karaf-scheduler-example-features/pom.xml | 2 +- .../karaf-scheduler-example-runnable/pom.xml | 2 +- examples/karaf-scheduler-example/pom.xml | 2 +- examples/karaf-scr-example/karaf-scr-example-api/pom.xml | 2 +- examples/karaf-scr-example/karaf-scr-example-client/pom.xml | 2 +- examples/karaf-scr-example/karaf-scr-example-features/pom.xml | 2 +- examples/karaf-scr-example/karaf-scr-example-provider/pom.xml | 2 +- examples/karaf-scr-example/pom.xml | 2 +- .../karaf-servlet-example-annotation/pom.xml | 2 +- .../karaf-servlet-example-blueprint/pom.xml | 2 +- .../karaf-servlet-example-features/pom.xml | 2 +- .../karaf-servlet-example-registration/pom.xml | 2 +- .../karaf-servlet-example/karaf-servlet-example-scr/pom.xml | 2 +- .../karaf-servlet-example-upload/pom.xml | 2 +- examples/karaf-servlet-example/pom.xml | 2 +- examples/karaf-soap-example/karaf-soap-example-api/pom.xml | 2 +- .../karaf-soap-example/karaf-soap-example-blueprint/pom.xml | 2 +- examples/karaf-soap-example/karaf-soap-example-client/pom.xml | 2 +- .../karaf-soap-example/karaf-soap-example-features/pom.xml | 2 +- examples/karaf-soap-example/karaf-soap-example-scr/pom.xml | 2 +- examples/karaf-soap-example/pom.xml | 2 +- .../karaf-url-namespace-handler-example-core/pom.xml | 2 +- .../karaf-url-namespace-handler-example-features/pom.xml | 2 +- examples/karaf-url-namespace-handler-example/pom.xml | 2 +- examples/karaf-war-example/karaf-war-example-features/pom.xml | 2 +- examples/karaf-war-example/karaf-war-example-webapp/pom.xml | 2 +- examples/karaf-war-example/pom.xml | 2 +- examples/karaf-websocket-example/pom.xml | 2 +- examples/pom.xml | 2 +- features/command/pom.xml | 2 +- features/core/pom.xml | 2 +- features/extension/pom.xml | 2 +- features/pom.xml | 2 +- http/pom.xml | 2 +- instance/pom.xml | 2 +- itests/common/pom.xml | 2 +- itests/pom.xml | 2 +- itests/test/pom.xml | 2 +- jaas/blueprint/config/pom.xml | 2 +- jaas/blueprint/jasypt/pom.xml | 2 +- jaas/blueprint/pom.xml | 2 +- jaas/boot/pom.xml | 2 +- jaas/command/pom.xml | 2 +- jaas/config/pom.xml | 2 +- jaas/jasypt/pom.xml | 2 +- jaas/modules/pom.xml | 2 +- jaas/pom.xml | 2 +- jaas/spring-security-crypto/pom.xml | 2 +- jdbc/pom.xml | 2 +- jms/pom.xml | 2 +- jndi/pom.xml | 2 +- kar/pom.xml | 2 +- log/pom.xml | 2 +- main/pom.xml | 2 +- management/pom.xml | 2 +- management/server/pom.xml | 2 +- manual/pom.xml | 2 +- maven/core/pom.xml | 2 +- maven/pom.xml | 2 +- obr/pom.xml | 2 +- package/pom.xml | 2 +- pom.xml | 4 ++-- profile/pom.xml | 2 +- scheduler/pom.xml | 2 +- scr/management/pom.xml | 2 +- scr/pom.xml | 2 +- scr/state/pom.xml | 2 +- service/core/pom.xml | 2 +- service/guard/pom.xml | 2 +- service/pom.xml | 2 +- services/coordinator/pom.xml | 2 +- services/eventadmin/pom.xml | 2 +- services/interceptor/api/pom.xml | 2 +- services/interceptor/impl/pom.xml | 2 +- services/interceptor/pom.xml | 2 +- services/pom.xml | 2 +- services/staticcm/pom.xml | 2 +- shell/commands/pom.xml | 2 +- shell/console/pom.xml | 2 +- shell/core/pom.xml | 2 +- shell/groovy/pom.xml | 2 +- shell/pom.xml | 2 +- shell/ssh/pom.xml | 2 +- shell/table/pom.xml | 2 +- specs/activator/pom.xml | 2 +- specs/java.xml.ws/pom.xml | 2 +- specs/java.xml/pom.xml | 2 +- specs/locator/pom.xml | 2 +- specs/pom.xml | 2 +- subsystem/pom.xml | 2 +- system/pom.xml | 2 +- tooling/karaf-maven-plugin/pom.xml | 2 +- tooling/karaf-services-maven-plugin/pom.xml | 2 +- tooling/pom.xml | 2 +- tooling/utils/pom.xml | 2 +- util/pom.xml | 2 +- web/pom.xml | 2 +- webconsole/console/pom.xml | 2 +- webconsole/features/pom.xml | 2 +- webconsole/gogo/pom.xml | 2 +- webconsole/http/pom.xml | 2 +- webconsole/instance/pom.xml | 2 +- webconsole/pom.xml | 2 +- wrapper/pom.xml | 2 +- 248 files changed, 249 insertions(+), 249 deletions(-) diff --git a/archetypes/assembly/pom.xml b/archetypes/assembly/pom.xml index d63f5859873..df38f5a8a0a 100644 --- a/archetypes/assembly/pom.xml +++ b/archetypes/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5 + 4.4.6-SNAPSHOT org.apache.karaf.archetypes diff --git a/archetypes/blueprint/pom.xml b/archetypes/blueprint/pom.xml index 82c834724b7..cf2dc4eab74 100644 --- a/archetypes/blueprint/pom.xml +++ b/archetypes/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/archetypes/bundle/pom.xml b/archetypes/bundle/pom.xml index 5c73b17ff8a..545721b7a7e 100644 --- a/archetypes/bundle/pom.xml +++ b/archetypes/bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/archetypes/command/pom.xml b/archetypes/command/pom.xml index e39f4c9c192..97514efe03d 100644 --- a/archetypes/command/pom.xml +++ b/archetypes/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/archetypes/feature/pom.xml b/archetypes/feature/pom.xml index b1f03a9a090..2f1fc6a1b2c 100644 --- a/archetypes/feature/pom.xml +++ b/archetypes/feature/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/archetypes/kar/pom.xml b/archetypes/kar/pom.xml index 0f06536dc9b..7fe4a1e9de3 100644 --- a/archetypes/kar/pom.xml +++ b/archetypes/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 85bd7a6ea9d..cf4ef3c2b3f 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml index 50b2f15c737..79cb5cb3f50 100644 --- a/assemblies/apache-karaf-minimal/pom.xml +++ b/assemblies/apache-karaf-minimal/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index 0afd161ee90..605acd7cc00 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml index 4799b0f6e3e..4447da5691a 100644 --- a/assemblies/features/base/pom.xml +++ b/assemblies/features/base/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml index d0ce7dfbb14..35b75566867 100644 --- a/assemblies/features/enterprise/pom.xml +++ b/assemblies/features/enterprise/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml index 2a6086ddb24..866a7e8ac76 100644 --- a/assemblies/features/framework/pom.xml +++ b/assemblies/features/framework/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/features/pom.xml b/assemblies/features/pom.xml index 4c6ee25a34a..a8216fdeb10 100644 --- a/assemblies/features/pom.xml +++ b/assemblies/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/features/specs/pom.xml b/assemblies/features/specs/pom.xml index 0733c2ff366..ca998828471 100644 --- a/assemblies/features/specs/pom.xml +++ b/assemblies/features/specs/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/features/spring-legacy/pom.xml b/assemblies/features/spring-legacy/pom.xml index 4ff57335005..4c50544e167 100644 --- a/assemblies/features/spring-legacy/pom.xml +++ b/assemblies/features/spring-legacy/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml index 70d4e1992dd..b62e41829b2 100644 --- a/assemblies/features/spring/pom.xml +++ b/assemblies/features/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index 7cd92c645a0..7048992604d 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/features/static/pom.xml b/assemblies/features/static/pom.xml index f4add6fd26a..1d6852b25e2 100644 --- a/assemblies/features/static/pom.xml +++ b/assemblies/features/static/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/assemblies/pom.xml b/assemblies/pom.xml index d848004aba2..b553dec2feb 100644 --- a/assemblies/pom.xml +++ b/assemblies/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/audit/pom.xml b/audit/pom.xml index 1eaf3ea0f3d..471c76a6102 100644 --- a/audit/pom.xml +++ b/audit/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index 129adc01f82..248a2084727 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/bundle/blueprintstate/pom.xml b/bundle/blueprintstate/pom.xml index 43a13aa306a..b1ba8ffa91f 100644 --- a/bundle/blueprintstate/pom.xml +++ b/bundle/blueprintstate/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml index f45c2ff4791..5c8c3658dcc 100644 --- a/bundle/core/pom.xml +++ b/bundle/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/bundle/pom.xml b/bundle/pom.xml index ae5398356ea..907c27cd6a7 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/bundle/springstate/pom.xml b/bundle/springstate/pom.xml index a720bec1019..abd9005383a 100644 --- a/bundle/springstate/pom.xml +++ b/bundle/springstate/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index 746f2bf9a1d..082a349c559 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/config/command/pom.xml b/config/command/pom.xml index df550ecd89b..6f9c27d31cf 100644 --- a/config/command/pom.xml +++ b/config/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.config config - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/config/core/pom.xml b/config/core/pom.xml index 0b97de1cd1f..a561ccb5f33 100644 --- a/config/core/pom.xml +++ b/config/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.config config - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/config/pom.xml b/config/pom.xml index 4b8bcdbd25a..41f43f8d264 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml index e28db3abc64..3efca38faa6 100644 --- a/deployer/blueprint/pom.xml +++ b/deployer/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml index 149d4d50cf9..71ef4f68907 100644 --- a/deployer/features/pom.xml +++ b/deployer/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/deployer/kar/pom.xml b/deployer/kar/pom.xml index 3174f86ee74..f2d22ab0509 100644 --- a/deployer/kar/pom.xml +++ b/deployer/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/deployer/pom.xml b/deployer/pom.xml index 94e8a3c761b..9b21dbfd580 100644 --- a/deployer/pom.xml +++ b/deployer/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/deployer/spring/pom.xml b/deployer/spring/pom.xml index ac763f87a42..f09930cca0b 100644 --- a/deployer/spring/pom.xml +++ b/deployer/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/deployer/wrap/pom.xml b/deployer/wrap/pom.xml index c413e815c0e..7b25c1525bb 100644 --- a/deployer/wrap/pom.xml +++ b/deployer/wrap/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/diagnostic/boot/pom.xml b/diagnostic/boot/pom.xml index 691202f5869..95cfd8db377 100644 --- a/diagnostic/boot/pom.xml +++ b/diagnostic/boot/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.diagnostic diagnostic - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml index 2a21ac7c679..8a26a699535 100644 --- a/diagnostic/core/pom.xml +++ b/diagnostic/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.diagnostic diagnostic - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/diagnostic/pom.xml b/diagnostic/pom.xml index ee86fc9887a..44dfc6e94dc 100644 --- a/diagnostic/pom.xml +++ b/diagnostic/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/docker/pom.xml b/docker/pom.xml index de116a860dc..6a77c7d6534 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/event/pom.xml b/event/pom.xml index d45d37d8f27..6b9c0830758 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml index 38d5c6b497c..9841191ccc0 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml index e9b9a97c86c..5242de39e86 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml index cc06a1c6ffa..f5c143bfecf 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml index ee09b8b6029..d7ff4ee30b8 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-blueprint-example/pom.xml b/examples/karaf-blueprint-example/pom.xml index 45c748efeb5..465728efed9 100644 --- a/examples/karaf-blueprint-example/pom.xml +++ b/examples/karaf-blueprint-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-branding-example/pom.xml b/examples/karaf-branding-example/pom.xml index 307b82df182..b01eef3fa41 100644 --- a/examples/karaf-branding-example/pom.xml +++ b/examples/karaf-branding-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml index ebe589b514d..b930049078f 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml index 9130401b6b5..5a40477371a 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml index 0362d7829cb..1c401728e72 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml index 8d254cdbd91..5f3db81bf47 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-bundle-example/pom.xml b/examples/karaf-bundle-example/pom.xml index 7768153f20c..7ef35d29fce 100644 --- a/examples/karaf-bundle-example/pom.xml +++ b/examples/karaf-bundle-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml b/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml index 2f66a36b5dc..d77dcf79d5f 100644 --- a/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-features/pom.xml b/examples/karaf-camel-example/karaf-camel-example-features/pom.xml index 26409e9b061..3d47c23c72a 100644 --- a/examples/karaf-camel-example/karaf-camel-example-features/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml index 848606e5ceb..a44c007e367 100644 --- a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-camel-example/pom.xml b/examples/karaf-camel-example/pom.xml index c96efe7754f..933b1811b0a 100644 --- a/examples/karaf-camel-example/pom.xml +++ b/examples/karaf-camel-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml index 6c0d72413d5..a2e50c7043f 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml index ab25fbed20f..d8cc9496eec 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml index dd96db0d3ea..bb073f5ab62 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml index 35ae602cf5b..9c9505b15cb 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-cdi-example/pom.xml b/examples/karaf-cdi-example/pom.xml index 8e318bc0da9..38c3909374d 100644 --- a/examples/karaf-cdi-example/pom.xml +++ b/examples/karaf-cdi-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-api/pom.xml b/examples/karaf-command-example/karaf-command-example-api/pom.xml index cc88ddebd8d..d69ce2d97e0 100644 --- a/examples/karaf-command-example/karaf-command-example-api/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-command/pom.xml b/examples/karaf-command-example/karaf-command-example-command/pom.xml index 1620258c5bc..24c95d72196 100644 --- a/examples/karaf-command-example/karaf-command-example-command/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-features/pom.xml b/examples/karaf-command-example/karaf-command-example-features/pom.xml index 1813d2a452d..8f4e10739ab 100644 --- a/examples/karaf-command-example/karaf-command-example-features/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-provider/pom.xml b/examples/karaf-command-example/karaf-command-example-provider/pom.xml index 1596665b02c..846d17846bf 100644 --- a/examples/karaf-command-example/karaf-command-example-provider/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-command-example/pom.xml b/examples/karaf-command-example/pom.xml index 5752ac3bbc0..9432c2776fd 100644 --- a/examples/karaf-command-example/pom.xml +++ b/examples/karaf-command-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml b/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml index dd5be716bf9..a2a47ecd451 100644 --- a/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-features/pom.xml b/examples/karaf-config-example/karaf-config-example-features/pom.xml index 34249dc4923..221943ec4cc 100644 --- a/examples/karaf-config-example/karaf-config-example-features/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-listener/pom.xml b/examples/karaf-config-example/karaf-config-example-listener/pom.xml index 2fd9ee4a378..6eab5034d13 100644 --- a/examples/karaf-config-example/karaf-config-example-listener/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-listener/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml b/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml index bca76233414..189d6ed35a0 100644 --- a/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-managed/pom.xml b/examples/karaf-config-example/karaf-config-example-managed/pom.xml index 945da844c2f..e5b13e7ae66 100644 --- a/examples/karaf-config-example/karaf-config-example-managed/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-managed/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-scr/pom.xml b/examples/karaf-config-example/karaf-config-example-scr/pom.xml index 15c66b3a31a..c9f10a253a7 100644 --- a/examples/karaf-config-example/karaf-config-example-scr/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-static/pom.xml b/examples/karaf-config-example/karaf-config-example-static/pom.xml index 3eaa184f42c..c4fe7d2dc64 100644 --- a/examples/karaf-config-example/karaf-config-example-static/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-static/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/pom.xml b/examples/karaf-config-example/pom.xml index bba367f58a7..1b43dd301c5 100644 --- a/examples/karaf-config-example/pom.xml +++ b/examples/karaf-config-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-deployer-example/pom.xml b/examples/karaf-deployer-example/pom.xml index 6ef9cd183b3..17d4f283558 100644 --- a/examples/karaf-deployer-example/pom.xml +++ b/examples/karaf-deployer-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml index a85fd5e3eea..1afa15c2cf0 100644 --- a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml index cf866b795c2..c7c2aa8931b 100644 --- a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml index c2fc8a72aab..b4bf87aa81b 100644 --- a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-docker-example/pom.xml b/examples/karaf-docker-example/pom.xml index cf98fcda428..d38be7a382c 100644 --- a/examples/karaf-docker-example/pom.xml +++ b/examples/karaf-docker-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-dump-example/pom.xml b/examples/karaf-dump-example/pom.xml index f0079cb23c6..e6c47b586f9 100644 --- a/examples/karaf-dump-example/pom.xml +++ b/examples/karaf-dump-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml index 6783ef089f6..5c00d6d81f2 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-graphql-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml index 9642d99e6a3..ed994009937 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-graphql-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml index 7266578adde..98e4b9e500c 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml index 82182a9ce8c..b6ad7ee33d8 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml index 5513b576546..faf160ecf5c 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml index 69af12f2cad..2e44de7efc0 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/pom.xml b/examples/karaf-graphql-example/pom.xml index ac0e23a21f5..da36c6a3644 100644 --- a/examples/karaf-graphql-example/pom.xml +++ b/examples/karaf-graphql-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml b/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml index 02d99b67ebe..7b1fa0794f8 100644 --- a/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml +++ b/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-http-resource-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml b/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml index a4e34033310..71a29c10da0 100644 --- a/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml +++ b/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-http-resource-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-http-resource-example/pom.xml b/examples/karaf-http-resource-example/pom.xml index 49d4ff7aab3..a4e41174991 100644 --- a/examples/karaf-http-resource-example/pom.xml +++ b/examples/karaf-http-resource-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-itest-example/pom.xml b/examples/karaf-itest-example/pom.xml index 10c1c4e94d8..aef6001a4af 100644 --- a/examples/karaf-itest-example/pom.xml +++ b/examples/karaf-itest-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml index c9734823248..bb2d2ec3316 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml index c9c5c8e10e4..39a421569ef 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml index 27d360610ca..36ad4dd5200 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml index fdb9273dea1..84411a60b88 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jaas-example/pom.xml b/examples/karaf-jaas-example/pom.xml index 68731e6ccd1..6242582a475 100644 --- a/examples/karaf-jaas-example/pom.xml +++ b/examples/karaf-jaas-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml index aa1a2e34a93..852cc71cbe9 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml index 37fda66427a..f617889f5f3 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml index 23751e74e3f..4f50149b72e 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml index 50b75596dd1..e4e8031ae2c 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jdbc-example/pom.xml b/examples/karaf-jdbc-example/pom.xml index c136c87c234..54079fb8114 100644 --- a/examples/karaf-jdbc-example/pom.xml +++ b/examples/karaf-jdbc-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml index c9ac3aa0b5f..81382618cda 100644 --- a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml +++ b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jms-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jms-example/karaf-jms-example-features/pom.xml b/examples/karaf-jms-example/karaf-jms-example-features/pom.xml index 235679ce051..016637a0716 100644 --- a/examples/karaf-jms-example/karaf-jms-example-features/pom.xml +++ b/examples/karaf-jms-example/karaf-jms-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jms-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jms-example/pom.xml b/examples/karaf-jms-example/pom.xml index 3285340b8ff..99e94b0b1ad 100644 --- a/examples/karaf-jms-example/pom.xml +++ b/examples/karaf-jms-example/pom.xml @@ -25,7 +25,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml index 37344cdf79d..68c13e01c1c 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml index a4dbb1327ea..8bbd800a633 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml index ef4560c317b..358b9d555e7 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml index 9ef9c26095d..c698df799f4 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml index 6293d7a3edb..7f6b217d06e 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml index c830996532b..3ed4ec16ee4 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml index 88215c37fa3..b1e48afe4d6 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml index c403388143b..fa33eee98ab 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml index 12ceef3cc38..6c14b0ae3c2 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml index ea8eaf8d300..7ec634af7e1 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml index 1c6694efe7a..e78d89f4018 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml index 99d727ebd80..3cc03fa43b0 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/pom.xml b/examples/karaf-jpa-example/pom.xml index 99b2d8a9ca4..bb0f12ade71 100644 --- a/examples/karaf-jpa-example/pom.xml +++ b/examples/karaf-jpa-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml b/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml index 6e6be4ae5ae..0a3273a9445 100644 --- a/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml +++ b/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-log-appender-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml b/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml index b23d924351c..1d1ecc1e053 100644 --- a/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml +++ b/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-log-appender-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-log-appender-example/pom.xml b/examples/karaf-log-appender-example/pom.xml index 323995920f0..e58a6d4e2a5 100644 --- a/examples/karaf-log-appender-example/pom.xml +++ b/examples/karaf-log-appender-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml b/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml index 77b03924c9a..4e5c7f1a9d4 100644 --- a/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml +++ b/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-maven-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-maven-example/karaf-maven-example-run/pom.xml b/examples/karaf-maven-example/karaf-maven-example-run/pom.xml index 3e0ff987189..550e6910855 100644 --- a/examples/karaf-maven-example/karaf-maven-example-run/pom.xml +++ b/examples/karaf-maven-example/karaf-maven-example-run/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-maven-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-maven-example/pom.xml b/examples/karaf-maven-example/pom.xml index 9713b56d55e..4de01790aef 100644 --- a/examples/karaf-maven-example/pom.xml +++ b/examples/karaf-maven-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml index 5ee532eaa5c..9a6501166d9 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml index c29e75983e3..9448c9934fb 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml index 38bc377bd4b..d4812839cf3 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml index ba508932ae3..12000f416ca 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml index 9c80f7b7369..a4632295e3a 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml index 5a90d0336d8..fe6cdf78f4c 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/pom.xml b/examples/karaf-mbean-example/pom.xml index 69fb30c5bfb..ac8f5a4d5b1 100644 --- a/examples/karaf-mbean-example/pom.xml +++ b/examples/karaf-mbean-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-api/pom.xml b/examples/karaf-redis-example/karaf-redis-example-api/pom.xml index 00f66f1dcaa..28d6ee397b1 100644 --- a/examples/karaf-redis-example/karaf-redis-example-api/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-command/pom.xml b/examples/karaf-redis-example/karaf-redis-example-command/pom.xml index e9775b76037..1f042ade046 100644 --- a/examples/karaf-redis-example/karaf-redis-example-command/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-features/pom.xml b/examples/karaf-redis-example/karaf-redis-example-features/pom.xml index 11e6362e240..f18e6085d8b 100644 --- a/examples/karaf-redis-example/karaf-redis-example-features/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-service/pom.xml b/examples/karaf-redis-example/karaf-redis-example-service/pom.xml index 9f64f2a95aa..b9e2d70b80e 100644 --- a/examples/karaf-redis-example/karaf-redis-example-service/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-service/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-redis-example/pom.xml b/examples/karaf-redis-example/pom.xml index b4cc9aa5ea5..db883a6ea69 100644 --- a/examples/karaf-redis-example/pom.xml +++ b/examples/karaf-redis-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-api/pom.xml b/examples/karaf-rest-example/karaf-rest-example-api/pom.xml index afb25590082..23e6a249404 100644 --- a/examples/karaf-rest-example/karaf-rest-example-api/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml index ff4231a25e0..d8cefe8875d 100644 --- a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml index d2b216de8e3..e212689a6cc 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml @@ -17,7 +17,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml index 67c7166dfa6..30e8b32b18d 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml index 128cf5ed110..69548cceb1f 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/pom.xml index c509e74f8dc..56844d6d276 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-features/pom.xml b/examples/karaf-rest-example/karaf-rest-example-features/pom.xml index 02fa6efe928..c132235d698 100644 --- a/examples/karaf-rest-example/karaf-rest-example-features/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml index 21315bfaf7e..957246c222f 100644 --- a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml index c9eaf994494..ab040242a37 100644 --- a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/pom.xml b/examples/karaf-rest-example/pom.xml index 0accf23d9f0..b180046eaeb 100644 --- a/examples/karaf-rest-example/pom.xml +++ b/examples/karaf-rest-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml b/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml index 2f7e47e4f01..4291a7540ab 100644 --- a/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml +++ b/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scheduler-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml b/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml index 16435e03f4a..8f819914e8f 100644 --- a/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml +++ b/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scheduler-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scheduler-example/pom.xml b/examples/karaf-scheduler-example/pom.xml index ea4ed68be02..f2cdffa0a7a 100644 --- a/examples/karaf-scheduler-example/pom.xml +++ b/examples/karaf-scheduler-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-api/pom.xml b/examples/karaf-scr-example/karaf-scr-example-api/pom.xml index 9fa7c2d9563..c67e9be9718 100644 --- a/examples/karaf-scr-example/karaf-scr-example-api/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-client/pom.xml b/examples/karaf-scr-example/karaf-scr-example-client/pom.xml index a63bdc12a9c..2305e212a8c 100644 --- a/examples/karaf-scr-example/karaf-scr-example-client/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-features/pom.xml b/examples/karaf-scr-example/karaf-scr-example-features/pom.xml index 5584421555f..08e1e35e965 100644 --- a/examples/karaf-scr-example/karaf-scr-example-features/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml b/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml index 548614a3e93..bdadc68c309 100644 --- a/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scr-example/pom.xml b/examples/karaf-scr-example/pom.xml index 75ca46c70c4..9bcb1bb85ea 100644 --- a/examples/karaf-scr-example/pom.xml +++ b/examples/karaf-scr-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml index e88fd142014..f6e3100fc27 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml index a3a53d100c0..f378488494f 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml index b28ef3ecd72..04ff97a2962 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml index 16432988969..547244e73e6 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml index 4be7158e604..648060a3407 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml index 7ffab6c8e6c..23b87d9f441 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/pom.xml b/examples/karaf-servlet-example/pom.xml index 42f6a11737e..c960da7609b 100644 --- a/examples/karaf-servlet-example/pom.xml +++ b/examples/karaf-servlet-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-api/pom.xml b/examples/karaf-soap-example/karaf-soap-example-api/pom.xml index 4952b539d42..18865c5bfda 100644 --- a/examples/karaf-soap-example/karaf-soap-example-api/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml index e79b64821c2..57dd1b3ed4d 100644 --- a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-client/pom.xml b/examples/karaf-soap-example/karaf-soap-example-client/pom.xml index f4083fb2022..db579771d2b 100644 --- a/examples/karaf-soap-example/karaf-soap-example-client/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-features/pom.xml b/examples/karaf-soap-example/karaf-soap-example-features/pom.xml index 3a7fe584c17..b4102155de3 100644 --- a/examples/karaf-soap-example/karaf-soap-example-features/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml index 95a18b35547..9f89d5c159c 100644 --- a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/pom.xml b/examples/karaf-soap-example/pom.xml index 300d74c081e..cc6abd9d905 100644 --- a/examples/karaf-soap-example/pom.xml +++ b/examples/karaf-soap-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml index 241fdc7c89a..e7ffba1417e 100644 --- a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml +++ b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-url-namespace-handler-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml index 2a8f4ecdb92..7cc5e8b722e 100644 --- a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml +++ b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-url-namespace-handler-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/pom.xml b/examples/karaf-url-namespace-handler-example/pom.xml index 384c24385aa..c66587bd33d 100644 --- a/examples/karaf-url-namespace-handler-example/pom.xml +++ b/examples/karaf-url-namespace-handler-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-war-example/karaf-war-example-features/pom.xml b/examples/karaf-war-example/karaf-war-example-features/pom.xml index e6a68045f4d..5959e661dae 100644 --- a/examples/karaf-war-example/karaf-war-example-features/pom.xml +++ b/examples/karaf-war-example/karaf-war-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-war-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-war-example/karaf-war-example-webapp/pom.xml b/examples/karaf-war-example/karaf-war-example-webapp/pom.xml index 4a740e02f00..a680ee99f19 100644 --- a/examples/karaf-war-example/karaf-war-example-webapp/pom.xml +++ b/examples/karaf-war-example/karaf-war-example-webapp/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-war-example - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-war-example/pom.xml b/examples/karaf-war-example/pom.xml index 90391fa9e8f..7da7a548296 100644 --- a/examples/karaf-war-example/pom.xml +++ b/examples/karaf-war-example/pom.xml @@ -25,7 +25,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/karaf-websocket-example/pom.xml b/examples/karaf-websocket-example/pom.xml index 8f59c1873c2..605a617f3d0 100644 --- a/examples/karaf-websocket-example/pom.xml +++ b/examples/karaf-websocket-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index a719924f30d..06e0b12462a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/features/command/pom.xml b/features/command/pom.xml index 7a876a05e3c..b2319435a76 100644 --- a/features/command/pom.xml +++ b/features/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/features/core/pom.xml b/features/core/pom.xml index adf3174cc21..e0c2469b345 100644 --- a/features/core/pom.xml +++ b/features/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/features/extension/pom.xml b/features/extension/pom.xml index 47775d0fa71..3b1f895b86a 100644 --- a/features/extension/pom.xml +++ b/features/extension/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/features/pom.xml b/features/pom.xml index 4225cde9f35..93c475ae60e 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/http/pom.xml b/http/pom.xml index 59d43de94db..3c211bd9756 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/instance/pom.xml b/instance/pom.xml index f7830ef418a..11fcad9616a 100644 --- a/instance/pom.xml +++ b/instance/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/itests/common/pom.xml b/itests/common/pom.xml index 93d854f3422..7bb424d8848 100644 --- a/itests/common/pom.xml +++ b/itests/common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.itests itests - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/itests/pom.xml b/itests/pom.xml index 8f95edb683e..66854b6693e 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/itests/test/pom.xml b/itests/test/pom.xml index 54d705173e8..b0e19c9a2aa 100644 --- a/itests/test/pom.xml +++ b/itests/test/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.itests itests - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jaas/blueprint/config/pom.xml b/jaas/blueprint/config/pom.xml index 89bb1d1aa64..c1d791e4d88 100644 --- a/jaas/blueprint/config/pom.xml +++ b/jaas/blueprint/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas.blueprint blueprint - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jaas/blueprint/jasypt/pom.xml b/jaas/blueprint/jasypt/pom.xml index d00b7866c3b..56b2cb79df3 100644 --- a/jaas/blueprint/jasypt/pom.xml +++ b/jaas/blueprint/jasypt/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas.blueprint blueprint - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jaas/blueprint/pom.xml b/jaas/blueprint/pom.xml index 2c0e00dc554..d857ca1a69f 100644 --- a/jaas/blueprint/pom.xml +++ b/jaas/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jaas/boot/pom.xml b/jaas/boot/pom.xml index b350b5643aa..3d5135d83a2 100644 --- a/jaas/boot/pom.xml +++ b/jaas/boot/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jaas/command/pom.xml b/jaas/command/pom.xml index cbedfcb7f1c..d5b58811c74 100644 --- a/jaas/command/pom.xml +++ b/jaas/command/pom.xml @@ -24,7 +24,7 @@ jaas org.apache.karaf.jaas - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jaas/config/pom.xml b/jaas/config/pom.xml index c54e32b20b2..d2ebe61f148 100644 --- a/jaas/config/pom.xml +++ b/jaas/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml index 45735b495c5..a677912781d 100644 --- a/jaas/jasypt/pom.xml +++ b/jaas/jasypt/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml index 061552514f5..fefd69a8d48 100644 --- a/jaas/modules/pom.xml +++ b/jaas/modules/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jaas/pom.xml b/jaas/pom.xml index b7957310357..27d0c892fe3 100644 --- a/jaas/pom.xml +++ b/jaas/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jaas/spring-security-crypto/pom.xml b/jaas/spring-security-crypto/pom.xml index 159e16c796c..86b0042ec35 100644 --- a/jaas/spring-security-crypto/pom.xml +++ b/jaas/spring-security-crypto/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 3ccf5d64da5..b961f5c79ad 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jms/pom.xml b/jms/pom.xml index a4d84c8e05d..d2ee38ad2fc 100644 --- a/jms/pom.xml +++ b/jms/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/jndi/pom.xml b/jndi/pom.xml index 971356bbbe6..d941b1da1b4 100644 --- a/jndi/pom.xml +++ b/jndi/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/kar/pom.xml b/kar/pom.xml index bfb95bd92db..131754569ff 100644 --- a/kar/pom.xml +++ b/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/log/pom.xml b/log/pom.xml index 49fe6a1c904..c949c18ea32 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/main/pom.xml b/main/pom.xml index c1632e87911..674ffac808f 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/management/pom.xml b/management/pom.xml index 0b4c35cc477..c54aa0ab565 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/management/server/pom.xml b/management/server/pom.xml index ba305b44217..94a6a317cf0 100644 --- a/management/server/pom.xml +++ b/management/server/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.management management - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/manual/pom.xml b/manual/pom.xml index 759271846b1..6150db97dce 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -17,7 +17,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/maven/core/pom.xml b/maven/core/pom.xml index a60d38f3124..5b2270d83eb 100644 --- a/maven/core/pom.xml +++ b/maven/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../../pom.xml diff --git a/maven/pom.xml b/maven/pom.xml index 0b34b858c71..5cd65dee4c8 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/obr/pom.xml b/obr/pom.xml index 3271888206d..e5f91d0db3c 100644 --- a/obr/pom.xml +++ b/obr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/package/pom.xml b/package/pom.xml index f3177f229e6..ed0926d043a 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 7f0ec595a17..f9ea4728722 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.karaf karaf pom - 4.4.5 + 4.4.6-SNAPSHOT Apache Karaf 2007 @@ -150,7 +150,7 @@ - 1704471561 + 1704478871 scm:git:https://gitbox.apache.org/repos/asf/karaf.git scm:git:https://gitbox.apache.org/repos/asf/karaf.git diff --git a/profile/pom.xml b/profile/pom.xml index 97157b0c4e0..444981ecc4a 100644 --- a/profile/pom.xml +++ b/profile/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/scheduler/pom.xml b/scheduler/pom.xml index 7bf40770fe7..a2e5861bcb4 100644 --- a/scheduler/pom.xml +++ b/scheduler/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/scr/management/pom.xml b/scr/management/pom.xml index 7ec8f9ca0c7..c9063ae4188 100644 --- a/scr/management/pom.xml +++ b/scr/management/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.scr scr - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/scr/pom.xml b/scr/pom.xml index c00a0e2ca04..a7a31170508 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/scr/state/pom.xml b/scr/state/pom.xml index e89e4f1c42c..375fdc74454 100644 --- a/scr/state/pom.xml +++ b/scr/state/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.scr scr - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/service/core/pom.xml b/service/core/pom.xml index bb3f753cc95..a0115b75244 100644 --- a/service/core/pom.xml +++ b/service/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.service service - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/service/guard/pom.xml b/service/guard/pom.xml index a28d84e5a56..3ab2879dabd 100644 --- a/service/guard/pom.xml +++ b/service/guard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.service service - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/service/pom.xml b/service/pom.xml index 4a6bb216dec..5fd0e8477fa 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/services/coordinator/pom.xml b/services/coordinator/pom.xml index ecdafd1cc57..412abea6651 100644 --- a/services/coordinator/pom.xml +++ b/services/coordinator/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.5 + 4.4.6-SNAPSHOT ../../pom.xml diff --git a/services/eventadmin/pom.xml b/services/eventadmin/pom.xml index aca56a3d0a9..cd5cf414646 100644 --- a/services/eventadmin/pom.xml +++ b/services/eventadmin/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.5 + 4.4.6-SNAPSHOT ../../pom.xml diff --git a/services/interceptor/api/pom.xml b/services/interceptor/api/pom.xml index 18b6273db4e..bd0113eeb4c 100644 --- a/services/interceptor/api/pom.xml +++ b/services/interceptor/api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services org.apache.karaf.services.interceptor - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/services/interceptor/impl/pom.xml b/services/interceptor/impl/pom.xml index 63c3eb96c2b..e8f71f137f0 100644 --- a/services/interceptor/impl/pom.xml +++ b/services/interceptor/impl/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services org.apache.karaf.services.interceptor - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/services/interceptor/pom.xml b/services/interceptor/pom.xml index eedafa1c3e4..ea59676d93d 100644 --- a/services/interceptor/pom.xml +++ b/services/interceptor/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services services - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/services/pom.xml b/services/pom.xml index a441b3875e0..fdf47b63a51 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/services/staticcm/pom.xml b/services/staticcm/pom.xml index 55bab75a125..ddeebf2c3e3 100644 --- a/services/staticcm/pom.xml +++ b/services/staticcm/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.5 + 4.4.6-SNAPSHOT ../../pom.xml diff --git a/shell/commands/pom.xml b/shell/commands/pom.xml index a1d867aecae..7df4c8f3f74 100644 --- a/shell/commands/pom.xml +++ b/shell/commands/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/shell/console/pom.xml b/shell/console/pom.xml index 93000b9c811..22177fb2b2c 100644 --- a/shell/console/pom.xml +++ b/shell/console/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/shell/core/pom.xml b/shell/core/pom.xml index 9729a4cd372..eb87004fc3a 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/shell/groovy/pom.xml b/shell/groovy/pom.xml index 337e3d3294d..44ac4651d7d 100644 --- a/shell/groovy/pom.xml +++ b/shell/groovy/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/shell/pom.xml b/shell/pom.xml index 59b61a487fd..132e1a3895d 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index bb08b9f4504..663673a5a6e 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/shell/table/pom.xml b/shell/table/pom.xml index bf49c96ffa8..3e721fa47e3 100644 --- a/shell/table/pom.xml +++ b/shell/table/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/specs/activator/pom.xml b/specs/activator/pom.xml index f4b61160234..57dbf62008f 100644 --- a/specs/activator/pom.xml +++ b/specs/activator/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.5 + 4.4.6-SNAPSHOT org.apache.karaf.specs.activator diff --git a/specs/java.xml.ws/pom.xml b/specs/java.xml.ws/pom.xml index 38d4146038d..1439c451b35 100644 --- a/specs/java.xml.ws/pom.xml +++ b/specs/java.xml.ws/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.5 + 4.4.6-SNAPSHOT org.apache.karaf.specs.java.xml.ws diff --git a/specs/java.xml/pom.xml b/specs/java.xml/pom.xml index 5689002ad14..cdbc599bb6f 100644 --- a/specs/java.xml/pom.xml +++ b/specs/java.xml/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.5 + 4.4.6-SNAPSHOT org.apache.karaf.specs.java.xml diff --git a/specs/locator/pom.xml b/specs/locator/pom.xml index 3d8ad45ef3d..5fdc35b9c3b 100644 --- a/specs/locator/pom.xml +++ b/specs/locator/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.5 + 4.4.6-SNAPSHOT org.apache.karaf.specs.locator diff --git a/specs/pom.xml b/specs/pom.xml index bba53622106..3f885fc114b 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/subsystem/pom.xml b/subsystem/pom.xml index d650afbc95a..cccc70e99d3 100644 --- a/subsystem/pom.xml +++ b/subsystem/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT org.apache.karaf.subsystem diff --git a/system/pom.xml b/system/pom.xml index 8bccab53bca..a4975ab84cd 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index 9b1e0d64784..8202753ee80 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/tooling/karaf-services-maven-plugin/pom.xml b/tooling/karaf-services-maven-plugin/pom.xml index 5fb5925e987..7ae7ae0847b 100644 --- a/tooling/karaf-services-maven-plugin/pom.xml +++ b/tooling/karaf-services-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/tooling/pom.xml b/tooling/pom.xml index a3fdc0069f1..ee61fab82e1 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/tooling/utils/pom.xml b/tooling/utils/pom.xml index 25f9997e49b..d52ee2401cc 100644 --- a/tooling/utils/pom.xml +++ b/tooling/utils/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.5 + 4.4.6-SNAPSHOT org.apache.karaf.tools.utils diff --git a/util/pom.xml b/util/pom.xml index 616062d6b16..9d6de4a8b53 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/web/pom.xml b/web/pom.xml index eac3ba9ca02..9ad8e12dcc9 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml index e7fb320a64d..ac0b647e216 100644 --- a/webconsole/console/pom.xml +++ b/webconsole/console/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml index a09385f6e50..052f7197840 100644 --- a/webconsole/features/pom.xml +++ b/webconsole/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/webconsole/gogo/pom.xml b/webconsole/gogo/pom.xml index 0fd010ba079..d18e7960cba 100644 --- a/webconsole/gogo/pom.xml +++ b/webconsole/gogo/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/webconsole/http/pom.xml b/webconsole/http/pom.xml index cd327fbaf8a..ec8305a6e27 100644 --- a/webconsole/http/pom.xml +++ b/webconsole/http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/webconsole/instance/pom.xml b/webconsole/instance/pom.xml index 59e13267d25..9018e4f938a 100644 --- a/webconsole/instance/pom.xml +++ b/webconsole/instance/pom.xml @@ -19,7 +19,7 @@ org.apache.karaf.webconsole webconsole - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/webconsole/pom.xml b/webconsole/pom.xml index b0e63e88e62..8d22d611603 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml diff --git a/wrapper/pom.xml b/wrapper/pom.xml index deaf0c95da7..918720e44d9 100644 --- a/wrapper/pom.xml +++ b/wrapper/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.5 + 4.4.6-SNAPSHOT ../pom.xml From ce6cb4ca660429d0dfa527c0c0e475d245ef7a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Dywicki?= Date: Tue, 9 Jan 2024 13:41:09 +0100 Subject: [PATCH 033/440] KARAF-7795 Fix handling of custom info providers in shell:info command. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Łukasz Dywicki --- .../java/org/apache/karaf/shell/commands/impl/InfoAction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java index 22dea865099..040edb09c59 100644 --- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java +++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java @@ -40,6 +40,7 @@ import java.util.Properties; import java.util.concurrent.Callable; +import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.commands.info.InfoProvider; import org.apache.karaf.shell.api.action.Action; import org.apache.karaf.shell.api.action.Command; @@ -63,7 +64,7 @@ public class InfoAction implements Action { @Option(name="--memory-pools", aliases= {"-mp"}, description="Includes detailed information about memory pools") protected boolean showMemoryPools; -// @Reference + @Reference List infoProviders; public InfoAction() { From f84ab0b39a5a37665920d7f0b833227b70482725 Mon Sep 17 00:00:00 2001 From: Grzegorz Grzybek Date: Mon, 15 Jan 2024 11:48:22 +0100 Subject: [PATCH 034/440] [KARAF-7799] Allow merging of org.apache.karaf.features.xml definitions --- .../karaf/profile/assembly/Builder.java | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java index 1f960278666..b06cdf5f760 100644 --- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java +++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java @@ -965,6 +965,7 @@ private void doGenerateAssembly() throws Exception { boolean needFeaturesProcessorFileCopy = false; String existingProcessorDefinitionURI = null; + String additionalProcessorDefinitionURI = null; Path existingProcessorDefinition = etcDirectory.resolve("org.apache.karaf.features.xml"); if (existingProcessorDefinition.toFile().isFile()) { existingProcessorDefinitionURI = existingProcessorDefinition.toFile().toURI().toString(); @@ -973,11 +974,12 @@ private void doGenerateAssembly() throws Exception { if (featuresProcessingLocation != null && featuresProcessingLocation.toFile().isFile() && !featuresProcessingLocation.equals(existingProcessorDefinition)) { if (existingProcessorDefinitionURI != null) { - LOGGER.warn("Explicitly configured {} will be used for features processor configuration.", homeDirectory.relativize(featuresProcessingLocation)); + LOGGER.info("Found additional features processor configuration: {}", homeDirectory.relativize(featuresProcessingLocation)); + additionalProcessorDefinitionURI = featuresProcessingLocation.toFile().toURI().toString(); } else { LOGGER.info("Found features processor configuration: {}", homeDirectory.relativize(featuresProcessingLocation)); + existingProcessorDefinitionURI = featuresProcessingLocation.toFile().toURI().toString(); } - existingProcessorDefinitionURI = featuresProcessingLocation.toFile().toURI().toString(); // when there are no other (configured via Maven for example) processing instructions (e.g., blacklisting) // we don't have to generate this file and may take original content needFeaturesProcessorFileCopy = true; @@ -987,6 +989,30 @@ private void doGenerateAssembly() throws Exception { // configuration for bundle replacements or feature overrides. FeaturesProcessorImpl processor = new FeaturesProcessorImpl(existingProcessorDefinitionURI, null, blacklist, new HashSet<>()); + if (additionalProcessorDefinitionURI != null) { + FeaturesProcessorImpl processor2 = new FeaturesProcessorImpl(additionalProcessorDefinitionURI, null, new Blacklist(), new HashSet<>()); + FeaturesProcessing existingConfiguration = processor.getInstructions(); + FeaturesProcessing additionalConfiguration = processor2.getInstructions(); + additionalConfiguration.getBlacklistedRepositories() + .forEach(br -> existingConfiguration.getBlacklistedRepositories().add(br)); + additionalConfiguration.getBlacklistedRepositoryLocationPatterns() + .forEach(lp -> existingConfiguration.getBlacklistedRepositoryLocationPatterns().add(lp)); + additionalConfiguration.getBlacklistedFeatures() + .forEach(bf -> existingConfiguration.getBlacklistedFeatures().add(bf)); + additionalConfiguration.getBlacklistedBundles() + .forEach(bb -> existingConfiguration.getBlacklistedBundles().add(bb)); + additionalConfiguration.getFeatureReplacements().getReplacements() + .forEach(fr -> existingConfiguration.getFeatureReplacements().getReplacements().add(fr)); + additionalConfiguration.getBundleReplacements().getOverrideBundles() + .forEach(br -> existingConfiguration.getBundleReplacements().getOverrideBundles().add(br)); + additionalConfiguration.getOverrideBundleDependency().getRepositories() + .forEach(r -> existingConfiguration.getOverrideBundleDependency().getRepositories().add(r)); + additionalConfiguration.getOverrideBundleDependency().getFeatures() + .forEach(f -> existingConfiguration.getOverrideBundleDependency().getFeatures().add(f)); + additionalConfiguration.getOverrideBundleDependency().getBundles() + .forEach(b -> existingConfiguration.getOverrideBundleDependency().getBundles().add(b)); + } + // add overrides from initialProfile Set overrides = processOverrides(initialEffective.getOverrides()); processor.addOverrides(overrides); From eea110a51c4a9d8a2474ad7340522aaef0fd17c8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 15 Jan 2024 13:33:52 +0100 Subject: [PATCH 035/440] [KARAF-7800] Upgrade asciidoctor-maven-plugin to 2.2.5 (cherry picked from commit 4d524a6593ffaa6f521f8d836e82ece771225b28) --- manual/pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/manual/pom.xml b/manual/pom.xml index 6150db97dce..26233c9c025 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -213,7 +213,7 @@ org.asciidoctor asciidoctor-maven-plugin - 1.5.6 + 2.2.5 output-html @@ -222,10 +222,9 @@ process-asciidoc - coderay - html5 article + coderay false @@ -235,7 +234,9 @@ src/main/asciidoc true - src/main/asciidoc/images + + src/main/asciidoc/images + From 16c5f50a4a9ab23228227d8ccb5e317fb77cc786 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 16 Dec 2023 11:28:32 +0100 Subject: [PATCH 036/440] Support Java 21 in Builder.JavaVersion We have jre-21 defined in jre.properties, but the Builder would not recognize them. Update the enumeration and eliminate manuall-maintained ordinal, deferring to Enum.compareTo() instead. Signed-off-by: Robert Varga --- .../karaf/profile/assembly/Builder.java | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java index 1f960278666..52088ed7f2f 100644 --- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java +++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java @@ -184,26 +184,27 @@ public enum KarafVersion { * supported versions are defined.

*/ public enum JavaVersion { - Java6("1.6", 1), - Java7("1.7", 2), - Java8("1.8", 3), - Java9("9", 4), - Java10("10", 5), - Java11("11", 6), - Java12("12", 7), - Java13("13", 8), - Java14("14", 9), - Java15("15", 10), - Java16("16", 11), - Java17("17", 12), - Java18("18", 13); + Java6("1.6"), + Java7("1.7"), + Java8("1.8"), + Java9("9"), + Java10("10"), + Java11("11"), + Java12("12"), + Java13("13"), + Java14("14"), + Java15("15"), + Java16("16"), + Java17("17"), + Java18("18"), + Java19("19"), + Java20("20"), + Java21("21"); private String version; - private int ordinal; - JavaVersion(String version, int ordinal) { + JavaVersion(String version) { this.version = version; - this.ordinal = ordinal; } public static JavaVersion from(String version) { @@ -216,7 +217,7 @@ public static JavaVersion from(String version) { } public boolean supportsEndorsedAndExtLibraries() { - return this.ordinal < Java9.ordinal; + return compareTo(Java9) < 0; } } From 8c7b2acdc2ee02af44e4f0f50212af2698c2eef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksy=20Wr=C3=B3blewski?= Date: Fri, 26 Jan 2024 14:12:17 +0100 Subject: [PATCH 037/440] KARAF-7804 - provide unique servlet-name when registering http proxy servlets (cherry picked from commit c310ce274aab5be7f9cd81c2b549b8e4978ab786) --- .../http/core/internal/ProxyServiceImpl.java | 20 ++++++++++++++++++- .../org/apache/karaf/itests/HttpTest.java | 8 ++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServiceImpl.java b/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServiceImpl.java index 5e86fcffc64..2991e70e818 100644 --- a/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServiceImpl.java +++ b/http/src/main/java/org/apache/karaf/http/core/internal/ProxyServiceImpl.java @@ -101,6 +101,7 @@ public void update(Dictionary properties) { String[] proxySplit = proxyString.split(" "); if (proxySplit.length == 3) { String url = proxySplit[0].trim(); + validateUrl(url); String proxyTo = proxySplit[1].trim(); String balancingPolicy = proxySplit[2].trim(); if (!proxies.containsKey(url)) { @@ -111,6 +112,9 @@ public void update(Dictionary properties) { addProxyInternal(proxy); } } + else { + LOG.error("Incorrect configuration line {}", proxyString); + } } } } @@ -131,7 +135,9 @@ private void addProxyInternal(Proxy proxy) { proxyServlet.setBalancingPolicy(balancingPolicy); } } - httpService.registerServlet(proxy.getUrl(), proxyServlet, new Hashtable(), null); + Hashtable props = new Hashtable<>(); + props.put("servlet-name", getUniqueServletName(proxy)); + httpService.registerServlet(proxy.getUrl(), proxyServlet, props, null); proxies.put(proxy.getUrl(), proxy); } catch (Exception e) { LOG.error("Can't add {} proxy to {}", proxy.getUrl(), proxy.getProxyTo(), e); @@ -160,4 +166,16 @@ private void updateConfiguration() { } } + private void validateUrl(String url) + { + if (url == null || !url.startsWith("/")) + { + throw new IllegalArgumentException("Proxy URL does not start with '/': " + url); + } + } + + private String getUniqueServletName(Proxy proxy) + { + return proxy.getUrl().substring(1); + } } diff --git a/itests/test/src/test/java/org/apache/karaf/itests/HttpTest.java b/itests/test/src/test/java/org/apache/karaf/itests/HttpTest.java index 3374b681e66..69cc2b1ba2a 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/HttpTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/HttpTest.java @@ -59,6 +59,7 @@ public void listViaMBean() throws Exception { @Test public void testProxy() throws Exception { executeCommand("http:proxy-add /test1 http://karaf.apache.org"); + executeCommand("http:proxy-add /test2 http://karaf.apache.org"); String output = executeCommand("http:proxy-balancing-list"); System.out.println(output); @@ -68,6 +69,13 @@ public void testProxy() throws Exception { output = executeCommand("http:proxy-list"); System.out.println(output); assertContains("/test1", output); + assertContains("/test2", output); } + @Test + public void testIncorrectProxyUrlFails() throws Exception { + executeCommand("http:proxy-add no-slash-prefix http://karaf.apache.org"); + String output = executeCommand("http:proxy-list"); + assertContainsNot("no-slash-prefix", output); + } } From 04a9654087d5253e0ab5f5853f1440f1f4315ccd Mon Sep 17 00:00:00 2001 From: Ian Thiemann Date: Tue, 19 Mar 2024 08:43:08 +0100 Subject: [PATCH 038/440] KARAF-7691 Prevent exception on status check by terminating ShutdownSocketThread loop before socket closes (cherry picked from commit c7bdb9eea312a8ab4027846dbd57b0ec78f5e690) --- main/src/main/java/org/apache/karaf/main/Status.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main/src/main/java/org/apache/karaf/main/Status.java b/main/src/main/java/org/apache/karaf/main/Status.java index 58d02f1ae23..f7bf36e5f70 100644 --- a/main/src/main/java/org/apache/karaf/main/Status.java +++ b/main/src/main/java/org/apache/karaf/main/Status.java @@ -58,6 +58,8 @@ public static void main(String[] args) throws Exception { try (Socket s = new Socket(config.shutdownHost, config.shutdownPort)) { if (s.isBound()) { System.out.println(RUNNING); + //Send control character EOT to break ShutdownSocketThread loop before socket closes + s.getOutputStream().write(04); System.exit(0); } else { System.out.println(NOT_RUNNING); From 8df799d77f92e1640e0a808d347b2a6ed7214abf Mon Sep 17 00:00:00 2001 From: pingpingy1 Date: Mon, 18 Mar 2024 18:05:38 +0900 Subject: [PATCH 039/440] Check for annotation in ActionCommand constructor The `ActionCommand` class takes an `actionClass` parameter for its constructor, whose `@Command` annotation accessed in the other methods. Thus, if the provided `actionClass` has no such annotations, then it will throw an NPE at a later, unspecified time. This commit implements a fail-fast guard against this scenarios. (cherry picked from commit 5ad710722c38bd3f1b0487a584c8dfd71d5f7931) --- .../impl/action/command/ActionCommand.java | 4 +++ .../action/command/ActionCommandTest.java | 35 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 shell/core/src/test/java/org/apache/karaf/shell/impl/action/command/ActionCommandTest.java diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ActionCommand.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ActionCommand.java index 0b815f648e3..41262259782 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ActionCommand.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ActionCommand.java @@ -35,6 +35,10 @@ public class ActionCommand implements org.apache.karaf.shell.api.console.Command private final Class actionClass; public ActionCommand(ManagerImpl manager, Class actionClass) { + if (actionClass.getAnnotation(Command.class) == null) { + throw new IllegalArgumentException("actionClass must have an @Command annotation."); + } + this.manager = manager; this.actionClass = actionClass; } diff --git a/shell/core/src/test/java/org/apache/karaf/shell/impl/action/command/ActionCommandTest.java b/shell/core/src/test/java/org/apache/karaf/shell/impl/action/command/ActionCommandTest.java new file mode 100644 index 00000000000..9f67c5a23fa --- /dev/null +++ b/shell/core/src/test/java/org/apache/karaf/shell/impl/action/command/ActionCommandTest.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.karaf.shell.impl.action.command; + +import org.apache.karaf.shell.api.action.Action; + +import org.junit.Test; + +import static org.junit.Assert.assertThrows; + +public class ActionCommandTest { + + abstract static class ExampleClass implements Action {} + + @Test + public void testUnannotatedActionClass() { + assertThrows(IllegalArgumentException.class, () -> new ActionCommand(null, ExampleClass.class)); + } +} \ No newline at end of file From 2cffad038fb7519efc4d25629e79214756eda3e4 Mon Sep 17 00:00:00 2001 From: "Dieder Timmers dieder@ratshome.net" Date: Tue, 21 Mar 2023 14:47:46 +0100 Subject: [PATCH 040/440] Changed handling of the TCP connection to send the stop command and added a EOL character to the stream (cherry picked from commit 50d92c1a5ae493dec1af7f621fed7523dc407c0f) --- main/src/main/java/org/apache/karaf/main/Stop.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/src/main/java/org/apache/karaf/main/Stop.java b/main/src/main/java/org/apache/karaf/main/Stop.java index 2609ad6a736..1f231569d0a 100644 --- a/main/src/main/java/org/apache/karaf/main/Stop.java +++ b/main/src/main/java/org/apache/karaf/main/Stop.java @@ -56,11 +56,13 @@ public static void main(String[] args) throws Exception { if (config.shutdownPort > 0) { try (Socket s = new Socket(config.shutdownHost, config.shutdownPort)) { s.getOutputStream().write(config.shutdownCommand.getBytes()); - System.exit(0); + s.getOutputStream().write('\n'); + s.getOutputStream().flush(); } catch (ConnectException connectException) { System.err.println("Can't connect to the container. The container is not running."); System.exit(1); } + System.exit(0); } else { // using the pid file int pid = getPidFromPidFile(config.pidFile); From c0c8e0ef7f7eb1ab35a56de87926fd73d88002e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 28 Mar 2024 15:49:43 +0100 Subject: [PATCH 041/440] KARAF-7822: Upgrade to Apache POM 31 (cherry picked from commit ecde04e125a921628648ea8d5c02a2e35f6899d4) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f9ea4728722..23b7ff26b9e 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache apache - 29 + 31 From e993ebf1745b04eb4e2edaf30ccf8193c0c69bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 28 Mar 2024 15:12:01 +0100 Subject: [PATCH 042/440] KARAF-7819: Upgrade to Spring 5.2.25_1 feature (cherry picked from commit b233719546aabb490feb1750236b43de8eb19ef4) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23b7ff26b9e..7ab27a13c39 100644 --- a/pom.xml +++ b/pom.xml @@ -334,7 +334,7 @@ 1.2.1 3.1.4.RELEASE 4.3.30.RELEASE_1 - 5.2.22.RELEASE_1 + 5.2.25.RELEASE_1 5.3.29_1 3.1.4.RELEASE 4.2.4.RELEASE_1 From 7bbd3fe5bd36855b4ca5f11df27f306d93d1f627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 28 Mar 2024 15:17:10 +0100 Subject: [PATCH 043/440] KARAF-7816: Upgrade to Pax JDBC 1.5.7 (cherry picked from commit 31f93f4ee9697955109ea5e0483aa3da1171c276) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ab27a13c39..105cdbf71e0 100644 --- a/pom.xml +++ b/pom.xml @@ -314,7 +314,7 @@ 2.6.14 8.0.24 3.0.0 - 1.5.6 + 1.5.7 1.1.3 0.5.4 From 9b6c93e3613714dcb57f829e02e2b9e3a8c2a918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 28 Mar 2024 15:42:20 +0100 Subject: [PATCH 044/440] KARAF-7815: Upgrade to Pax Logging 2.2.7/slf4j 2.0.12/log4j 2.23.1 (cherry picked from commit 03354d2635441d19ff762e217348f798a19cc983) --- bom/pom.xml | 9 +++++++-- jaas/modules/pom.xml | 4 ++-- pom.xml | 6 +++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 248a2084727..07919b460bf 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -957,8 +957,13 @@ - log4j - log4j + org.apache.logging.log4j + log4j-core + ${log4j.version} + + + org.apache.logging.log4j + log4j-slf4j2-impl ${log4j.version} diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml index fefd69a8d48..4a0b2f3d2af 100644 --- a/jaas/modules/pom.xml +++ b/jaas/modules/pom.xml @@ -103,8 +103,8 @@ - org.slf4j - slf4j-log4j12 + org.apache.logging.log4j + log4j-slf4j2-impl test diff --git a/pom.xml b/pom.xml index 105cdbf71e0..a4a6753748b 100644 --- a/pom.xml +++ b/pom.xml @@ -284,7 +284,7 @@ 3.21.0 4.13.2 3.2.3 - 1.2.17 + 2.23.1 3.8.6 3.5.2 3.10.2 @@ -308,7 +308,7 @@ 1.1.4 4.13.5 - 2.2.6 + 2.2.7 1.5.1 1.8.5 2.6.14 @@ -320,7 +320,7 @@ 2.0 3.5.1 - 1.7.32 + 2.0.12 1.2.2 1.3.5 From 807fc7097d1a19229f148a4987f209ca7baf3720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 28 Mar 2024 15:47:49 +0100 Subject: [PATCH 045/440] KARAF-7813: Upgrade to ASM 9.7 (cherry picked from commit e0554629f088800d06aac7b42e18f713b3ae4213) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4a6753748b..0184bc78b92 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 5.17.1 1.0_6 1.9.5_1 - 9.6 + 9.7 1.3.2 3.1.6 1.75 From 7b075475e1e92d922edff1a46ce077eb3bb8b060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 28 Mar 2024 15:44:26 +0100 Subject: [PATCH 046/440] KARAF-7814: Upgrade to Pax Web 8.0.27/Jetty 9.4.54.v20240208 (cherry picked from commit f00ebd97c9382787b5b2c72663804a869097a897) --- assemblies/features/standard/src/main/feature/feature.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index 462b1775626..b923ac77ca6 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -911,7 +911,7 @@ org.osgi.service.http.port=8181 pax-web-http-war - + pax-web-jetty diff --git a/pom.xml b/pom.xml index 0184bc78b92..1e59eb3dd4f 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ 1.5.1 1.8.5 2.6.14 - 8.0.24 + 8.0.27 3.0.0 1.5.7 1.1.3 From 4a39d8085b22c7968e4c2c3f2351722cccd6406a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Sat, 30 Mar 2024 07:24:45 +0100 Subject: [PATCH 047/440] KARAF-7801: Upgrade to sshd 2.12.1 (cherry picked from commit dc1167231e6246089ba3b6e2bf82c54758e7acf4) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e59eb3dd4f..ff3d3c6b4fe 100644 --- a/pom.xml +++ b/pom.xml @@ -346,7 +346,7 @@ 5.7.3_1 1.2.16 - 2.11.0 + 2.12.1 1.3.10_1 4.24 1.4.7 From c7342b8678a7b405277686a139816b23f3fe2dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Sat, 30 Mar 2024 07:23:21 +0100 Subject: [PATCH 048/440] KARAF-7809: Upgrade to bouncycastle 1.77 (cherry picked from commit e9def96371a11291b7a4a164fc15ccb0e9aec4a6) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff3d3c6b4fe..f413226ce07 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ 9.7 1.3.2 3.1.6 - 1.75 + 1.77 3.6.0 3.2.9_1 3.5.5 From 5a2a123ad8b57f6688ad819c15d7ef5ddc2dcc0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Sat, 30 Mar 2024 07:20:15 +0100 Subject: [PATCH 049/440] KARAF-7810: Upgrade to commons-logging 1.3.1 (cherry picked from commit 60d8fda23c209360d185f2e8611ce7f0f27a4ffc) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f413226ce07..037bf575f1a 100644 --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ 3.2.2 1.5 3.14.0 - 1.3.0 + 1.3.1 2.11.1 2.15.1 2.7.11 From 884173042e0eb0a3d5c45990c38b39cbde95b2e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Sat, 30 Mar 2024 07:18:58 +0100 Subject: [PATCH 050/440] KARAF-7811: Upgrade to commons-compress 1.26.1 (cherry picked from commit 5d55a981fdf2e45c20dd11ae009db8f0a1ce5984) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 037bf575f1a..306b9f6597f 100644 --- a/pom.xml +++ b/pom.xml @@ -178,7 +178,7 @@ 2.3.8 1.9.4 1.15 - 1.25.0 + 1.26.1 3.2.2 1.5 3.14.0 From 3b8255a9ed64a3c02e56c87ac4cfe0d330d5e492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Sat, 30 Mar 2024 07:15:11 +0100 Subject: [PATCH 051/440] KARAF-7812: Upgrade to Maven Wagon 3.5.3 (cherry picked from commit 7acf3ece276ecd54de889a1f4c98d64b85c0d402) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 306b9f6597f..56131bdd640 100644 --- a/pom.xml +++ b/pom.xml @@ -286,7 +286,7 @@ 3.2.3 2.23.1 3.8.6 - 3.5.2 + 3.5.3 3.10.2 1.8.2 From 16115bc6e167b2a4d21851ceba40cecd150d44b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 3 Apr 2024 11:32:13 +0200 Subject: [PATCH 052/440] KARAF-7802: Add javax.annotation.sql and javax.annotation.security packages to etc/jre.properties (cherry picked from commit 089345083c3253fce81a0aea222ebbdc138cda38) --- .../src/main/filtered-resources/resources/etc/jre.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties index 50c95a87461..efd95ce1aa6 100644 --- a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties +++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties @@ -331,8 +331,10 @@ jre-9= \ java.net.spi, \ javax.accessibility, \ javax.activity, \ - javax.annotation;version="1.3", \ + javax.annotation;version="1.3.2", \ javax.annotation.processing;version="1.0", \ + javax.annotation.security;version="1.3.2", \ + javax.annotation.sql;version="1.3.2", \ javax.activation;version="1.2.1", \ javax.crypto, \ javax.crypto.interfaces, \ From 5673ffa3459fd5bd9478995708c106d335d2e8a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 3 Apr 2024 13:42:31 +0200 Subject: [PATCH 053/440] KARAF-7820: Upgrade to Spring 5.3.33 (cherry picked from commit a6b55c4a7748a53abe5f235dfe261615c5d34867) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56131bdd640..3868aa0af3c 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ 3.1.4.RELEASE 4.3.30.RELEASE_1 5.2.25.RELEASE_1 - 5.3.29_1 + 5.3.33_1 3.1.4.RELEASE 4.2.4.RELEASE_1 5.1.5.RELEASE_1 From 2ec33528b3e95a17539570c30a65abf8ade03987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 28 Mar 2024 15:14:59 +0100 Subject: [PATCH 054/440] KARAF-7817: Upgrade Spring Security features to 5.7.12/5.5.3/5.1.6 (cherry picked from commit 83eaf688fa9f34bddb8a5c2537b31351c929b47d) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3868aa0af3c..022a4c8efcb 100644 --- a/pom.xml +++ b/pom.xml @@ -338,12 +338,12 @@ 5.3.33_1 3.1.4.RELEASE 4.2.4.RELEASE_1 - 5.1.5.RELEASE_1 + 5.1.6.RELEASE_1 5.3.3.RELEASE_2 5.4.6_1 - 5.5.2_1 + 5.5.3_1 5.6.3_1 - 5.7.3_1 + 5.7.12_1 1.2.16 2.12.1 From 5550d4406da8fbc3e0d8dfbc890936f408b5e966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Tue, 2 Apr 2024 17:56:29 +0200 Subject: [PATCH 055/440] KARAF-7747: Provide Spring 6.1.x/6.0.x features (cherry picked from commit 606dcbf395bdecf451f92172287b46ae14ce4eff) --- assemblies/features/spring-legacy/pom.xml | 4 +- .../src/main/feature/feature.xml | 208 +++++++++++++++++- assemblies/features/spring/pom.xml | 2 +- .../spring/src/main/feature/feature.xml | 136 ++++++------ itests/test/pom.xml | 6 + .../org/apache/karaf/itests/BaseTest.java | 3 + .../itests/features/Spring53FeaturesTest.java | 22 ++ .../itests/features/Spring60FeaturesTest.java | 103 +++++++++ .../itests/features/Spring61FeaturesTest.java | 81 +++++++ pom.xml | 3 + 10 files changed, 484 insertions(+), 84 deletions(-) create mode 100644 itests/test/src/test/java/org/apache/karaf/itests/features/Spring60FeaturesTest.java create mode 100644 itests/test/src/test/java/org/apache/karaf/itests/features/Spring61FeaturesTest.java diff --git a/assemblies/features/spring-legacy/pom.xml b/assemblies/features/spring-legacy/pom.xml index 4c50544e167..0db7c17ea53 100644 --- a/assemblies/features/spring-legacy/pom.xml +++ b/assemblies/features/spring-legacy/pom.xml @@ -158,12 +158,12 @@ file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 1.8 + 17 framework - (?!(spring-struts|spring-web|spring-dm-web))* + spring|spring-(?!(struts|dm-web|web))* diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml index 0a8b56f378d..8c8eb04cae5 100644 --- a/assemblies/features/spring-legacy/src/main/feature/feature.xml +++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml @@ -281,6 +281,160 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring52.version} + + + + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring53.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring53.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring53.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring53.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring53.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring53.version} + + + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring53.version} + + + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring53.version} + + + + spring-tx + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring53.version} + + + + spring-tx + mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version} + mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring53.version} + + + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring53.version} + + + + spring + mvn:javax.websocket/javax.websocket-api/1.1 + mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6 + mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2 + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring53.version} + + + + spring-jdbc + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring53.version} + + + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring53.version} + + + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring53.version} + + + + spring + mvn:javax.servlet/javax.servlet-api/3.1.0 + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring53.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring53.version} + + + + mvn:javax.websocket/javax.websocket-api/1.1 + spring-web + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring53.version} + + + + + + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring60.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring60.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring60.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring60.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring60.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring60.version} + + + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring60.version} + + + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring60.version} + + + + spring-tx + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring60.version} + + + + spring-tx + mvn:jakarta.jms/jakarta.jms-api/3.1.0 + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring60.version} + + + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring60.version} + + + + + + spring-jdbc + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring60.version} + + + + + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring60.version} + + + + spring + mvn:jakarta.servlet/jakarta.servlet-api/5.0.0 + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring60.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring60.version} + + + + mvn:javax.websocket/javax.websocket-api/1.1 + spring-web + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring60.version} + + @@ -310,9 +464,9 @@ pax-web-jsp pax-web-war - spring-jdbc - spring-tx - spring-web + spring-jdbc + spring-tx + spring-web mvn:javax.annotation/javax.annotation-api/1.3 mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version} @@ -328,9 +482,9 @@ pax-web-jsp pax-web-war - spring-jdbc - spring-tx - spring-web + spring-jdbc + spring-tx + spring-web mvn:javax.annotation/javax.annotation-api/1.3 mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version} @@ -346,9 +500,9 @@ pax-web-jsp pax-web-war - spring-jdbc - spring-tx - spring-web + spring-jdbc + spring-tx + spring-web mvn:javax.annotation/javax.annotation-api/${javax.annotation.version} mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version} @@ -361,4 +515,40 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security55.version} + + pax-web-jsp + pax-web-war + spring-jdbc + spring-tx + spring-web + mvn:javax.annotation/javax.annotation-api/${javax.annotation.version} + mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} + mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version} + mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security56.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security56.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security56.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security56.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security56.version} + + + + pax-web-jsp + pax-web-war + spring-jdbc + spring-tx + spring-web + mvn:javax.annotation/javax.annotation-api/${javax.annotation.version} + mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} + mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version} + mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security57.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security57.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security57.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security57.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security57.version} + + diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml index b62e41829b2..3e6848b43c5 100644 --- a/assemblies/features/spring/pom.xml +++ b/assemblies/features/spring/pom.xml @@ -158,7 +158,7 @@ file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 1.8 + 17 framework diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml index 43d00e9aad8..555750c4df8 100644 --- a/assemblies/features/spring/src/main/feature/feature.xml +++ b/assemblies/features/spring/src/main/feature/feature.xml @@ -22,117 +22,109 @@ mvn:org.apache.karaf.features/standard/${project.version}/xml/features - + - + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring53.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring53.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring53.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring53.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring53.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring53.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring61.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring61.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring61.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring61.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring61.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring61.version} - - spring - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring53.version} + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring61.version} - - spring - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring53.version} + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring61.version} - - spring-tx - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring53.version} + + spring-tx + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring61.version} - - spring-tx - mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version} - mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring53.version} + + spring-tx + mvn:jakarta.jms/jakarta.jms-api/3.1.0 + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring61.version} - - spring - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring53.version} + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring61.version} - - spring + - - spring-jdbc - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring53.version} + + spring-jdbc + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring61.version} - - spring - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring53.version} + - - spring - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring53.version} + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring61.version} - - spring - mvn:javax.servlet/javax.servlet-api/3.1.0 - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring53.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring53.version} + + spring + mvn:jakarta.servlet/jakarta.servlet-api/5.0.0 + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring61.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring61.version} - + mvn:javax.websocket/javax.websocket-api/1.1 - spring-web - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring53.version} + spring-web + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring61.version} - + pax-web-jsp pax-web-war - spring-jdbc - spring-tx - spring-web - mvn:javax.annotation/javax.annotation-api/${javax.annotation.version} - mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} - mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version} - mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security56.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security56.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security56.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security56.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security56.version} - - - - pax-web-jsp - pax-web-war - spring-jdbc - spring-tx - spring-web + spring-jdbc + spring-tx + spring-web mvn:javax.annotation/javax.annotation-api/${javax.annotation.version} mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version} mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} + mvn:io.micrometer/micrometer-commons/1.12.4 + mvn:io.micrometer/micrometer-observation/1.12.4 + mvn:jakarta.annotation/jakarta.annotation-api/2.1.1 + mvn:jakarta.servlet/jakarta.servlet-api/6.0.0 + mvn:jakarta.servlet.jsp/jakarta.servlet.jsp-api/3.1.1 + mvn:jakarta.el/jakarta.el-api/5.0.1 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security57.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security57.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security57.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security57.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security57.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security62.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security62.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security62.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security62.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security62.version} diff --git a/itests/test/pom.xml b/itests/test/pom.xml index b0e19c9a2aa..05fa79471ba 100644 --- a/itests/test/pom.xml +++ b/itests/test/pom.xml @@ -317,6 +317,8 @@ ${spring43.version} ${spring52.version} ${spring53.version} + ${spring60.version} + ${spring61.version} ${spring.security31.version} ${spring.security42.version} ${spring.security53.version} @@ -324,6 +326,7 @@ ${spring.security55.version} ${spring.security56.version} ${spring.security57.version} + ${spring.security62.version} ${activemq.version} ${project.version} file:src/test/resources/controlled-exam.properties @@ -381,6 +384,8 @@ ${spring43.version} ${spring52.version} ${spring53.version} + ${spring60.version} + ${spring61.version} ${spring.security31.version} ${spring.security42.version} ${spring.security53.version} @@ -388,6 +393,7 @@ ${spring.security55.version} ${spring.security56.version} ${spring.security57.version} + ${spring.security62.version} ${activemq.version} diff --git a/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java b/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java index bae38913de7..fde688fb2e6 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java @@ -29,6 +29,8 @@ public Option[] config() { KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring43.version", System.getProperty("spring43.version")), KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring52.version", System.getProperty("spring52.version")), KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring53.version", System.getProperty("spring53.version")), + KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring60.version", System.getProperty("spring60.version")), + KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring61.version", System.getProperty("spring61.version")), KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security31.version", System.getProperty("spring.security31.version")), KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security42.version", System.getProperty("spring.security42.version")), KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security53.version", System.getProperty("spring.security53.version")), @@ -36,6 +38,7 @@ public Option[] config() { KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security55.version", System.getProperty("spring.security55.version")), KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security56.version", System.getProperty("spring.security56.version")), KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security57.version", System.getProperty("spring.security57.version")), + KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "spring.security62.version", System.getProperty("spring.security62.version")), KarafDistributionOption.editConfigurationFilePut("etc/system.properties", "activemq.version", System.getProperty("activemq.version")) }; return Stream.of(super.config(), options).flatMap(Stream::of).toArray(Option[]::new); diff --git a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring53FeaturesTest.java b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring53FeaturesTest.java index 2d1c4f21991..866f932d479 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring53FeaturesTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring53FeaturesTest.java @@ -16,14 +16,36 @@ import org.apache.karaf.itests.BaseTest; 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 Spring53FeaturesTest extends BaseTest { + @Configuration + public Option[] config() { + String version = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf"); + List - - mvn:org.codehaus.woodstox/stax2-api/4.2.1 - mvn:com.fasterxml.woodstox/woodstox-core/6.2.8 + + mvn:org.codehaus.woodstox/stax2-api/4.2.2 + mvn:com.fasterxml.woodstox/woodstox-core/6.4.0 From 79cd039ff446b585b90db8b03fdc99aeda9528d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 16 Jan 2025 18:19:42 +0100 Subject: [PATCH 132/440] KARAF-7935: Upgrade to Pax Logging 2.2.8 (cherry picked from commit 2814c9f467c0c72fdfce85ffdf464e1f44c47390) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c54e6e56a3..c4d2eeed266 100644 --- a/pom.xml +++ b/pom.xml @@ -307,7 +307,7 @@ 1.1.4 4.13.5 - 2.2.7 + 2.2.8 1.5.1 1.8.5 2.6.15 From c3ca2ac7a29527f14163b17157b8c768e8cf1073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 16 Jan 2025 18:08:44 +0100 Subject: [PATCH 133/440] KARAF-7936: Upgrade to Pax URL 2.6.16 (cherry picked from commit 4dd1d53e4e66d552b26355ff2ac9168869ca32a2) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c4d2eeed266..a7bddd502be 100644 --- a/pom.xml +++ b/pom.xml @@ -310,7 +310,7 @@ 2.2.8 1.5.1 1.8.5 - 2.6.15 + 2.6.16 8.0.29 9.4.56.v20240826 3.0.0 From bc96612718050d141f24628cf9fd16b3b95daa27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 16 Jan 2025 18:21:22 +0100 Subject: [PATCH 134/440] KARAF-7934: Upgrade to Pax Web 8.0.30 (cherry picked from commit f5c84f2cb36dbe5e5f2c9f8ffedf0c75af89be0c) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a7bddd502be..af4acbe5b78 100644 --- a/pom.xml +++ b/pom.xml @@ -311,8 +311,8 @@ 1.5.1 1.8.5 2.6.16 - 8.0.29 - 9.4.56.v20240826 + 8.0.30 + 9.4.57.v20241219 3.0.0 1.5.7 1.1.3 From a63c631443f1745f587e418a51bb015cdccdabd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Fri, 17 Jan 2025 18:31:39 +0100 Subject: [PATCH 135/440] KARAF-7938: Fix LICENSE/NOTICE in distributions (cherry picked from commit a3ab61c194ae62ee86c1ab41dea55f758697634c) --- LICENSE | 281 +------------- NOTICE | 62 +--- assemblies/apache-karaf-minimal/pom.xml | 9 +- .../src/main/distribution/LICENSE | 330 +++++++++++++++++ .../src/main/distribution/NOTICE | 30 ++ .../src/main/distribution/README.md | 65 ++++ assemblies/apache-karaf/pom.xml | 9 +- .../src/main/distribution/LICENSE | 342 ++++++++++++++++++ .../apache-karaf/src/main/distribution/NOTICE | 45 +++ .../src/main/distribution/README.md | 65 ++++ .../distribution/text/etc/keys.properties | 31 -- client/pom.xml | 1 + client/src/main/resources/META-INF/LICENSE | 205 +++++++++++ client/src/main/resources/META-INF/NOTICE | 9 + .../core/src/main/resources/META-INF/LICENSE | 223 ++++++++++++ .../core/src/main/resources/META-INF/NOTICE | 16 + http/src/main/resources/META-INF/NOTICE | 11 + .../src/main/resources/META-INF/NOTICE | 11 + .../core/src/main/resources/META-INF/LICENSE | 208 +++++++++++ maven/core/src/main/resources/META-INF/NOTICE | 8 + scheduler/src/main/resources/META-INF/LICENSE | 205 +++++++++++ .../src/main/resources/META-INF/LICENSE | 208 +++++++++++ .../src/main/resources/META-INF/NOTICE | 12 + .../src/main/resources/META-INF/LICENSE | 205 +++++++++++ .../src/main/resources/META-INF/NOTICE | 12 + .../src/main/resources/META-INF/LICENSE | 205 +++++++++++ .../src/main/resources/META-INF/LICENSE | 205 +++++++++++ .../src/main/resources/META-INF/NOTICE | 18 + wrapper/src/main/resources/META-INF/LICENSE | 256 +++++++++++++ wrapper/src/main/resources/META-INF/NOTICE | 8 + 30 files changed, 2918 insertions(+), 377 deletions(-) create mode 100644 assemblies/apache-karaf-minimal/src/main/distribution/LICENSE create mode 100644 assemblies/apache-karaf-minimal/src/main/distribution/NOTICE create mode 100644 assemblies/apache-karaf-minimal/src/main/distribution/README.md create mode 100644 assemblies/apache-karaf/src/main/distribution/LICENSE create mode 100644 assemblies/apache-karaf/src/main/distribution/NOTICE create mode 100644 assemblies/apache-karaf/src/main/distribution/README.md delete mode 100644 assemblies/apache-karaf/src/main/distribution/text/etc/keys.properties create mode 100644 client/src/main/resources/META-INF/LICENSE create mode 100644 client/src/main/resources/META-INF/NOTICE create mode 100644 features/core/src/main/resources/META-INF/LICENSE create mode 100644 features/core/src/main/resources/META-INF/NOTICE create mode 100644 http/src/main/resources/META-INF/NOTICE create mode 100644 jaas/modules/src/main/resources/META-INF/NOTICE create mode 100644 maven/core/src/main/resources/META-INF/LICENSE create mode 100644 maven/core/src/main/resources/META-INF/NOTICE create mode 100644 scheduler/src/main/resources/META-INF/LICENSE create mode 100644 services/coordinator/src/main/resources/META-INF/LICENSE create mode 100644 services/coordinator/src/main/resources/META-INF/NOTICE create mode 100644 services/eventadmin/src/main/resources/META-INF/LICENSE create mode 100644 services/eventadmin/src/main/resources/META-INF/NOTICE create mode 100644 services/staticcm/src/main/resources/META-INF/LICENSE create mode 100644 webconsole/console/src/main/resources/META-INF/LICENSE create mode 100644 webconsole/console/src/main/resources/META-INF/NOTICE create mode 100644 wrapper/src/main/resources/META-INF/LICENSE create mode 100644 wrapper/src/main/resources/META-INF/NOTICE diff --git a/LICENSE b/LICENSE index b36a53db890..f3344e31003 100644 --- a/LICENSE +++ b/LICENSE @@ -201,275 +201,12 @@ See the License for the specific language governing permissions and limitations under the License. -For asm: -Copyright (c) 2000-2011 INRIA, France Telecom -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - -For equinox: -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). -ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. -A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone -acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate -modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not -derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale -of its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, -distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code -and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer -the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to -the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such -addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall -not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no -assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property -rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity -based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses -granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights -needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, -it is Recipient's responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, -to grant the copyright license set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including -warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and -fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any -other party; and - -iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain -it in a reasonable manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably -allows subsequent Recipients to identify the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners -and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner which does not create potential -liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, -such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor -("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, -lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused -by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a -commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any -actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly -notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and -cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is -then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties -related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. -Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to -those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, -the Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for -determining the appropriateness of using and distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, -compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption -of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS -GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity -or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, -such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) -alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes -such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date -such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or -conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of -such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and -distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement -and any licenses granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the -Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right -to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement -Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse -Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new -version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may -always be distributed subject to the version of the Agreement under which it was received. In addition, after a new -version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) -under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or -licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, -estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States -of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the -cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - -For Java Service Wrapper: -Copyright (c) 1999, 2006 Tanuki Software, Inc. - -Permission is hereby granted, free of charge, to any person -obtaining a copy of the Java Service Wrapper and associated -documentation files (the "Software"), to deal in the Software -without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sub-license, -and/or sell copies of the Software, and to permit persons to -whom the Software is furnished to do so, subject to the -following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - - -Portions of the Software have been derived from source code -developed by Silver Egg Technology under the following license: - -BEGIN Silver Egg Techology License ----------------------------------- - - Copyright (c) 2001 Silver Egg Technology - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sub-license, and/or - sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - -END Silver Egg Techology License ------------------------------------- - -For slf4j -Copyright (c) 2004-2011 QOS.ch -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +Codehaus Jackson (https://github.com/codehaus/jackson) +* audit/src/main/java/org/apache/karaf/audit/util/NumberOutput.java + +Apache Logging Log4j (https://logging.apache.org/log4j) +* log/src/main/java/org/apache/karaf/log/core/internal/layout/DateTimeDateFormat.java +* log/src/main/java/org/apache/karaf/log/core/internal/layout/FormattingInfo.java +* log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java +* log/src/main/java/org/apache/karaf/log/core/internal/layout/AbsoluteTimeDateFormat.java +* log/src/main/java/org/apache/karaf/log/core/internal/layout/ISO8601DateFormat.java diff --git a/NOTICE b/NOTICE index 535ac654677..4489adba4d0 100644 --- a/NOTICE +++ b/NOTICE @@ -1,65 +1,5 @@ Apache Karaf -Copyright 2010-2023 The Apache Software Foundation - -I. Included Software +Copyright 2025 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -Licensed under the Apache License 2.0. - -This product includes software developed at -The OSGi Alliance (http://www.osgi.org/). -Copyright (c) OSGi Alliance (2000, 2010). -Licensed under the Apache License 2.0. - -This product includes software developed at -OW2 (http://www.ow2.org/). -Licensed under the BSD License. - -This product includes software developed at -OPS4J (http://www.ops4j.org/). -Licensed under the Apache License 2.0. - -This product includes software developed at -Eclipse Foundation (http://www.eclipse.org/). -Licensed under the EPL. - -This product includes software written by -Antony Lesuisse. -Licensed under Public Domain. - -II. Used Software - -This product uses software developed at -FUSE Source (http://www.fusesource.org/). -Licensed under the Apache License 2.0. - -This product uses software developed at -AOP Alliance (http://aopalliance.sourceforge.net/). -Licensed under the Public Domain. - -This product uses software developed at -Tanuki Software (http://www.tanukisoftware.com/). -Licensed under the Apache License 2.0. - -This product uses software developed at -Jasypt (http://jasypt.sourceforge.net/). -Licensed under the Apache License 2.0. - -This product uses software developed at -JLine (https://github.com/jline/). -Licensed under the BSD License. - -This product uses software developed at -SLF4J (http://www.slf4j.org/). -Licensed under the MIT License. - -This product uses software developed at -SpringSource (http://www.springsource.org/). -Licensed under the Apache License 2.0. - -III. License Summary -- Apache License 2.0 -- BSD License -- EPL License -- MIT License diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml index 469c29d80ec..a8480486796 100644 --- a/assemblies/apache-karaf-minimal/pom.xml +++ b/assemblies/apache-karaf-minimal/pom.xml @@ -88,15 +88,8 @@ - ${project.basedir}/../.. + ${project.basedir}/src/main/distribution false - - README.md - BUILDING.md - RELEASE* - LICENSE - NOTICE - diff --git a/assemblies/apache-karaf-minimal/src/main/distribution/LICENSE b/assemblies/apache-karaf-minimal/src/main/distribution/LICENSE new file mode 100644 index 00000000000..d1e1dc0bda8 --- /dev/null +++ b/assemblies/apache-karaf-minimal/src/main/distribution/LICENSE @@ -0,0 +1,330 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +This product bundles OSGi, which is available under +"The Apache License 2.0". For details, see https://github.com/osgi/osgi/blob/main/LICENSE + +This product bundles istack-common-runtime 3.0.12, which is available under +"Eclipse Distribution License 1.0". For details, see https://www.eclipse.org/org/documents/edl-v10.html + +This product bundles jakarta.xml.bind-api 2.3.3, which is available under +"Eclipse Distribution License 1.0". For details, see https://www.eclipse.org/org/documents/edl-v10.html + +This product bundles javax.annotation-api 1.3.2, +which is dual licensed and available under the (unmodified) CDDL 1.1 (Common Development and Distribution License) +or under the (unmodified) GPL v2 (GNU General Public License). +An original copy of the license agreement can be found at: https://github.com/javaee/javax.annotation/blob/master/LICENSE + +This product bundles jaxb-runtime 2.3.9, which is available under +"Eclipse Distribution License 1.0". For details, see https://www.eclipse.org/org/documents/edl-v10.html + +This product bundles txw2 2.3.9, which is available under +"Eclipse Distribution License 1.0". For details, see https://www.eclipse.org/org/documents/edl-v10.html + +This product bundles bcpkix-jdk18on 1.78.1, which is available under +"MIT License". For details, see https://www.bouncycastle.org/about/license/ + +This product bundles bcprov-jdk18on 1.78.1, which is available under +"MIT License". For details, see https://www.bouncycastle.org/about/license/ + +This product bundles bcutil-jdk18on 1.78.1, which is available undr +"MIT License". For details, see https://www.bouncycastle.org/about/license/ + +This product bundles org.eclipse.osgi 3.18.0, which is available under +"Eclipse Public License 2.0". For details, see https://projects.eclipse.org/projects/eclipse.equinox. + +This product bundles org.eclipse.equinox.region 1.5.300, which is available under +"Eclipse Public License 2.0". For details, see https://projects.eclipse.org/projects/eclipse.equinox. + +This product bundles jansi 2.4.1, which is available under +"The Apache License 2.0". For details, see https://github.com/fusesource/jansi/blob/master/license.txt + +This product bundles hibernate-validator-osgi-karaf-features 7.0.2 (xml), which is available under +"The Apache License 2.0". + +This product bundles jline 3.21.0, which is available under +"3-clause BSD" license. For details, see https://github.com/jline/jline3/blob/jline-parent-3.21.0/LICENSE.txt + +This product bundles pax-logging-api 2.2.8, pax-logging-log4j2 2.2.8, which are available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.logging/blob/main/LICENSE.txt + +This product bundles pax-url-aether 2.6.16, which are available under +"The Apache Liense 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.url/blob/main/LICENSE + +This product bundles pax-web-features 8.0.30 xml, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.web/blob/main/LICENSE + +This product bundles asm 9.7.1, which is available under +"3-clause BSD" license. For details, see https://gitlab.ow2.org/asm/asm/-/blob/master/LICENSE.txt?ref_type=heads + +This product bundles slf4j-api 2.0.12, which is available under +"MIT License". For details, see https://github.com/qos-ch/slf4j/blob/master/LICENSE.txt + +This product bundles jackson-core 2.18.2, which is available under +"The Apache License 2.0". For details, see https://github.com/FasterXML/jackson-core/blob/jackson-core-2.18.2/LICENSE + +This product bundles jackson-annotations 2.18.2, which is available under +"The Apache License 2.0". For details, see https://github.com/FasterXML/jackson-annotations/blob/jackson-annotations-2.18.2/LICENSE + +This product bundles jackson-databind 2.18.2, which is available under +"The Apache License 2.0". For details, see https://github.com/FasterXML/jackson-databind/blob/jackson-databind-2.18.2/LICENSE + +This product bundles OPS4J Base 1.5.1, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.base/blob/base-1.5.1/LICENSE + +This product bundles OPS4J Pax Swissbox 1.8.5, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.swissbox/blob/swissbox-1.8.5/LICENSE + +This product bundles Tanukisoft Wrapper 3.2.3, which is available under +"The Apache License 2.0". +Permission is hereby granted, free of charge, to any person +obtaining a copy of the Java Service Wrapper and associated +documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sub-license, +and/or sell copies of the Software, and to permit persons to +whom the Software is furnished to do so, subject to the +following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + + +Portions of the Software have been derived from source code +developed by Silver Egg Technology under the following license: + +BEGIN Silver Egg Techology License ----------------------------------- + + Copyright (c) 2001 Silver Egg Technology + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sub-license, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +END Silver Egg Techology License ------------------------------------- \ No newline at end of file diff --git a/assemblies/apache-karaf-minimal/src/main/distribution/NOTICE b/assemblies/apache-karaf-minimal/src/main/distribution/NOTICE new file mode 100644 index 00000000000..d0ac03dd098 --- /dev/null +++ b/assemblies/apache-karaf-minimal/src/main/distribution/NOTICE @@ -0,0 +1,30 @@ +Apache Karaf +Copyright 2025 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +This product includes software developed at +OPS4J (http://www.ops4j.org/). +Licensed under the Apache License 2.0. + +Apache MINA SSHD +Copyright 2008-2021 The Apache Software Foundation + +OSGi Specfication Project (https://projects.eclipse.org/projects/technology.osgi) +OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and +the Eclipse Logo are registered trademarks of the Eclipse Foundation. +All content is the property of the respective authors or their employers. +For more information regarding authorship of content, please consult the +listed source code repository logs. + +ASM: a very small and fast Java bytecode manipulation framework +Copyright (c) 2000-2011 INRIA, France Telecom +All rights reserved. + +Slf4j +Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) +All rights reserved. + +TanukiSoft Wrapper +Copyright (c) 1999, 2006 Tanuki Software, Inc. \ No newline at end of file diff --git a/assemblies/apache-karaf-minimal/src/main/distribution/README.md b/assemblies/apache-karaf-minimal/src/main/distribution/README.md new file mode 100644 index 00000000000..8d7d2f99345 --- /dev/null +++ b/assemblies/apache-karaf-minimal/src/main/distribution/README.md @@ -0,0 +1,65 @@ + + +# Apache Karaf - Minimal Distribution + +[Apache Karaf](https://karaf.apache.org) is a modulith runtime, supporting several frameworks and programming model (REST/API, web, spring boot, ...). +It provides turnkey features that you can directly leverage without effort, packaged as mutable or immutable application. + +## Overview + +* **Hot deployment**: Karaf supports hot deployment of applications (in the deploy directory). +* **Dynamic configuration**: Karaf uses a central location (etc directory) for configuration + (in different format, properties, json) and can be plug on existing configuration backend. +* **Logging System**: using a centralized logging back end supported by Log4J, Karaf + supports a number of different APIs (JDK 1.4, JCL, SLF4J, Avalon, Tomcat, ...) +* **Provisioning**: Provisioning of libraries or applications can be done through a number of + different ways, by which they will be downloaded locally, installed and started. It interacts + with the resolver to automatically install the required components. +* **Extensible Shell console**: Karaf features a nice text console where you can manage the + services, install new applications or libraries and manage their state. This shell is easily + extensible by deploying new commands dynamically along with new features or applications. +* **Remote access**: use any SSH client to connect to the kernel and issue commands in the console +* **Security & ACL** framework based on JAAS providing complete RBAC solution. +* **Managing instances**: Karaf provides simple commands for managing instances of Karaf. + You can easily create, delete, start and stop instances of Karaf through the console. +* **Enterprise features**: Karaf provides a bunch of enterprise features that you can use in your applications (JDBC, JPA, JTA, JMS, ...). +* **HTTP Service**: Karaf provides a full features web container, allowing you to deploy your web applications. +* **REST & Services**: Karaf supports different service frameworks as Apache CXF allowing you to easily implements your services. +* **Karaf Extensions**: Karaf project is a complete ecosystem. The runtime can be extended by other Karaf subprojects such as Karaf Decanter, Karaf Cellar, Karaf Cave, ... +* **Third Party Extensions**: Karaf is a supported runtime for a lot of other projects as [Apache Camel](https://camel.apache.org), and much more. + +The minimal distribution includes the minimal features neeeded to start Apache Karaf. You are free to install the features you need +depending of your needs. + +## Prerequisites + +Apache Karaf requires a Java SE 11 or higher to run. + +## Start + +To start the Karaf runtime, run: + +``` +bin/karaf +``` + +## Documentation + +Please take a look on the [documentation](https://karaf.apache.org/manual/latest/) for details. \ No newline at end of file diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index 2e900768681..833c0e3fbd1 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -97,11 +97,6 @@ ${project.basedir}/../.. false - README.md - BUILDING.md - RELEASE* - LICENSE - NOTICE examples/**/* @@ -109,6 +104,10 @@ **/*.iml + + ${project.basedir}/src/main/distribution + false + diff --git a/assemblies/apache-karaf/src/main/distribution/LICENSE b/assemblies/apache-karaf/src/main/distribution/LICENSE new file mode 100644 index 00000000000..e01929d759b --- /dev/null +++ b/assemblies/apache-karaf/src/main/distribution/LICENSE @@ -0,0 +1,342 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +This product bundles OSGi, which is available under +"The Apache License 2.0". For details, see https://github.com/osgi/osgi/blob/main/LICENSE + +This product bundles istack-common-runtime 3.0.12, which is available under +"Eclipse Distribution License 1.0". For details, see https://www.eclipse.org/org/documents/edl-v10.html + +This product bundles jakarta.xml.bind-api 2.3.3, which is available under +"Eclipse Distribution License 1.0". For details, see https://www.eclipse.org/org/documents/edl-v10.html + +This product bundles javax.annotation-api 1.3.2, +which is dual licensed and available under the (unmodified) CDDL 1.1 (Common Development and Distribution License) +or under the (unmodified) GPL v2 (GNU General Public License). +An original copy of the license agreement can be found at: https://github.com/javaee/javax.annotation/blob/master/LICENSE + +This product bundles jaxb-runtime 2.3.9, which is available under +"Eclipse Distribution License 1.0". For details, see https://www.eclipse.org/org/documents/edl-v10.html + +This product bundles txw2 2.3.9, which is available under +"Eclipse Distribution License 1.0". For details, see https://www.eclipse.org/org/documents/edl-v10.html + +This product bundles bcpkix-jdk18on 1.78.1, which is available under +"MIT License". For details, see https://www.bouncycastle.org/about/license/ + +This product bundles bcprov-jdk18on 1.78.1, which is available under +"MIT License". For details, see https://www.bouncycastle.org/about/license/ + +This product bundles bcutil-jdk18on 1.78.1, which is available undr +"MIT License". For details, see https://www.bouncycastle.org/about/license/ + +This product bundles org.eclipse.osgi 3.18.0, which is available under +"Eclipse Public License 2.0". For details, see https://projects.eclipse.org/projects/eclipse.equinox. + +This product bundles org.eclipse.equinox.region 1.5.300, which is available under +"Eclipse Public License 2.0". For details, see https://projects.eclipse.org/projects/eclipse.equinox. + +This product bundles jansi 2.4.1, which is available under +"The Apache License 2.0". For details, see https://github.com/fusesource/jansi/blob/master/license.txt + +This product bundles hibernate-validator-osgi-karaf-features 7.0.2 (xml), which is available under +"The Apache License 2.0". + +This product bundles jline 3.21.0, which is available under +"3-clause BSD" license. For details, see https://github.com/jline/jline3/blob/jline-parent-3.21.0/LICENSE.txt + +This product bundles pax-cdi-features 1.1.4 xml, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.cdi/blob/master/LICENSE + +This product bundles pax-jdbc-features 1.5.7 xml, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.jdbc/blob/main/LICENSE + +This product bundles pax-jms-features 1.1.3 xml, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.jms/blob/main/LICENSE + +This product bundles pax-logging-api 2.2.8, pax-logging-log4j2 2.2.8, pax-logging-logback 2.2.8, which are available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.logging/blob/main/LICENSE.txt + +This product bundles pax-transx-features 0.5.4 xml, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.transx/blob/main/LICENSE + +This product bundles pax-url-aether 2.6.16, pax-url-wrap 2.6.16, which are available under +"The Apache Liense 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.url/blob/main/LICENSE + +This product bundles pax-web-features 8.0.30 xml, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.web/blob/main/LICENSE + +This product bundles asm 9.7.1, which is available under +"3-clause BSD" license. For details, see https://gitlab.ow2.org/asm/asm/-/blob/master/LICENSE.txt?ref_type=heads + +This product bundles slf4j 2.0.12, which is available under +"MIT License". For details, see https://github.com/qos-ch/slf4j/blob/master/LICENSE.txt + +This product bundles jackson-core 2.18.2, which is available under +"The Apache License 2.0". For details, see https://github.com/FasterXML/jackson-core/blob/jackson-core-2.18.2/LICENSE + +This product bundles jackson-annotations 2.18.2, which is available under +"The Apache License 2.0". For details, see https://github.com/FasterXML/jackson-annotations/blob/jackson-annotations-2.18.2/LICENSE + +This product bundles jackson-databind 2.18.2, which is available under +"The Apache License 2.0". For details, see https://github.com/FasterXML/jackson-databind/blob/jackson-databind-2.18.2/LICENSE + +This product bundles OPS4J Base 1.5.1, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.base/blob/base-1.5.1/LICENSE + +This product bundles OPS4J Pax Swissbox 1.8.5, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.swissbox/blob/swissbox-1.8.5/LICENSE + +This product bundles Tanukisoft Wrapper 3.2.3, which is available under +"The Apache License 2.0". +Permission is hereby granted, free of charge, to any person +obtaining a copy of the Java Service Wrapper and associated +documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sub-license, +and/or sell copies of the Software, and to permit persons to +whom the Software is furnished to do so, subject to the +following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + + +Portions of the Software have been derived from source code +developed by Silver Egg Technology under the following license: + +BEGIN Silver Egg Techology License ----------------------------------- + + Copyright (c) 2001 Silver Egg Technology + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sub-license, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +END Silver Egg Techology License ------------------------------------- \ No newline at end of file diff --git a/assemblies/apache-karaf/src/main/distribution/NOTICE b/assemblies/apache-karaf/src/main/distribution/NOTICE new file mode 100644 index 00000000000..04d5a81f437 --- /dev/null +++ b/assemblies/apache-karaf/src/main/distribution/NOTICE @@ -0,0 +1,45 @@ +Apache Karaf +Copyright 2025 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +This product includes software developed at +OPS4J (http://www.ops4j.org/). +Licensed under the Apache License 2.0. + +Apache Aries +Copyright 2009-2011 The Apache Software Foundation + +Apache OpenJPA +Copyright 2006-2021 The Apache Software Foundation + +Apache MINA SSHD +Copyright 2008-2021 The Apache Software Foundation + +OSGi Specfication Project (https://projects.eclipse.org/projects/technology.osgi) +OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and +the Eclipse Logo are registered trademarks of the Eclipse Foundation. +All content is the property of the respective authors or their employers. +For more information regarding authorship of content, please consult the +listed source code repository logs. + +OPS4J Pax CDI - Reactor Project +Copyright 2012 OPS4J.org + +OPS4J Pax JDBC +Copyright 2012 OPS4J.org + +OPS4J Pax Transx +Copyright 2017 OPS4J.org + +ASM: a very small and fast Java bytecode manipulation framework +Copyright (c) 2000-2011 INRIA, France Telecom +All rights reserved. + +Slf4j +Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) +All rights reserved. + +TanukiSoft Wrapper +Copyright (c) 1999, 2006 Tanuki Software, Inc. \ No newline at end of file diff --git a/assemblies/apache-karaf/src/main/distribution/README.md b/assemblies/apache-karaf/src/main/distribution/README.md new file mode 100644 index 00000000000..a73ba5b9f05 --- /dev/null +++ b/assemblies/apache-karaf/src/main/distribution/README.md @@ -0,0 +1,65 @@ + + +# Apache Karaf - Standard Distribution + +[Apache Karaf](https://karaf.apache.org) is a modulith runtime, supporting several frameworks and programming model (REST/API, web, spring boot, ...). +It provides turnkey features that you can directly leverage without effort, packaged as mutable or immutable application. + +## Overview + +* **Hot deployment**: Karaf supports hot deployment of applications (in the deploy directory). +* **Dynamic configuration**: Karaf uses a central location (etc directory) for configuration + (in different format, properties, json) and can be plug on existing configuration backend. +* **Logging System**: using a centralized logging back end supported by Log4J, Karaf + supports a number of different APIs (JDK 1.4, JCL, SLF4J, Avalon, Tomcat, ...) +* **Provisioning**: Provisioning of libraries or applications can be done through a number of + different ways, by which they will be downloaded locally, installed and started. It interacts + with the resolver to automatically install the required components. +* **Extensible Shell console**: Karaf features a nice text console where you can manage the + services, install new applications or libraries and manage their state. This shell is easily + extensible by deploying new commands dynamically along with new features or applications. +* **Remote access**: use any SSH client to connect to the kernel and issue commands in the console +* **Security & ACL** framework based on JAAS providing complete RBAC solution. +* **Managing instances**: Karaf provides simple commands for managing instances of Karaf. + You can easily create, delete, start and stop instances of Karaf through the console. +* **Enterprise features**: Karaf provides a bunch of enterprise features that you can use in your applications (JDBC, JPA, JTA, JMS, ...). +* **HTTP Service**: Karaf provides a full features web container, allowing you to deploy your web applications. +* **REST & Services**: Karaf supports different service frameworks as Apache CXF allowing you to easily implements your services. +* **Karaf Extensions**: Karaf project is a complete ecosystem. The runtime can be extended by other Karaf subprojects such as Karaf Decanter, Karaf Cellar, Karaf Cave, ... +* **Third Party Extensions**: Karaf is a supported runtime for a lot of other projects as [Apache Camel](https://camel.apache.org), and much more. + +The standard distribution includes the "classic" features covering most of the use cases. You can install additional features depending +of your needs. + +## Prerequisites + +Apache Karaf requires a Java SE 11 or higher to run. + +## Start + +To start the Karaf runtime, run: + +``` +bin/karaf +``` + +## Documentation + +Please take a look on the [documentation](https://karaf.apache.org/manual/latest/) for details. \ No newline at end of file diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/keys.properties b/assemblies/apache-karaf/src/main/distribution/text/etc/keys.properties deleted file mode 100644 index bdec342a222..00000000000 --- a/assemblies/apache-karaf/src/main/distribution/text/etc/keys.properties +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ - -# -# This file contains the valid users who can log into Karaf. Each line have to be of -# the format: -# -# USER=KEY,ROLE1,ROLE2,... -# -# All users and roles entered in this file are available after Karaf startup -# and modifiable via the JAAS command group. These users reside in a JAAS domain -# with the name "karaf".. -# -#karaf=AAAAB3NzaC1kc3MAAACBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAAAAFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QAAAIEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoAAACBAKKSU2PFl/qOLxIwmBZPPIcJshVe7bVUpFvyl3BbJDow8rXfskl8wO63OzP/qLmcJM0+JbcRU/53JjTuyk31drV2qxhIOsLDC9dGCWj47Y7TyhPdXh/0dthTRBy6bqGtRPxGa7gJov1xm/UuYYXPIUR/3x9MAZvZ5xvE0kYXO+rx,_g_:admingroup -_g_\:admingroup = group,admin,manager,viewer,systembundles,ssh \ No newline at end of file diff --git a/client/pom.xml b/client/pom.xml index a6d263bb0ca..1ee6bf49f13 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -111,4 +111,5 @@ + diff --git a/client/src/main/resources/META-INF/LICENSE b/client/src/main/resources/META-INF/LICENSE new file mode 100644 index 00000000000..97520cb99b5 --- /dev/null +++ b/client/src/main/resources/META-INF/LICENSE @@ -0,0 +1,205 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +This product bundles slf4j-api 2.0.12, which is available under +"MIT License". For details, see https://github.com/qos-ch/slf4j/blob/master/LICENSE.txt \ No newline at end of file diff --git a/client/src/main/resources/META-INF/NOTICE b/client/src/main/resources/META-INF/NOTICE new file mode 100644 index 00000000000..f2e008a7848 --- /dev/null +++ b/client/src/main/resources/META-INF/NOTICE @@ -0,0 +1,9 @@ +Apache Karaf :: Client +Copyright 2007-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Slf4j +Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) +All rights reserved. \ No newline at end of file diff --git a/features/core/src/main/resources/META-INF/LICENSE b/features/core/src/main/resources/META-INF/LICENSE new file mode 100644 index 00000000000..0667e3699a8 --- /dev/null +++ b/features/core/src/main/resources/META-INF/LICENSE @@ -0,0 +1,223 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +This product bundles OSGi, which is available under +"The Apache License 2.0". For details, see https://github.com/osgi/osgi/blob/main/LICENSE + +This product bundles jackson-core 2.18.2, which is available under +"The Apache License 2.0". For details, see https://github.com/FasterXML/jackson-core/blob/jackson-core-2.18.2/LICENSE + +This product bundles jackson-annotations 2.18.2, which is available under +"The Apache License 2.0". For details, see https://github.com/FasterXML/jackson-annotations/blob/jackson-annotations-2.18.2/LICENSE + +This product bundles jackson-databind 2.18.2, which is available under +"The Apache License 2.0". For details, see https://github.com/FasterXML/jackson-databind/blob/jackson-databind-2.18.2/LICENSE + +This product bundles org.eclipse.equinox.region 1.5.300, which is available under +"Eclipse Public License 2.0". For details, see https://projects.eclipse.org/projects/eclipse.equinox. + +This product bundles OPS4J Base 1.5.1, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.base/blob/base-1.5.1/LICENSE + +This product bundles OPS4J Pax Swissbox 1.8.5, which is available under +"The Apache License 2.0". For details, see https://github.com/ops4j/org.ops4j.pax.swissbox/blob/swissbox-1.8.5/LICENSE \ No newline at end of file diff --git a/features/core/src/main/resources/META-INF/NOTICE b/features/core/src/main/resources/META-INF/NOTICE new file mode 100644 index 00000000000..f3efa39c672 --- /dev/null +++ b/features/core/src/main/resources/META-INF/NOTICE @@ -0,0 +1,16 @@ +Apache Karaf :: Features :: Core +Copyright 2007-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +This product includes software developed at +OPS4J (http://www.ops4j.org/). +Licensed under the Apache License 2.0. + +OSGi Specfication Project (https://projects.eclipse.org/projects/technology.osgi) +OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and +the Eclipse Logo are registered trademarks of the Eclipse Foundation. +All content is the property of the respective authors or their employers. +For more information regarding authorship of content, please consult the +listed source code repository logs. \ No newline at end of file diff --git a/http/src/main/resources/META-INF/NOTICE b/http/src/main/resources/META-INF/NOTICE new file mode 100644 index 00000000000..c258f3cb60e --- /dev/null +++ b/http/src/main/resources/META-INF/NOTICE @@ -0,0 +1,11 @@ +Apache Karaf :: HTTP :: Core +Copyright 2007-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Apache Commons Codec +Copyright 2002-2025 The Apache Software Foundation + +Apache HttpComponents Client +Copyright 1999-2023 The Apache Software Foundation \ No newline at end of file diff --git a/jaas/modules/src/main/resources/META-INF/NOTICE b/jaas/modules/src/main/resources/META-INF/NOTICE new file mode 100644 index 00000000000..266c04f5ccb --- /dev/null +++ b/jaas/modules/src/main/resources/META-INF/NOTICE @@ -0,0 +1,11 @@ +Apache Karaf :: JAAS :: Modules +Copyright 2007-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Apache Commons Codec +Copyright 2002-2025 The Apache Software Foundation + +Apache HttpComponents Client +Copyright 1999-2023 The Apache Software Foundation \ No newline at end of file diff --git a/maven/core/src/main/resources/META-INF/LICENSE b/maven/core/src/main/resources/META-INF/LICENSE new file mode 100644 index 00000000000..ce2d4308d09 --- /dev/null +++ b/maven/core/src/main/resources/META-INF/LICENSE @@ -0,0 +1,208 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +This project bundles Codehaus Plexus, which is available under +"The Apache License 2.0". For details, see https://codehaus-plexus.github.io/licenses.html + +This project bundles Sonatype Plexus (sisu), which is available under +"Eclipse Public License 1.0". For details, see https://github.com/sonatype/sisu/blob/master/LICENSE.txt \ No newline at end of file diff --git a/maven/core/src/main/resources/META-INF/NOTICE b/maven/core/src/main/resources/META-INF/NOTICE new file mode 100644 index 00000000000..38898821d8a --- /dev/null +++ b/maven/core/src/main/resources/META-INF/NOTICE @@ -0,0 +1,8 @@ +Apache Karaf :: Maven :: Core +Copyright 2007-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Apache Maven +Copyright 2001-2019 The Apache Software Foundation \ No newline at end of file diff --git a/scheduler/src/main/resources/META-INF/LICENSE b/scheduler/src/main/resources/META-INF/LICENSE new file mode 100644 index 00000000000..723c11defb8 --- /dev/null +++ b/scheduler/src/main/resources/META-INF/LICENSE @@ -0,0 +1,205 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +This project bundles Quartz, which is available under +"The Apache License 2.0". For details, see https://github.com/quartz-scheduler/quartz/blob/main/LICENSE.txt diff --git a/services/coordinator/src/main/resources/META-INF/LICENSE b/services/coordinator/src/main/resources/META-INF/LICENSE new file mode 100644 index 00000000000..e3d2cb91c9f --- /dev/null +++ b/services/coordinator/src/main/resources/META-INF/LICENSE @@ -0,0 +1,208 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +This product bundles OSGi, which is available under +"The Apache License 2.0". For details, see https://github.com/osgi/osgi/blob/main/LICENSE + +This product bundles Eclipse Equinox, which is available under +"Eclipse Public License 2.0". For details, see https://projects.eclipse.org/projects/eclipse.equinox. \ No newline at end of file diff --git a/services/coordinator/src/main/resources/META-INF/NOTICE b/services/coordinator/src/main/resources/META-INF/NOTICE new file mode 100644 index 00000000000..4a4c9b0f118 --- /dev/null +++ b/services/coordinator/src/main/resources/META-INF/NOTICE @@ -0,0 +1,12 @@ +Apache Karaf :: OSGi Services :: Coordinator +Copyright 2007-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +OSGi Specfication Project (https://projects.eclipse.org/projects/technology.osgi) +OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and +the Eclipse Logo are registered trademarks of the Eclipse Foundation. +All content is the property of the respective authors or their employers. +For more information regarding authorship of content, please consult the +listed source code repository logs. \ No newline at end of file diff --git a/services/eventadmin/src/main/resources/META-INF/LICENSE b/services/eventadmin/src/main/resources/META-INF/LICENSE new file mode 100644 index 00000000000..172348a2461 --- /dev/null +++ b/services/eventadmin/src/main/resources/META-INF/LICENSE @@ -0,0 +1,205 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +This product bundles OSGi, which is available under +"The Apache License 2.0". For details, see https://github.com/osgi/osgi/blob/main/LICENSE \ No newline at end of file diff --git a/services/eventadmin/src/main/resources/META-INF/NOTICE b/services/eventadmin/src/main/resources/META-INF/NOTICE new file mode 100644 index 00000000000..98544e3863d --- /dev/null +++ b/services/eventadmin/src/main/resources/META-INF/NOTICE @@ -0,0 +1,12 @@ +Apache Karaf :: OSGi Services :: EventAdmin +Copyright 2007-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +OSGi Specfication Project (https://projects.eclipse.org/projects/technology.osgi) +OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and +the Eclipse Logo are registered trademarks of the Eclipse Foundation. +All content is the property of the respective authors or their employers. +For more information regarding authorship of content, please consult the +listed source code repository logs. \ No newline at end of file diff --git a/services/staticcm/src/main/resources/META-INF/LICENSE b/services/staticcm/src/main/resources/META-INF/LICENSE new file mode 100644 index 00000000000..172348a2461 --- /dev/null +++ b/services/staticcm/src/main/resources/META-INF/LICENSE @@ -0,0 +1,205 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +This product bundles OSGi, which is available under +"The Apache License 2.0". For details, see https://github.com/osgi/osgi/blob/main/LICENSE \ No newline at end of file diff --git a/webconsole/console/src/main/resources/META-INF/LICENSE b/webconsole/console/src/main/resources/META-INF/LICENSE new file mode 100644 index 00000000000..172348a2461 --- /dev/null +++ b/webconsole/console/src/main/resources/META-INF/LICENSE @@ -0,0 +1,205 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +This product bundles OSGi, which is available under +"The Apache License 2.0". For details, see https://github.com/osgi/osgi/blob/main/LICENSE \ No newline at end of file diff --git a/webconsole/console/src/main/resources/META-INF/NOTICE b/webconsole/console/src/main/resources/META-INF/NOTICE new file mode 100644 index 00000000000..00d0f37fba0 --- /dev/null +++ b/webconsole/console/src/main/resources/META-INF/NOTICE @@ -0,0 +1,18 @@ +Apache Karaf :: Web Console :: Console +Copyright 2007-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Apache Commons IO +Copyright 2002-2025 The Apache Software Foundation + +Apache Commons FileUpload +Copyright 2002-2025 The Apache Software Foundation + +OSGi Specfication Project (https://projects.eclipse.org/projects/technology.osgi) +OSGi and the OSGi Logo are trademarks of the Eclipse Foundation. Eclipse and +the Eclipse Logo are registered trademarks of the Eclipse Foundation. +All content is the property of the respective authors or their employers. +For more information regarding authorship of content, please consult the +listed source code repository logs. \ No newline at end of file diff --git a/wrapper/src/main/resources/META-INF/LICENSE b/wrapper/src/main/resources/META-INF/LICENSE new file mode 100644 index 00000000000..bcbfbaae7c0 --- /dev/null +++ b/wrapper/src/main/resources/META-INF/LICENSE @@ -0,0 +1,256 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +This product bundles Tanukisoft Wrapper 3.2.3, which is available under +"The Apache License 2.0". +Permission is hereby granted, free of charge, to any person +obtaining a copy of the Java Service Wrapper and associated +documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sub-license, +and/or sell copies of the Software, and to permit persons to +whom the Software is furnished to do so, subject to the +following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + + +Portions of the Software have been derived from source code +developed by Silver Egg Technology under the following license: + +BEGIN Silver Egg Techology License ----------------------------------- + + Copyright (c) 2001 Silver Egg Technology + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sub-license, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +END Silver Egg Techology License ------------------------------------- \ No newline at end of file diff --git a/wrapper/src/main/resources/META-INF/NOTICE b/wrapper/src/main/resources/META-INF/NOTICE new file mode 100644 index 00000000000..7f2de31a449 --- /dev/null +++ b/wrapper/src/main/resources/META-INF/NOTICE @@ -0,0 +1,8 @@ +Apache Karaf :: Wrapper :: Core +Copyright 2007-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +TanukiSoft Wrapper +Copyright (c) 1999, 2006 Tanuki Software, Inc. \ No newline at end of file From 59f6f525acfb0a81458dc9525314d5370c556581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Mon, 20 Jan 2025 07:27:52 +0100 Subject: [PATCH 136/440] Upgrade RELEASE-NOTES.md in preparation for 4.4.7 release --- RELEASE-NOTES.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 5ad9c063666..6be6409ee67 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -40,6 +40,7 @@ This is a maintenance release on the 4.4.x series. It includes a bunch of depend * [KARAF-7882] - Upgrade to Pax URL 2.6.15 * [KARAF-7892] - Start felix fileinstall before configadmin to avoid race condition * [KARAF-7893] - InstanceTest should use random generated instance name + * [KARAF-7938] - Fix distributions LICENSE and NOTICE #### Dependency upgrade * [KARAF-7831] - Upgrade to easymock 5.3.0 @@ -64,6 +65,7 @@ This is a maintenance release on the 4.4.x series. It includes a bunch of depend * [KARAF-7876] - Upgrade to sshd 2.14.0 * [KARAF-7877] - Upgrade to ASM 9.7.1 * [KARAF-7879] - Upgrade to pax-web 8.0.29 + * [KARAF-7888] - Stepup snakeyaml, undertow, xnio and woodstox to solve CVEs * [KARAF-7890] - Upgrade to commons-io 2.18.0 * [KARAF-7894] - Upgrade to Spring 6.1.14 * [KARAF-7895] - Upgrade to Spring Security 5.7.12_3 @@ -92,6 +94,10 @@ This is a maintenance release on the 4.4.x series. It includes a bunch of depend * [KARAF-7924] - Upgrade to asciidoctor-maven-plugin 3.1.1 * [KARAF-7925] - Upgrade to maven-archetype-plugin 3.3.1 * [KARAF-7926] - Upgrade to Jackson 2.18.2 + * [KARAF-7933] - Upgrade to woodstox-core 6.4.0 + * [KARAF-7934] - Upgrade to Pax Web 8.0.30 + * [KARAF-7935] - Upgrade to Pax Logging 2.2.8 + * [KARAF-7936] - Upgrade to Pax URL 2.6.16 #### Dependency * [KARAF-7852] - Upgrade to commons-pool2 2.12.0 From e6f498fdd7b33a4f1382369b01e1998fb782810a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Mon, 20 Jan 2025 07:40:21 +0100 Subject: [PATCH 137/440] Skip tests in the deploy profile --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index af4acbe5b78..5bfa43f96e7 100644 --- a/pom.xml +++ b/pom.xml @@ -964,6 +964,9 @@ deploy true + true + true + true deploy From f402b707dede971d3decce6b2d988b7985a784ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Mon, 20 Jan 2025 11:07:24 +0100 Subject: [PATCH 138/440] Down overrride invoker.skip in karaf-maven-plugin --- tooling/karaf-maven-plugin/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index 593f336b5f6..fd3914d5a0a 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -35,7 +35,6 @@ ${basedir}/../../etc/appended-resources - 0.00 0.00 From 24a23f458c74a06e676f928e66d6a68c96a6ff58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Mon, 20 Jan 2025 11:20:48 +0100 Subject: [PATCH 139/440] [maven-release-plugin] prepare release karaf-4.4.7 --- archetypes/assembly/pom.xml | 2 +- archetypes/blueprint/pom.xml | 2 +- archetypes/bundle/pom.xml | 2 +- archetypes/command/pom.xml | 2 +- archetypes/feature/pom.xml | 2 +- archetypes/kar/pom.xml | 2 +- archetypes/pom.xml | 2 +- assemblies/apache-karaf-minimal/pom.xml | 2 +- assemblies/apache-karaf/pom.xml | 2 +- assemblies/features/base/pom.xml | 2 +- assemblies/features/enterprise/pom.xml | 2 +- assemblies/features/framework/pom.xml | 2 +- assemblies/features/pom.xml | 2 +- assemblies/features/specs/pom.xml | 2 +- assemblies/features/spring-legacy/pom.xml | 2 +- assemblies/features/spring/pom.xml | 2 +- assemblies/features/standard/pom.xml | 2 +- assemblies/features/static/pom.xml | 2 +- assemblies/pom.xml | 2 +- audit/pom.xml | 2 +- bom/pom.xml | 2 +- bundle/blueprintstate/pom.xml | 2 +- bundle/core/pom.xml | 2 +- bundle/pom.xml | 2 +- bundle/springstate/pom.xml | 2 +- client/pom.xml | 2 +- config/command/pom.xml | 2 +- config/core/pom.xml | 2 +- config/pom.xml | 2 +- deployer/blueprint/pom.xml | 2 +- deployer/features/pom.xml | 2 +- deployer/kar/pom.xml | 2 +- deployer/pom.xml | 2 +- deployer/spring/pom.xml | 2 +- deployer/wrap/pom.xml | 2 +- diagnostic/boot/pom.xml | 2 +- diagnostic/core/pom.xml | 2 +- diagnostic/pom.xml | 2 +- docker/pom.xml | 2 +- event/pom.xml | 2 +- .../karaf-blueprint-example-client/pom.xml | 2 +- .../karaf-blueprint-example-common/pom.xml | 2 +- .../karaf-blueprint-example-features/pom.xml | 2 +- .../karaf-blueprint-example-provider/pom.xml | 2 +- examples/karaf-blueprint-example/pom.xml | 2 +- examples/karaf-branding-example/pom.xml | 2 +- .../karaf-bundle-example-client/pom.xml | 2 +- .../karaf-bundle-example-common/pom.xml | 2 +- .../karaf-bundle-example-features/pom.xml | 2 +- .../karaf-bundle-example-provider/pom.xml | 2 +- examples/karaf-bundle-example/pom.xml | 2 +- .../karaf-camel-example-blueprint/pom.xml | 2 +- .../karaf-camel-example-features/pom.xml | 2 +- .../karaf-camel-example/karaf-camel-example-java/pom.xml | 2 +- examples/karaf-camel-example/pom.xml | 2 +- examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml | 2 +- .../karaf-cdi-example/karaf-cdi-example-consumer/pom.xml | 2 +- .../karaf-cdi-example/karaf-cdi-example-features/pom.xml | 2 +- .../karaf-cdi-example/karaf-cdi-example-provider/pom.xml | 2 +- examples/karaf-cdi-example/pom.xml | 2 +- .../karaf-command-example/karaf-command-example-api/pom.xml | 2 +- .../karaf-command-example-command/pom.xml | 2 +- .../karaf-command-example-features/pom.xml | 2 +- .../karaf-command-example-provider/pom.xml | 2 +- examples/karaf-command-example/pom.xml | 2 +- .../karaf-config-example-blueprint/pom.xml | 2 +- .../karaf-config-example-features/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/karaf-config-example-scr/pom.xml | 2 +- .../karaf-config-example-static/pom.xml | 2 +- examples/karaf-config-example/pom.xml | 2 +- examples/karaf-deployer-example/pom.xml | 2 +- .../karaf-docker-example/karaf-docker-example-app/pom.xml | 2 +- .../karaf-docker-example-dynamic-dist/pom.xml | 2 +- .../karaf-docker-example-static-dist/pom.xml | 2 +- examples/karaf-docker-example/pom.xml | 2 +- examples/karaf-dump-example/pom.xml | 2 +- .../karaf-graphql-example/karaf-graphql-example-api/pom.xml | 2 +- .../karaf-graphql-example-commands/pom.xml | 2 +- .../karaf-graphql-example-core/pom.xml | 2 +- .../karaf-graphql-example-features/pom.xml | 2 +- .../karaf-graphql-example-scr-servlet/pom.xml | 2 +- .../karaf-graphql-example-websocket/pom.xml | 2 +- examples/karaf-graphql-example/pom.xml | 2 +- .../karaf-http-resource-example-features/pom.xml | 2 +- .../karaf-http-resource-example-whiteboard/pom.xml | 2 +- examples/karaf-http-resource-example/pom.xml | 2 +- examples/karaf-itest-example/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml | 2 +- .../karaf-jaas-example/karaf-jaas-example-features/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml | 2 +- examples/karaf-jaas-example/pom.xml | 2 +- examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-command/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-features/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml | 2 +- examples/karaf-jdbc-example/pom.xml | 2 +- .../karaf-jms-example/karaf-jms-example-command/pom.xml | 2 +- .../karaf-jms-example/karaf-jms-example-features/pom.xml | 2 +- examples/karaf-jms-example/pom.xml | 2 +- .../karaf-jpa-example/karaf-jpa-example-command/pom.xml | 2 +- .../karaf-jpa-example/karaf-jpa-example-features/pom.xml | 2 +- .../karaf-jpa-example-provider-api/pom.xml | 2 +- .../pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint-hibernate/pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint-openjpa/pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-eclipselink/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-hibernate/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-openjpa/pom.xml | 2 +- .../karaf-jpa-example-provider-ds/pom.xml | 2 +- .../karaf-jpa-example/karaf-jpa-example-provider/pom.xml | 2 +- examples/karaf-jpa-example/pom.xml | 2 +- .../karaf-log-appender-example-core/pom.xml | 2 +- .../karaf-log-appender-example-features/pom.xml | 2 +- examples/karaf-log-appender-example/pom.xml | 2 +- .../karaf-maven-example-run-bundle/pom.xml | 2 +- .../karaf-maven-example/karaf-maven-example-run/pom.xml | 2 +- examples/karaf-maven-example/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-api/pom.xml | 2 +- .../karaf-mbean-example-blueprint/pom.xml | 2 +- .../karaf-mbean-example-features/pom.xml | 2 +- .../karaf-mbean-example-provider/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-scr/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-simple/pom.xml | 2 +- examples/karaf-mbean-example/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-api/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-command/pom.xml | 2 +- .../karaf-redis-example-features/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-service/pom.xml | 2 +- examples/karaf-redis-example/pom.xml | 2 +- examples/karaf-rest-example/karaf-rest-example-api/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-blueprint/pom.xml | 2 +- .../karaf-rest-example-client-cxf/pom.xml | 2 +- .../karaf-rest-example-client-http/pom.xml | 2 +- .../karaf-rest-example-client-jersey/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-client/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-features/pom.xml | 2 +- examples/karaf-rest-example/karaf-rest-example-scr/pom.xml | 2 +- .../karaf-rest-example-whiteboard/pom.xml | 2 +- examples/karaf-rest-example/pom.xml | 2 +- .../karaf-scheduler-example-features/pom.xml | 2 +- .../karaf-scheduler-example-runnable/pom.xml | 2 +- examples/karaf-scheduler-example/pom.xml | 2 +- examples/karaf-scr-example/karaf-scr-example-api/pom.xml | 2 +- examples/karaf-scr-example/karaf-scr-example-client/pom.xml | 2 +- .../karaf-scr-example/karaf-scr-example-features/pom.xml | 2 +- .../karaf-scr-example/karaf-scr-example-provider/pom.xml | 2 +- examples/karaf-scr-example/pom.xml | 2 +- .../karaf-servlet-example-annotation/pom.xml | 2 +- .../karaf-servlet-example-blueprint/pom.xml | 2 +- .../karaf-servlet-example-features/pom.xml | 2 +- .../karaf-servlet-example-registration/pom.xml | 2 +- .../karaf-servlet-example/karaf-servlet-example-scr/pom.xml | 2 +- .../karaf-servlet-example-upload/pom.xml | 2 +- examples/karaf-servlet-example/pom.xml | 2 +- examples/karaf-soap-example/karaf-soap-example-api/pom.xml | 2 +- .../karaf-soap-example/karaf-soap-example-blueprint/pom.xml | 2 +- .../karaf-soap-example/karaf-soap-example-client/pom.xml | 2 +- .../karaf-soap-example/karaf-soap-example-features/pom.xml | 2 +- examples/karaf-soap-example/karaf-soap-example-scr/pom.xml | 2 +- examples/karaf-soap-example/pom.xml | 2 +- .../karaf-url-namespace-handler-example-core/pom.xml | 2 +- .../karaf-url-namespace-handler-example-features/pom.xml | 2 +- examples/karaf-url-namespace-handler-example/pom.xml | 2 +- .../karaf-war-example/karaf-war-example-features/pom.xml | 2 +- examples/karaf-war-example/karaf-war-example-webapp/pom.xml | 2 +- examples/karaf-war-example/pom.xml | 2 +- examples/karaf-websocket-example/pom.xml | 2 +- examples/pom.xml | 2 +- features/command/pom.xml | 2 +- features/core/pom.xml | 2 +- features/extension/pom.xml | 2 +- features/pom.xml | 2 +- http/pom.xml | 2 +- instance/pom.xml | 2 +- itests/common/pom.xml | 2 +- itests/pom.xml | 2 +- itests/test/pom.xml | 2 +- jaas/blueprint/config/pom.xml | 2 +- jaas/blueprint/jasypt/pom.xml | 2 +- jaas/blueprint/pom.xml | 2 +- jaas/boot/pom.xml | 2 +- jaas/command/pom.xml | 2 +- jaas/config/pom.xml | 2 +- jaas/jasypt/pom.xml | 2 +- jaas/modules/pom.xml | 2 +- jaas/pom.xml | 2 +- jaas/spring-security-crypto/pom.xml | 2 +- jdbc/pom.xml | 2 +- jms/pom.xml | 2 +- jndi/pom.xml | 2 +- kar/pom.xml | 2 +- log/pom.xml | 2 +- main/pom.xml | 2 +- management/pom.xml | 2 +- management/server/pom.xml | 2 +- manual/pom.xml | 2 +- maven/core/pom.xml | 2 +- maven/pom.xml | 2 +- obr/pom.xml | 2 +- package/pom.xml | 2 +- pom.xml | 6 +++--- profile/pom.xml | 2 +- scheduler/pom.xml | 2 +- scr/management/pom.xml | 2 +- scr/pom.xml | 2 +- scr/state/pom.xml | 2 +- service/core/pom.xml | 2 +- service/guard/pom.xml | 2 +- service/pom.xml | 2 +- services/coordinator/pom.xml | 2 +- services/eventadmin/pom.xml | 2 +- services/interceptor/api/pom.xml | 2 +- services/interceptor/impl/pom.xml | 2 +- services/interceptor/pom.xml | 2 +- services/pom.xml | 2 +- services/staticcm/pom.xml | 2 +- shell/commands/pom.xml | 2 +- shell/console/pom.xml | 2 +- shell/core/pom.xml | 2 +- shell/groovy/pom.xml | 2 +- shell/pom.xml | 2 +- shell/ssh/pom.xml | 2 +- shell/table/pom.xml | 2 +- specs/activator/pom.xml | 2 +- specs/java.xml.ws/pom.xml | 2 +- specs/java.xml/pom.xml | 2 +- specs/locator/pom.xml | 2 +- specs/pom.xml | 2 +- subsystem/pom.xml | 2 +- system/pom.xml | 2 +- tooling/karaf-maven-plugin/pom.xml | 2 +- tooling/karaf-services-maven-plugin/pom.xml | 2 +- tooling/pom.xml | 2 +- tooling/utils/pom.xml | 2 +- util/pom.xml | 2 +- web/pom.xml | 2 +- webconsole/console/pom.xml | 2 +- webconsole/features/pom.xml | 2 +- webconsole/gogo/pom.xml | 2 +- webconsole/http/pom.xml | 2 +- webconsole/instance/pom.xml | 2 +- webconsole/pom.xml | 2 +- wrapper/pom.xml | 2 +- 248 files changed, 250 insertions(+), 250 deletions(-) diff --git a/archetypes/assembly/pom.xml b/archetypes/assembly/pom.xml index 83e044e6cff..750be12f515 100644 --- a/archetypes/assembly/pom.xml +++ b/archetypes/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7-SNAPSHOT + 4.4.7 org.apache.karaf.archetypes diff --git a/archetypes/blueprint/pom.xml b/archetypes/blueprint/pom.xml index bcb9b11c8cd..a08c622cb65 100644 --- a/archetypes/blueprint/pom.xml +++ b/archetypes/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/archetypes/bundle/pom.xml b/archetypes/bundle/pom.xml index 54a89a38fd0..9ed7293c0e3 100644 --- a/archetypes/bundle/pom.xml +++ b/archetypes/bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/archetypes/command/pom.xml b/archetypes/command/pom.xml index f54a4a9d7c4..10c10a4335f 100644 --- a/archetypes/command/pom.xml +++ b/archetypes/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/archetypes/feature/pom.xml b/archetypes/feature/pom.xml index 4a54d9e69d0..5ae6e0e6007 100644 --- a/archetypes/feature/pom.xml +++ b/archetypes/feature/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/archetypes/kar/pom.xml b/archetypes/kar/pom.xml index 0bdbbdace01..4c8ed669979 100644 --- a/archetypes/kar/pom.xml +++ b/archetypes/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 22d4b51d5e1..a91cd50a196 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml index a8480486796..1d9ddfca1c5 100644 --- a/assemblies/apache-karaf-minimal/pom.xml +++ b/assemblies/apache-karaf-minimal/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index 833c0e3fbd1..131505c2210 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml index 559dd7fddf6..861a329aea4 100644 --- a/assemblies/features/base/pom.xml +++ b/assemblies/features/base/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml index d23fccc7c7e..ad4b1720a64 100644 --- a/assemblies/features/enterprise/pom.xml +++ b/assemblies/features/enterprise/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml index f47988627bc..dd01fa4b115 100644 --- a/assemblies/features/framework/pom.xml +++ b/assemblies/features/framework/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/features/pom.xml b/assemblies/features/pom.xml index 542256e9185..2b6ef4886e4 100644 --- a/assemblies/features/pom.xml +++ b/assemblies/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/features/specs/pom.xml b/assemblies/features/specs/pom.xml index 2cd6a6668b4..47b096bb938 100644 --- a/assemblies/features/specs/pom.xml +++ b/assemblies/features/specs/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/features/spring-legacy/pom.xml b/assemblies/features/spring-legacy/pom.xml index 4ea8dd01a46..7b506bce7aa 100644 --- a/assemblies/features/spring-legacy/pom.xml +++ b/assemblies/features/spring-legacy/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml index 612e9d2b91a..a3010d9d3ec 100644 --- a/assemblies/features/spring/pom.xml +++ b/assemblies/features/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index e5bf5a70365..7b697ad01e4 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/features/static/pom.xml b/assemblies/features/static/pom.xml index d2833dec269..46c3426884c 100644 --- a/assemblies/features/static/pom.xml +++ b/assemblies/features/static/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/assemblies/pom.xml b/assemblies/pom.xml index 41b48f8b551..f20a5c955cc 100644 --- a/assemblies/pom.xml +++ b/assemblies/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/audit/pom.xml b/audit/pom.xml index 0f4419cefda..6369a401a7c 100644 --- a/audit/pom.xml +++ b/audit/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index 043119329ff..ddb6d484645 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/bundle/blueprintstate/pom.xml b/bundle/blueprintstate/pom.xml index 411d0a4df0c..284b9ab1362 100644 --- a/bundle/blueprintstate/pom.xml +++ b/bundle/blueprintstate/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml index 08564abc3c2..b6516708ed4 100644 --- a/bundle/core/pom.xml +++ b/bundle/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/bundle/pom.xml b/bundle/pom.xml index dbbb2639179..cf548811268 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/bundle/springstate/pom.xml b/bundle/springstate/pom.xml index a1d308b37cc..3d634c7735a 100644 --- a/bundle/springstate/pom.xml +++ b/bundle/springstate/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index 1ee6bf49f13..df1b6263260 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/config/command/pom.xml b/config/command/pom.xml index b7581c0ac56..f36036b4b6e 100644 --- a/config/command/pom.xml +++ b/config/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.config config - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/config/core/pom.xml b/config/core/pom.xml index affd48add95..1ad168b2533 100644 --- a/config/core/pom.xml +++ b/config/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.config config - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/config/pom.xml b/config/pom.xml index 3052803bcd6..f76c8b760b4 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml index 65bbbf84a3a..e14e940b599 100644 --- a/deployer/blueprint/pom.xml +++ b/deployer/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml index 8d2c01d0951..5e387900cfe 100644 --- a/deployer/features/pom.xml +++ b/deployer/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/deployer/kar/pom.xml b/deployer/kar/pom.xml index 45336ea7ce4..3aeb67ba092 100644 --- a/deployer/kar/pom.xml +++ b/deployer/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/deployer/pom.xml b/deployer/pom.xml index 188636dc7a5..1344e6e8524 100644 --- a/deployer/pom.xml +++ b/deployer/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/deployer/spring/pom.xml b/deployer/spring/pom.xml index 71193d64274..68c067878fa 100644 --- a/deployer/spring/pom.xml +++ b/deployer/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/deployer/wrap/pom.xml b/deployer/wrap/pom.xml index 108f9f08f4e..561c9845c07 100644 --- a/deployer/wrap/pom.xml +++ b/deployer/wrap/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/diagnostic/boot/pom.xml b/diagnostic/boot/pom.xml index a620c46943a..7bd029132e5 100644 --- a/diagnostic/boot/pom.xml +++ b/diagnostic/boot/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.diagnostic diagnostic - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml index 039eba22553..be35ea6199a 100644 --- a/diagnostic/core/pom.xml +++ b/diagnostic/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.diagnostic diagnostic - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/diagnostic/pom.xml b/diagnostic/pom.xml index 1bdb3eb49db..bd592ae72b8 100644 --- a/diagnostic/pom.xml +++ b/diagnostic/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/docker/pom.xml b/docker/pom.xml index efc6345d0d6..f6db334e796 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/event/pom.xml b/event/pom.xml index c2aa7e64e3f..68f3be93d6d 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml index a835319369c..d5cf694b2b0 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml index c12875016a5..ceb22c47de2 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml index f507ebb89f0..ebc0f2a771f 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml index 398813f9ff8..dbdd146e087 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-blueprint-example/pom.xml b/examples/karaf-blueprint-example/pom.xml index 050e8ff417a..4e34fd0db87 100644 --- a/examples/karaf-blueprint-example/pom.xml +++ b/examples/karaf-blueprint-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-branding-example/pom.xml b/examples/karaf-branding-example/pom.xml index 5e2d3e9f3fa..a6c30c8acf9 100644 --- a/examples/karaf-branding-example/pom.xml +++ b/examples/karaf-branding-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml index cbdc8785786..11c4ee13dfd 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml index 2319f735b08..c7991c86066 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml index 794639fe13a..03c33be7f7a 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml index 0fed10e85bf..f2de93da71b 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-bundle-example/pom.xml b/examples/karaf-bundle-example/pom.xml index 76b6893c32f..ed3674256db 100644 --- a/examples/karaf-bundle-example/pom.xml +++ b/examples/karaf-bundle-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml b/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml index b7b417a81be..c10b4c1ebd1 100644 --- a/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-features/pom.xml b/examples/karaf-camel-example/karaf-camel-example-features/pom.xml index 3fb26c5f065..013d9a6c8e9 100644 --- a/examples/karaf-camel-example/karaf-camel-example-features/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml index cfd368ef09d..34a3c83641e 100644 --- a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-camel-example/pom.xml b/examples/karaf-camel-example/pom.xml index 1d3d14b6b9e..b3e1eee23dd 100644 --- a/examples/karaf-camel-example/pom.xml +++ b/examples/karaf-camel-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml index 5b418be5f27..fd8a0095b6d 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml index 98531e807b4..306c425ed14 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml index e2e1747fda5..114aeb7937f 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml index acf45a64fd4..ea437152caa 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-cdi-example/pom.xml b/examples/karaf-cdi-example/pom.xml index 76d78b55266..e408ab89590 100644 --- a/examples/karaf-cdi-example/pom.xml +++ b/examples/karaf-cdi-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-api/pom.xml b/examples/karaf-command-example/karaf-command-example-api/pom.xml index e1035b23c09..f788875ab7e 100644 --- a/examples/karaf-command-example/karaf-command-example-api/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-command/pom.xml b/examples/karaf-command-example/karaf-command-example-command/pom.xml index 70c79cb64b2..22ff2c3ff4e 100644 --- a/examples/karaf-command-example/karaf-command-example-command/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-features/pom.xml b/examples/karaf-command-example/karaf-command-example-features/pom.xml index 4b23e06436b..fbd18885cab 100644 --- a/examples/karaf-command-example/karaf-command-example-features/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-provider/pom.xml b/examples/karaf-command-example/karaf-command-example-provider/pom.xml index 391591e6981..5cdbe84a36d 100644 --- a/examples/karaf-command-example/karaf-command-example-provider/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-command-example/pom.xml b/examples/karaf-command-example/pom.xml index 6c8f05804bd..4ecbce39bd2 100644 --- a/examples/karaf-command-example/pom.xml +++ b/examples/karaf-command-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml b/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml index fbbbf91f639..c89f9d45ab5 100644 --- a/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-features/pom.xml b/examples/karaf-config-example/karaf-config-example-features/pom.xml index 9f18d2675cc..abf9339732f 100644 --- a/examples/karaf-config-example/karaf-config-example-features/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-listener/pom.xml b/examples/karaf-config-example/karaf-config-example-listener/pom.xml index e4897ba8722..15046bbb9c4 100644 --- a/examples/karaf-config-example/karaf-config-example-listener/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-listener/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml b/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml index b0226baef03..a5c5fc5768c 100644 --- a/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-managed/pom.xml b/examples/karaf-config-example/karaf-config-example-managed/pom.xml index 1052ab46d19..6e6d78c5d12 100644 --- a/examples/karaf-config-example/karaf-config-example-managed/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-managed/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-scr/pom.xml b/examples/karaf-config-example/karaf-config-example-scr/pom.xml index 19fae39d714..ad89c5a557e 100644 --- a/examples/karaf-config-example/karaf-config-example-scr/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-static/pom.xml b/examples/karaf-config-example/karaf-config-example-static/pom.xml index 1b3d8087aad..8c3d97d9b16 100644 --- a/examples/karaf-config-example/karaf-config-example-static/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-static/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-config-example/pom.xml b/examples/karaf-config-example/pom.xml index eccf84d7d1a..4d99e8289cc 100644 --- a/examples/karaf-config-example/pom.xml +++ b/examples/karaf-config-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-deployer-example/pom.xml b/examples/karaf-deployer-example/pom.xml index cb9151a21da..54ad1c6e257 100644 --- a/examples/karaf-deployer-example/pom.xml +++ b/examples/karaf-deployer-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml index 1a2792a73c5..d31b84d5831 100644 --- a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml index 89dfe60f930..043625be88c 100644 --- a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml index 409460296b6..81c13f9faa6 100644 --- a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-docker-example/pom.xml b/examples/karaf-docker-example/pom.xml index b156f0f9c7b..f88d3497b2a 100644 --- a/examples/karaf-docker-example/pom.xml +++ b/examples/karaf-docker-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-dump-example/pom.xml b/examples/karaf-dump-example/pom.xml index a22e86e729d..f2b6fef893d 100644 --- a/examples/karaf-dump-example/pom.xml +++ b/examples/karaf-dump-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml index 41bf9a2ec8c..cf8ef12d1c4 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-graphql-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml index c9506bc0cb5..514e32c7d16 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-graphql-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml index de469a79ec4..5185d5864ae 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml index 5400a03e3d3..1270d7d6bae 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml index a224d06a118..16f92e4d9bf 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml index 17ccf972847..c9aafb753e1 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-graphql-example/pom.xml b/examples/karaf-graphql-example/pom.xml index 17a7b4f5688..c6554e0e16e 100644 --- a/examples/karaf-graphql-example/pom.xml +++ b/examples/karaf-graphql-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml b/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml index 7ed1ebe1e7c..0f69a6b127b 100644 --- a/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml +++ b/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-http-resource-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml b/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml index 93348b38f17..dcf251a7f1a 100644 --- a/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml +++ b/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-http-resource-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-http-resource-example/pom.xml b/examples/karaf-http-resource-example/pom.xml index eb912b971d0..467e0ed630a 100644 --- a/examples/karaf-http-resource-example/pom.xml +++ b/examples/karaf-http-resource-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-itest-example/pom.xml b/examples/karaf-itest-example/pom.xml index d1bc0ec95ef..296ce248cc5 100644 --- a/examples/karaf-itest-example/pom.xml +++ b/examples/karaf-itest-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml index e4cfa01081d..bcf68634fa5 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml index 0a738dd22c1..f63d364fa6f 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml index 997796ca1f3..0f6a77c5f89 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml index 9f0310152f9..dcf77abf621 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jaas-example/pom.xml b/examples/karaf-jaas-example/pom.xml index 23cac4af8cb..cde106305d0 100644 --- a/examples/karaf-jaas-example/pom.xml +++ b/examples/karaf-jaas-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml index e86c842bb63..bdc533f679e 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml index 398d07acf66..8915851690c 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml index 73a51c16be4..36a7081af99 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml index 44f6530ec03..a5b81120261 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jdbc-example/pom.xml b/examples/karaf-jdbc-example/pom.xml index 7ffab492a20..c372b59de92 100644 --- a/examples/karaf-jdbc-example/pom.xml +++ b/examples/karaf-jdbc-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml index 63fb17f190f..08241b74d48 100644 --- a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml +++ b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jms-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jms-example/karaf-jms-example-features/pom.xml b/examples/karaf-jms-example/karaf-jms-example-features/pom.xml index 91e32eecfda..928ca3c75b1 100644 --- a/examples/karaf-jms-example/karaf-jms-example-features/pom.xml +++ b/examples/karaf-jms-example/karaf-jms-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jms-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jms-example/pom.xml b/examples/karaf-jms-example/pom.xml index 11699434a10..bf8d896aa9f 100644 --- a/examples/karaf-jms-example/pom.xml +++ b/examples/karaf-jms-example/pom.xml @@ -25,7 +25,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml index edf97b50770..8c88a868044 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml index ff7ddd1010a..8704a9cf460 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml index a646b51afd9..7f47007ec9b 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml index 2616a995427..9a4f1e73f08 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml index 8416bda43bb..21e30f628f0 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml index f88aae66c60..bb19ab88d0b 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml index 7ccd0825cd9..ae2c70d5f5c 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml index 9e6cae42d13..62992cb94a8 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml index 3b8475b0f28..a9da3372b93 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml index 08a861dec49..653b9887d51 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml index ee072965d63..9c0a60787f4 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml index 88e48650c64..39fd5f0a016 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-jpa-example/pom.xml b/examples/karaf-jpa-example/pom.xml index fe48e7d760f..db1a50a2ddc 100644 --- a/examples/karaf-jpa-example/pom.xml +++ b/examples/karaf-jpa-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml b/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml index d2f8faab3c2..6bc94419628 100644 --- a/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml +++ b/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-log-appender-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml b/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml index 5f9e4be4b5c..4eed1e1b4f0 100644 --- a/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml +++ b/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-log-appender-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-log-appender-example/pom.xml b/examples/karaf-log-appender-example/pom.xml index 396aeae8469..f5283f840c9 100644 --- a/examples/karaf-log-appender-example/pom.xml +++ b/examples/karaf-log-appender-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml b/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml index f46344c3756..5af674f19e7 100644 --- a/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml +++ b/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-maven-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-maven-example/karaf-maven-example-run/pom.xml b/examples/karaf-maven-example/karaf-maven-example-run/pom.xml index d0325034f45..7ffb887cd88 100644 --- a/examples/karaf-maven-example/karaf-maven-example-run/pom.xml +++ b/examples/karaf-maven-example/karaf-maven-example-run/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-maven-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-maven-example/pom.xml b/examples/karaf-maven-example/pom.xml index c92bd08ab19..c06f0a21043 100644 --- a/examples/karaf-maven-example/pom.xml +++ b/examples/karaf-maven-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml index df444a50604..ba60a8433b9 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml index cf673a24511..da17e4c4f9c 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml index 16a2cf2c900..3195f6300e4 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml index f021e43b94d..4bccc73eadd 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml index eba26ef52a6..79babd4a019 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml index d1e69dbac0f..943bb0be04b 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-mbean-example/pom.xml b/examples/karaf-mbean-example/pom.xml index dfe313c6788..ee300488d37 100644 --- a/examples/karaf-mbean-example/pom.xml +++ b/examples/karaf-mbean-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-api/pom.xml b/examples/karaf-redis-example/karaf-redis-example-api/pom.xml index c68c61179a0..47847c135f6 100644 --- a/examples/karaf-redis-example/karaf-redis-example-api/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-command/pom.xml b/examples/karaf-redis-example/karaf-redis-example-command/pom.xml index 667c7c63a01..fe8a4231a24 100644 --- a/examples/karaf-redis-example/karaf-redis-example-command/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-features/pom.xml b/examples/karaf-redis-example/karaf-redis-example-features/pom.xml index 2c09e6adb2b..b400f9ba67b 100644 --- a/examples/karaf-redis-example/karaf-redis-example-features/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-service/pom.xml b/examples/karaf-redis-example/karaf-redis-example-service/pom.xml index 9b65ce028ea..64200ab4c1e 100644 --- a/examples/karaf-redis-example/karaf-redis-example-service/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-service/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-redis-example/pom.xml b/examples/karaf-redis-example/pom.xml index b2237ece6f0..7dfcd9a0be9 100644 --- a/examples/karaf-redis-example/pom.xml +++ b/examples/karaf-redis-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-api/pom.xml b/examples/karaf-rest-example/karaf-rest-example-api/pom.xml index 34d8571281e..3d03508fd56 100644 --- a/examples/karaf-rest-example/karaf-rest-example-api/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml index 38348737330..b67d647b264 100644 --- a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml index 045cd28bb55..4c9eecf8f3b 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml @@ -17,7 +17,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml index 34a6096e425..9ca74e82a94 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml index 0b45eb24fd4..59d85a20f11 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/pom.xml index 0787d7adcef..7b1aefbefa3 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-features/pom.xml b/examples/karaf-rest-example/karaf-rest-example-features/pom.xml index 529d605e530..4e345938859 100644 --- a/examples/karaf-rest-example/karaf-rest-example-features/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml index 7648528d6cd..60831e0269d 100644 --- a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml index 376b0a17b1b..d82422a4438 100644 --- a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-rest-example/pom.xml b/examples/karaf-rest-example/pom.xml index 652299e9c56..8784ab62bb7 100644 --- a/examples/karaf-rest-example/pom.xml +++ b/examples/karaf-rest-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml b/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml index 350688bc2c4..7dc1b8bff99 100644 --- a/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml +++ b/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scheduler-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml b/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml index 6c62fb15d8a..13cf3b48cc4 100644 --- a/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml +++ b/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scheduler-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-scheduler-example/pom.xml b/examples/karaf-scheduler-example/pom.xml index 4ad4cae2e7c..7a7bcd245a9 100644 --- a/examples/karaf-scheduler-example/pom.xml +++ b/examples/karaf-scheduler-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-api/pom.xml b/examples/karaf-scr-example/karaf-scr-example-api/pom.xml index 3a65df46f91..cbe5ea12279 100644 --- a/examples/karaf-scr-example/karaf-scr-example-api/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-client/pom.xml b/examples/karaf-scr-example/karaf-scr-example-client/pom.xml index 148e6a6e78a..c91461d6fcd 100644 --- a/examples/karaf-scr-example/karaf-scr-example-client/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-features/pom.xml b/examples/karaf-scr-example/karaf-scr-example-features/pom.xml index 84699f2abac..ec1b7675af8 100644 --- a/examples/karaf-scr-example/karaf-scr-example-features/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml b/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml index 034407a5474..dc86f37e550 100644 --- a/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-scr-example/pom.xml b/examples/karaf-scr-example/pom.xml index 38a0c50dfbc..815e3c8a822 100644 --- a/examples/karaf-scr-example/pom.xml +++ b/examples/karaf-scr-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml index 2775f6fd599..1661050e4d7 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml index 2ee7b9a9287..e8f0acaa3af 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml index c9c11d0faf2..b6f906f76e5 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml index 67670239ce9..0ef4dfbecc3 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml index ecb0c2bdf88..eb646b653a9 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml index 884f1218cfd..72bdcbfbe54 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-servlet-example/pom.xml b/examples/karaf-servlet-example/pom.xml index a3be97cbc2b..1e7c7d9c400 100644 --- a/examples/karaf-servlet-example/pom.xml +++ b/examples/karaf-servlet-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-api/pom.xml b/examples/karaf-soap-example/karaf-soap-example-api/pom.xml index 40a0c71c955..d027223a9df 100644 --- a/examples/karaf-soap-example/karaf-soap-example-api/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml index 3675dda58ed..cec76295134 100644 --- a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-client/pom.xml b/examples/karaf-soap-example/karaf-soap-example-client/pom.xml index b4917c017a3..2dc168d8f4d 100644 --- a/examples/karaf-soap-example/karaf-soap-example-client/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-features/pom.xml b/examples/karaf-soap-example/karaf-soap-example-features/pom.xml index c039dd1afde..e8964a5a4ff 100644 --- a/examples/karaf-soap-example/karaf-soap-example-features/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml index 0cb408688dc..1f311fc2a21 100644 --- a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-soap-example/pom.xml b/examples/karaf-soap-example/pom.xml index 27804eda728..76862cfffac 100644 --- a/examples/karaf-soap-example/pom.xml +++ b/examples/karaf-soap-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml index 6d395f9015e..045d0c252cd 100644 --- a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml +++ b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-url-namespace-handler-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml index 6fe4ed1d1d5..bc7dc8c731b 100644 --- a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml +++ b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-url-namespace-handler-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/pom.xml b/examples/karaf-url-namespace-handler-example/pom.xml index 843c3453ad8..757e9a0bed2 100644 --- a/examples/karaf-url-namespace-handler-example/pom.xml +++ b/examples/karaf-url-namespace-handler-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-war-example/karaf-war-example-features/pom.xml b/examples/karaf-war-example/karaf-war-example-features/pom.xml index de28c4768d9..ed8ddb50139 100644 --- a/examples/karaf-war-example/karaf-war-example-features/pom.xml +++ b/examples/karaf-war-example/karaf-war-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-war-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-war-example/karaf-war-example-webapp/pom.xml b/examples/karaf-war-example/karaf-war-example-webapp/pom.xml index c225d94f4fa..0e620323e72 100644 --- a/examples/karaf-war-example/karaf-war-example-webapp/pom.xml +++ b/examples/karaf-war-example/karaf-war-example-webapp/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-war-example - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-war-example/pom.xml b/examples/karaf-war-example/pom.xml index 398900b9975..9ac7c5fc3d1 100644 --- a/examples/karaf-war-example/pom.xml +++ b/examples/karaf-war-example/pom.xml @@ -25,7 +25,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/karaf-websocket-example/pom.xml b/examples/karaf-websocket-example/pom.xml index 84804267573..08dfcaea44b 100644 --- a/examples/karaf-websocket-example/pom.xml +++ b/examples/karaf-websocket-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 99cd4a5c8f4..e5f35049952 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/features/command/pom.xml b/features/command/pom.xml index 64bc38ff3bc..e7e1ffbbcf1 100644 --- a/features/command/pom.xml +++ b/features/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/features/core/pom.xml b/features/core/pom.xml index cdb53b1a3f6..ec62364a660 100644 --- a/features/core/pom.xml +++ b/features/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/features/extension/pom.xml b/features/extension/pom.xml index 053be4ce866..1c9c63b1846 100644 --- a/features/extension/pom.xml +++ b/features/extension/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/features/pom.xml b/features/pom.xml index b4f475eb223..e0e3c4ee9ba 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/http/pom.xml b/http/pom.xml index 97ce2c13364..8f0a988eb3e 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/instance/pom.xml b/instance/pom.xml index 71c479d93f7..2f570a07f69 100644 --- a/instance/pom.xml +++ b/instance/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/itests/common/pom.xml b/itests/common/pom.xml index 114de3df7b9..894596e9696 100644 --- a/itests/common/pom.xml +++ b/itests/common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.itests itests - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/itests/pom.xml b/itests/pom.xml index 4c517f66029..1d7145611b3 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/itests/test/pom.xml b/itests/test/pom.xml index 64aa086d882..36e40cce23e 100644 --- a/itests/test/pom.xml +++ b/itests/test/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.itests itests - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jaas/blueprint/config/pom.xml b/jaas/blueprint/config/pom.xml index 6409b944f20..dda591774d3 100644 --- a/jaas/blueprint/config/pom.xml +++ b/jaas/blueprint/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas.blueprint blueprint - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jaas/blueprint/jasypt/pom.xml b/jaas/blueprint/jasypt/pom.xml index 1d919e5d253..a742062c50c 100644 --- a/jaas/blueprint/jasypt/pom.xml +++ b/jaas/blueprint/jasypt/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas.blueprint blueprint - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jaas/blueprint/pom.xml b/jaas/blueprint/pom.xml index 7623028c35e..6a337bf4399 100644 --- a/jaas/blueprint/pom.xml +++ b/jaas/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jaas/boot/pom.xml b/jaas/boot/pom.xml index 59e3c80eb4f..3bdeba8cee7 100644 --- a/jaas/boot/pom.xml +++ b/jaas/boot/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jaas/command/pom.xml b/jaas/command/pom.xml index 9d3175a2793..6e6594d9cd3 100644 --- a/jaas/command/pom.xml +++ b/jaas/command/pom.xml @@ -24,7 +24,7 @@ jaas org.apache.karaf.jaas - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jaas/config/pom.xml b/jaas/config/pom.xml index c12e4b8c0e3..7beec960e64 100644 --- a/jaas/config/pom.xml +++ b/jaas/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml index bd9c386c271..271892d3f8b 100644 --- a/jaas/jasypt/pom.xml +++ b/jaas/jasypt/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml index 3ae63c4d2a0..0034adb9b6a 100644 --- a/jaas/modules/pom.xml +++ b/jaas/modules/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jaas/pom.xml b/jaas/pom.xml index 47dcd1e636b..20bda526eec 100644 --- a/jaas/pom.xml +++ b/jaas/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jaas/spring-security-crypto/pom.xml b/jaas/spring-security-crypto/pom.xml index 0633fe9343d..796b1de9a53 100644 --- a/jaas/spring-security-crypto/pom.xml +++ b/jaas/spring-security-crypto/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 970c3c242f3..7729591192f 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jms/pom.xml b/jms/pom.xml index bfcaf5806e7..7e66b9d8265 100644 --- a/jms/pom.xml +++ b/jms/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/jndi/pom.xml b/jndi/pom.xml index 067d94c623a..753ca121969 100644 --- a/jndi/pom.xml +++ b/jndi/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/kar/pom.xml b/kar/pom.xml index 9622f3022e4..f97e5fe3b01 100644 --- a/kar/pom.xml +++ b/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/log/pom.xml b/log/pom.xml index d78dbf14a4e..821fa009954 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/main/pom.xml b/main/pom.xml index 00a51ca41b7..9cc828fe0eb 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/management/pom.xml b/management/pom.xml index 462e1a25dd0..463ecca4f6d 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/management/server/pom.xml b/management/server/pom.xml index 78b20238bc2..a8c9e8a74ef 100644 --- a/management/server/pom.xml +++ b/management/server/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.management management - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/manual/pom.xml b/manual/pom.xml index 99ce58c92fe..41836552dd7 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -17,7 +17,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/maven/core/pom.xml b/maven/core/pom.xml index 93fdff0db5a..3f6e6c196fc 100644 --- a/maven/core/pom.xml +++ b/maven/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../../pom.xml diff --git a/maven/pom.xml b/maven/pom.xml index b94766706e9..3d22bbda80c 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/obr/pom.xml b/obr/pom.xml index 4d200a6f319..65d6a30c544 100644 --- a/obr/pom.xml +++ b/obr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/package/pom.xml b/package/pom.xml index 6959839ad84..5f0ef553f7c 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/pom.xml b/pom.xml index 5bfa43f96e7..27bf3d7cf03 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.karaf karaf pom - 4.4.7-SNAPSHOT + 4.4.7 Apache Karaf 2007 @@ -84,7 +84,7 @@ ${scm.connection} ${scm.developerConnection} ${scm.url} - karaf-4.4.5 + karaf-4.4.7 @@ -150,7 +150,7 @@ - 1712653303 + 1737368101 scm:git:https://gitbox.apache.org/repos/asf/karaf.git scm:git:https://gitbox.apache.org/repos/asf/karaf.git diff --git a/profile/pom.xml b/profile/pom.xml index 4278b36cb89..8801378d607 100644 --- a/profile/pom.xml +++ b/profile/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/scheduler/pom.xml b/scheduler/pom.xml index 5a26f8a1f42..7ccaeb64cc5 100644 --- a/scheduler/pom.xml +++ b/scheduler/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/scr/management/pom.xml b/scr/management/pom.xml index 4984abd6b43..e583f9a595c 100644 --- a/scr/management/pom.xml +++ b/scr/management/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.scr scr - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/scr/pom.xml b/scr/pom.xml index d894bd4432a..e6fb90a0bf0 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/scr/state/pom.xml b/scr/state/pom.xml index 1aabd5c7a31..371621c83b4 100644 --- a/scr/state/pom.xml +++ b/scr/state/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.scr scr - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/service/core/pom.xml b/service/core/pom.xml index ae2fa9f4eb7..5f21112172b 100644 --- a/service/core/pom.xml +++ b/service/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.service service - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/service/guard/pom.xml b/service/guard/pom.xml index e4bd3ec33c4..2f230841761 100644 --- a/service/guard/pom.xml +++ b/service/guard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.service service - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/service/pom.xml b/service/pom.xml index 4a777a94522..2b7f9faf549 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/services/coordinator/pom.xml b/services/coordinator/pom.xml index 9e4194f387d..bb377f2ae17 100644 --- a/services/coordinator/pom.xml +++ b/services/coordinator/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.7-SNAPSHOT + 4.4.7 ../../pom.xml diff --git a/services/eventadmin/pom.xml b/services/eventadmin/pom.xml index 29a9008424e..5362c00b9ef 100644 --- a/services/eventadmin/pom.xml +++ b/services/eventadmin/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.7-SNAPSHOT + 4.4.7 ../../pom.xml diff --git a/services/interceptor/api/pom.xml b/services/interceptor/api/pom.xml index ac136f1284d..1cf25c11644 100644 --- a/services/interceptor/api/pom.xml +++ b/services/interceptor/api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services org.apache.karaf.services.interceptor - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/services/interceptor/impl/pom.xml b/services/interceptor/impl/pom.xml index 9ebec32aa3c..30aa6535e81 100644 --- a/services/interceptor/impl/pom.xml +++ b/services/interceptor/impl/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services org.apache.karaf.services.interceptor - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/services/interceptor/pom.xml b/services/interceptor/pom.xml index f3d01f9c5e8..a26b8c5b4dd 100644 --- a/services/interceptor/pom.xml +++ b/services/interceptor/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services services - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/services/pom.xml b/services/pom.xml index c789ba3ba83..c79203c12cc 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/services/staticcm/pom.xml b/services/staticcm/pom.xml index 27bb5ea794c..1d021c0ae68 100644 --- a/services/staticcm/pom.xml +++ b/services/staticcm/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.7-SNAPSHOT + 4.4.7 ../../pom.xml diff --git a/shell/commands/pom.xml b/shell/commands/pom.xml index eff2ab4e4f4..90fe4ad71e2 100644 --- a/shell/commands/pom.xml +++ b/shell/commands/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/shell/console/pom.xml b/shell/console/pom.xml index ddd795dff69..7120de1effe 100644 --- a/shell/console/pom.xml +++ b/shell/console/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/shell/core/pom.xml b/shell/core/pom.xml index 0a61dadbd09..f5e051f24da 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/shell/groovy/pom.xml b/shell/groovy/pom.xml index 05813a92fd5..56770861cc4 100644 --- a/shell/groovy/pom.xml +++ b/shell/groovy/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/shell/pom.xml b/shell/pom.xml index 4869f1e2401..4fa8a07ae3a 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index abe8ec78336..fb13a4168e9 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/shell/table/pom.xml b/shell/table/pom.xml index 524eb24c1e7..636af74f1db 100644 --- a/shell/table/pom.xml +++ b/shell/table/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/specs/activator/pom.xml b/specs/activator/pom.xml index 5d653a059e9..fa23cd6a56f 100644 --- a/specs/activator/pom.xml +++ b/specs/activator/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.7-SNAPSHOT + 4.4.7 org.apache.karaf.specs.activator diff --git a/specs/java.xml.ws/pom.xml b/specs/java.xml.ws/pom.xml index feaa4b2a413..4776cd1c5d9 100644 --- a/specs/java.xml.ws/pom.xml +++ b/specs/java.xml.ws/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.7-SNAPSHOT + 4.4.7 org.apache.karaf.specs.java.xml.ws diff --git a/specs/java.xml/pom.xml b/specs/java.xml/pom.xml index a502fdb2645..9ad87a87f90 100644 --- a/specs/java.xml/pom.xml +++ b/specs/java.xml/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.7-SNAPSHOT + 4.4.7 org.apache.karaf.specs.java.xml diff --git a/specs/locator/pom.xml b/specs/locator/pom.xml index 414e97332d0..8981de86781 100644 --- a/specs/locator/pom.xml +++ b/specs/locator/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.7-SNAPSHOT + 4.4.7 org.apache.karaf.specs.locator diff --git a/specs/pom.xml b/specs/pom.xml index 39b682afde5..c6d88938277 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/subsystem/pom.xml b/subsystem/pom.xml index bcbd0d4409c..9f411718199 100644 --- a/subsystem/pom.xml +++ b/subsystem/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 org.apache.karaf.subsystem diff --git a/system/pom.xml b/system/pom.xml index 24cf5fca005..502effd06b6 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index fd3914d5a0a..1e0654b4df1 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/tooling/karaf-services-maven-plugin/pom.xml b/tooling/karaf-services-maven-plugin/pom.xml index c7cbe9e2abb..c40d79fa213 100644 --- a/tooling/karaf-services-maven-plugin/pom.xml +++ b/tooling/karaf-services-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/tooling/pom.xml b/tooling/pom.xml index 7040a35fa29..32fdf29731f 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/tooling/utils/pom.xml b/tooling/utils/pom.xml index c82a2607a75..92041ea3ad9 100644 --- a/tooling/utils/pom.xml +++ b/tooling/utils/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.7-SNAPSHOT + 4.4.7 org.apache.karaf.tools.utils diff --git a/util/pom.xml b/util/pom.xml index 427deb77046..4c9eb7fbcb7 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/web/pom.xml b/web/pom.xml index 1e51f8d8b6e..a2e7e5b24f5 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml index 5908e4d0506..ec60b0b8920 100644 --- a/webconsole/console/pom.xml +++ b/webconsole/console/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml index 10dbf7e37b7..88d74ee481f 100644 --- a/webconsole/features/pom.xml +++ b/webconsole/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/webconsole/gogo/pom.xml b/webconsole/gogo/pom.xml index 87902c65aa9..d771fb2f6a0 100644 --- a/webconsole/gogo/pom.xml +++ b/webconsole/gogo/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/webconsole/http/pom.xml b/webconsole/http/pom.xml index 97a1a5a492d..dfddf5fb670 100644 --- a/webconsole/http/pom.xml +++ b/webconsole/http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/webconsole/instance/pom.xml b/webconsole/instance/pom.xml index 1890bfc3808..7fad39b3384 100644 --- a/webconsole/instance/pom.xml +++ b/webconsole/instance/pom.xml @@ -19,7 +19,7 @@ org.apache.karaf.webconsole webconsole - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/webconsole/pom.xml b/webconsole/pom.xml index 6679b417e67..697b98592f6 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml diff --git a/wrapper/pom.xml b/wrapper/pom.xml index e9b95427513..b9dc9b0e15c 100644 --- a/wrapper/pom.xml +++ b/wrapper/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7-SNAPSHOT + 4.4.7 ../pom.xml From bc213ee4c13b8fdf37bd95f75f119b1048fdd84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Mon, 20 Jan 2025 11:22:50 +0100 Subject: [PATCH 140/440] [maven-release-plugin] prepare for next development iteration --- archetypes/assembly/pom.xml | 2 +- archetypes/blueprint/pom.xml | 2 +- archetypes/bundle/pom.xml | 2 +- archetypes/command/pom.xml | 2 +- archetypes/feature/pom.xml | 2 +- archetypes/kar/pom.xml | 2 +- archetypes/pom.xml | 2 +- assemblies/apache-karaf-minimal/pom.xml | 2 +- assemblies/apache-karaf/pom.xml | 2 +- assemblies/features/base/pom.xml | 2 +- assemblies/features/enterprise/pom.xml | 2 +- assemblies/features/framework/pom.xml | 2 +- assemblies/features/pom.xml | 2 +- assemblies/features/specs/pom.xml | 2 +- assemblies/features/spring-legacy/pom.xml | 2 +- assemblies/features/spring/pom.xml | 2 +- assemblies/features/standard/pom.xml | 2 +- assemblies/features/static/pom.xml | 2 +- assemblies/pom.xml | 2 +- audit/pom.xml | 2 +- bom/pom.xml | 2 +- bundle/blueprintstate/pom.xml | 2 +- bundle/core/pom.xml | 2 +- bundle/pom.xml | 2 +- bundle/springstate/pom.xml | 2 +- client/pom.xml | 2 +- config/command/pom.xml | 2 +- config/core/pom.xml | 2 +- config/pom.xml | 2 +- deployer/blueprint/pom.xml | 2 +- deployer/features/pom.xml | 2 +- deployer/kar/pom.xml | 2 +- deployer/pom.xml | 2 +- deployer/spring/pom.xml | 2 +- deployer/wrap/pom.xml | 2 +- diagnostic/boot/pom.xml | 2 +- diagnostic/core/pom.xml | 2 +- diagnostic/pom.xml | 2 +- docker/pom.xml | 2 +- event/pom.xml | 2 +- .../karaf-blueprint-example-client/pom.xml | 2 +- .../karaf-blueprint-example-common/pom.xml | 2 +- .../karaf-blueprint-example-features/pom.xml | 2 +- .../karaf-blueprint-example-provider/pom.xml | 2 +- examples/karaf-blueprint-example/pom.xml | 2 +- examples/karaf-branding-example/pom.xml | 2 +- .../karaf-bundle-example-client/pom.xml | 2 +- .../karaf-bundle-example-common/pom.xml | 2 +- .../karaf-bundle-example-features/pom.xml | 2 +- .../karaf-bundle-example-provider/pom.xml | 2 +- examples/karaf-bundle-example/pom.xml | 2 +- .../karaf-camel-example-blueprint/pom.xml | 2 +- .../karaf-camel-example-features/pom.xml | 2 +- .../karaf-camel-example/karaf-camel-example-java/pom.xml | 2 +- examples/karaf-camel-example/pom.xml | 2 +- examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml | 2 +- .../karaf-cdi-example/karaf-cdi-example-consumer/pom.xml | 2 +- .../karaf-cdi-example/karaf-cdi-example-features/pom.xml | 2 +- .../karaf-cdi-example/karaf-cdi-example-provider/pom.xml | 2 +- examples/karaf-cdi-example/pom.xml | 2 +- .../karaf-command-example/karaf-command-example-api/pom.xml | 2 +- .../karaf-command-example-command/pom.xml | 2 +- .../karaf-command-example-features/pom.xml | 2 +- .../karaf-command-example-provider/pom.xml | 2 +- examples/karaf-command-example/pom.xml | 2 +- .../karaf-config-example-blueprint/pom.xml | 2 +- .../karaf-config-example-features/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/karaf-config-example-scr/pom.xml | 2 +- .../karaf-config-example-static/pom.xml | 2 +- examples/karaf-config-example/pom.xml | 2 +- examples/karaf-deployer-example/pom.xml | 2 +- .../karaf-docker-example/karaf-docker-example-app/pom.xml | 2 +- .../karaf-docker-example-dynamic-dist/pom.xml | 2 +- .../karaf-docker-example-static-dist/pom.xml | 2 +- examples/karaf-docker-example/pom.xml | 2 +- examples/karaf-dump-example/pom.xml | 2 +- .../karaf-graphql-example/karaf-graphql-example-api/pom.xml | 2 +- .../karaf-graphql-example-commands/pom.xml | 2 +- .../karaf-graphql-example-core/pom.xml | 2 +- .../karaf-graphql-example-features/pom.xml | 2 +- .../karaf-graphql-example-scr-servlet/pom.xml | 2 +- .../karaf-graphql-example-websocket/pom.xml | 2 +- examples/karaf-graphql-example/pom.xml | 2 +- .../karaf-http-resource-example-features/pom.xml | 2 +- .../karaf-http-resource-example-whiteboard/pom.xml | 2 +- examples/karaf-http-resource-example/pom.xml | 2 +- examples/karaf-itest-example/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml | 2 +- .../karaf-jaas-example/karaf-jaas-example-features/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml | 2 +- examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml | 2 +- examples/karaf-jaas-example/pom.xml | 2 +- examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-command/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-features/pom.xml | 2 +- .../karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml | 2 +- examples/karaf-jdbc-example/pom.xml | 2 +- .../karaf-jms-example/karaf-jms-example-command/pom.xml | 2 +- .../karaf-jms-example/karaf-jms-example-features/pom.xml | 2 +- examples/karaf-jms-example/pom.xml | 2 +- .../karaf-jpa-example/karaf-jpa-example-command/pom.xml | 2 +- .../karaf-jpa-example/karaf-jpa-example-features/pom.xml | 2 +- .../karaf-jpa-example-provider-api/pom.xml | 2 +- .../pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint-hibernate/pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint-openjpa/pom.xml | 2 +- .../karaf-jpa-example-provider-blueprint/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-eclipselink/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-hibernate/pom.xml | 2 +- .../karaf-jpa-example-provider-ds-openjpa/pom.xml | 2 +- .../karaf-jpa-example-provider-ds/pom.xml | 2 +- .../karaf-jpa-example/karaf-jpa-example-provider/pom.xml | 2 +- examples/karaf-jpa-example/pom.xml | 2 +- .../karaf-log-appender-example-core/pom.xml | 2 +- .../karaf-log-appender-example-features/pom.xml | 2 +- examples/karaf-log-appender-example/pom.xml | 2 +- .../karaf-maven-example-run-bundle/pom.xml | 2 +- .../karaf-maven-example/karaf-maven-example-run/pom.xml | 2 +- examples/karaf-maven-example/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-api/pom.xml | 2 +- .../karaf-mbean-example-blueprint/pom.xml | 2 +- .../karaf-mbean-example-features/pom.xml | 2 +- .../karaf-mbean-example-provider/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-scr/pom.xml | 2 +- .../karaf-mbean-example/karaf-mbean-example-simple/pom.xml | 2 +- examples/karaf-mbean-example/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-api/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-command/pom.xml | 2 +- .../karaf-redis-example-features/pom.xml | 2 +- .../karaf-redis-example/karaf-redis-example-service/pom.xml | 2 +- examples/karaf-redis-example/pom.xml | 2 +- examples/karaf-rest-example/karaf-rest-example-api/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-blueprint/pom.xml | 2 +- .../karaf-rest-example-client-cxf/pom.xml | 2 +- .../karaf-rest-example-client-http/pom.xml | 2 +- .../karaf-rest-example-client-jersey/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-client/pom.xml | 2 +- .../karaf-rest-example/karaf-rest-example-features/pom.xml | 2 +- examples/karaf-rest-example/karaf-rest-example-scr/pom.xml | 2 +- .../karaf-rest-example-whiteboard/pom.xml | 2 +- examples/karaf-rest-example/pom.xml | 2 +- .../karaf-scheduler-example-features/pom.xml | 2 +- .../karaf-scheduler-example-runnable/pom.xml | 2 +- examples/karaf-scheduler-example/pom.xml | 2 +- examples/karaf-scr-example/karaf-scr-example-api/pom.xml | 2 +- examples/karaf-scr-example/karaf-scr-example-client/pom.xml | 2 +- .../karaf-scr-example/karaf-scr-example-features/pom.xml | 2 +- .../karaf-scr-example/karaf-scr-example-provider/pom.xml | 2 +- examples/karaf-scr-example/pom.xml | 2 +- .../karaf-servlet-example-annotation/pom.xml | 2 +- .../karaf-servlet-example-blueprint/pom.xml | 2 +- .../karaf-servlet-example-features/pom.xml | 2 +- .../karaf-servlet-example-registration/pom.xml | 2 +- .../karaf-servlet-example/karaf-servlet-example-scr/pom.xml | 2 +- .../karaf-servlet-example-upload/pom.xml | 2 +- examples/karaf-servlet-example/pom.xml | 2 +- examples/karaf-soap-example/karaf-soap-example-api/pom.xml | 2 +- .../karaf-soap-example/karaf-soap-example-blueprint/pom.xml | 2 +- .../karaf-soap-example/karaf-soap-example-client/pom.xml | 2 +- .../karaf-soap-example/karaf-soap-example-features/pom.xml | 2 +- examples/karaf-soap-example/karaf-soap-example-scr/pom.xml | 2 +- examples/karaf-soap-example/pom.xml | 2 +- .../karaf-url-namespace-handler-example-core/pom.xml | 2 +- .../karaf-url-namespace-handler-example-features/pom.xml | 2 +- examples/karaf-url-namespace-handler-example/pom.xml | 2 +- .../karaf-war-example/karaf-war-example-features/pom.xml | 2 +- examples/karaf-war-example/karaf-war-example-webapp/pom.xml | 2 +- examples/karaf-war-example/pom.xml | 2 +- examples/karaf-websocket-example/pom.xml | 2 +- examples/pom.xml | 2 +- features/command/pom.xml | 2 +- features/core/pom.xml | 2 +- features/extension/pom.xml | 2 +- features/pom.xml | 2 +- http/pom.xml | 2 +- instance/pom.xml | 2 +- itests/common/pom.xml | 2 +- itests/pom.xml | 2 +- itests/test/pom.xml | 2 +- jaas/blueprint/config/pom.xml | 2 +- jaas/blueprint/jasypt/pom.xml | 2 +- jaas/blueprint/pom.xml | 2 +- jaas/boot/pom.xml | 2 +- jaas/command/pom.xml | 2 +- jaas/config/pom.xml | 2 +- jaas/jasypt/pom.xml | 2 +- jaas/modules/pom.xml | 2 +- jaas/pom.xml | 2 +- jaas/spring-security-crypto/pom.xml | 2 +- jdbc/pom.xml | 2 +- jms/pom.xml | 2 +- jndi/pom.xml | 2 +- kar/pom.xml | 2 +- log/pom.xml | 2 +- main/pom.xml | 2 +- management/pom.xml | 2 +- management/server/pom.xml | 2 +- manual/pom.xml | 2 +- maven/core/pom.xml | 2 +- maven/pom.xml | 2 +- obr/pom.xml | 2 +- package/pom.xml | 2 +- pom.xml | 6 +++--- profile/pom.xml | 2 +- scheduler/pom.xml | 2 +- scr/management/pom.xml | 2 +- scr/pom.xml | 2 +- scr/state/pom.xml | 2 +- service/core/pom.xml | 2 +- service/guard/pom.xml | 2 +- service/pom.xml | 2 +- services/coordinator/pom.xml | 2 +- services/eventadmin/pom.xml | 2 +- services/interceptor/api/pom.xml | 2 +- services/interceptor/impl/pom.xml | 2 +- services/interceptor/pom.xml | 2 +- services/pom.xml | 2 +- services/staticcm/pom.xml | 2 +- shell/commands/pom.xml | 2 +- shell/console/pom.xml | 2 +- shell/core/pom.xml | 2 +- shell/groovy/pom.xml | 2 +- shell/pom.xml | 2 +- shell/ssh/pom.xml | 2 +- shell/table/pom.xml | 2 +- specs/activator/pom.xml | 2 +- specs/java.xml.ws/pom.xml | 2 +- specs/java.xml/pom.xml | 2 +- specs/locator/pom.xml | 2 +- specs/pom.xml | 2 +- subsystem/pom.xml | 2 +- system/pom.xml | 2 +- tooling/karaf-maven-plugin/pom.xml | 2 +- tooling/karaf-services-maven-plugin/pom.xml | 2 +- tooling/pom.xml | 2 +- tooling/utils/pom.xml | 2 +- util/pom.xml | 2 +- web/pom.xml | 2 +- webconsole/console/pom.xml | 2 +- webconsole/features/pom.xml | 2 +- webconsole/gogo/pom.xml | 2 +- webconsole/http/pom.xml | 2 +- webconsole/instance/pom.xml | 2 +- webconsole/pom.xml | 2 +- wrapper/pom.xml | 2 +- 248 files changed, 250 insertions(+), 250 deletions(-) diff --git a/archetypes/assembly/pom.xml b/archetypes/assembly/pom.xml index 750be12f515..d9b455d93bc 100644 --- a/archetypes/assembly/pom.xml +++ b/archetypes/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7 + 4.4.8-SNAPSHOT org.apache.karaf.archetypes diff --git a/archetypes/blueprint/pom.xml b/archetypes/blueprint/pom.xml index a08c622cb65..5694a4e94b3 100644 --- a/archetypes/blueprint/pom.xml +++ b/archetypes/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/archetypes/bundle/pom.xml b/archetypes/bundle/pom.xml index 9ed7293c0e3..264d2c55f16 100644 --- a/archetypes/bundle/pom.xml +++ b/archetypes/bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/archetypes/command/pom.xml b/archetypes/command/pom.xml index 10c10a4335f..b4e139ed084 100644 --- a/archetypes/command/pom.xml +++ b/archetypes/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/archetypes/feature/pom.xml b/archetypes/feature/pom.xml index 5ae6e0e6007..a44a6307d2b 100644 --- a/archetypes/feature/pom.xml +++ b/archetypes/feature/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/archetypes/kar/pom.xml b/archetypes/kar/pom.xml index 4c8ed669979..3a7ddb5854f 100644 --- a/archetypes/kar/pom.xml +++ b/archetypes/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf archetypes - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/archetypes/pom.xml b/archetypes/pom.xml index a91cd50a196..cf6098f5fdc 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml index 1d9ddfca1c5..f58bcd9f344 100644 --- a/assemblies/apache-karaf-minimal/pom.xml +++ b/assemblies/apache-karaf-minimal/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index 131505c2210..da9d63ebc43 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml index 861a329aea4..a325aa2ce15 100644 --- a/assemblies/features/base/pom.xml +++ b/assemblies/features/base/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml index ad4b1720a64..1d2c04dcb2d 100644 --- a/assemblies/features/enterprise/pom.xml +++ b/assemblies/features/enterprise/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml index dd01fa4b115..9c0aa410785 100644 --- a/assemblies/features/framework/pom.xml +++ b/assemblies/features/framework/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/features/pom.xml b/assemblies/features/pom.xml index 2b6ef4886e4..651bfeb77c3 100644 --- a/assemblies/features/pom.xml +++ b/assemblies/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies assemblies - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/features/specs/pom.xml b/assemblies/features/specs/pom.xml index 47b096bb938..c8708102e1d 100644 --- a/assemblies/features/specs/pom.xml +++ b/assemblies/features/specs/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/features/spring-legacy/pom.xml b/assemblies/features/spring-legacy/pom.xml index 7b506bce7aa..12ab41ab1b9 100644 --- a/assemblies/features/spring-legacy/pom.xml +++ b/assemblies/features/spring-legacy/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml index a3010d9d3ec..dd5f4558ca2 100644 --- a/assemblies/features/spring/pom.xml +++ b/assemblies/features/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index 7b697ad01e4..1ec6ee39e72 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/features/static/pom.xml b/assemblies/features/static/pom.xml index 46c3426884c..52c0d7674e9 100644 --- a/assemblies/features/static/pom.xml +++ b/assemblies/features/static/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.assemblies.features features - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/assemblies/pom.xml b/assemblies/pom.xml index f20a5c955cc..d402e84603b 100644 --- a/assemblies/pom.xml +++ b/assemblies/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/audit/pom.xml b/audit/pom.xml index 6369a401a7c..61d6599b7d8 100644 --- a/audit/pom.xml +++ b/audit/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index ddb6d484645..2fa27ab29d7 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/bundle/blueprintstate/pom.xml b/bundle/blueprintstate/pom.xml index 284b9ab1362..8448054eeb4 100644 --- a/bundle/blueprintstate/pom.xml +++ b/bundle/blueprintstate/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml index b6516708ed4..9e48d693b15 100644 --- a/bundle/core/pom.xml +++ b/bundle/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/bundle/pom.xml b/bundle/pom.xml index cf548811268..0e153bf2169 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/bundle/springstate/pom.xml b/bundle/springstate/pom.xml index 3d634c7735a..f7bc6bb4b39 100644 --- a/bundle/springstate/pom.xml +++ b/bundle/springstate/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.bundle bundle - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index df1b6263260..165530a5b83 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/config/command/pom.xml b/config/command/pom.xml index f36036b4b6e..842074c25dc 100644 --- a/config/command/pom.xml +++ b/config/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.config config - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/config/core/pom.xml b/config/core/pom.xml index 1ad168b2533..ebb4376f8c8 100644 --- a/config/core/pom.xml +++ b/config/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.config config - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/config/pom.xml b/config/pom.xml index f76c8b760b4..48a0150bd36 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml index e14e940b599..daa4654e90b 100644 --- a/deployer/blueprint/pom.xml +++ b/deployer/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml index 5e387900cfe..41becf80478 100644 --- a/deployer/features/pom.xml +++ b/deployer/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/deployer/kar/pom.xml b/deployer/kar/pom.xml index 3aeb67ba092..8fd82266216 100644 --- a/deployer/kar/pom.xml +++ b/deployer/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/deployer/pom.xml b/deployer/pom.xml index 1344e6e8524..7eb1f9d89bc 100644 --- a/deployer/pom.xml +++ b/deployer/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/deployer/spring/pom.xml b/deployer/spring/pom.xml index 68c067878fa..d54a9e35675 100644 --- a/deployer/spring/pom.xml +++ b/deployer/spring/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/deployer/wrap/pom.xml b/deployer/wrap/pom.xml index 561c9845c07..17df31cf998 100644 --- a/deployer/wrap/pom.xml +++ b/deployer/wrap/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.deployer deployer - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/diagnostic/boot/pom.xml b/diagnostic/boot/pom.xml index 7bd029132e5..966e04baa25 100644 --- a/diagnostic/boot/pom.xml +++ b/diagnostic/boot/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.diagnostic diagnostic - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml index be35ea6199a..8d50bd3ae28 100644 --- a/diagnostic/core/pom.xml +++ b/diagnostic/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.diagnostic diagnostic - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/diagnostic/pom.xml b/diagnostic/pom.xml index bd592ae72b8..b106c48e880 100644 --- a/diagnostic/pom.xml +++ b/diagnostic/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/docker/pom.xml b/docker/pom.xml index f6db334e796..b6c6ad1c040 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/event/pom.xml b/event/pom.xml index 68f3be93d6d..e363578508d 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml index d5cf694b2b0..7ab4a7d61a2 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml index ceb22c47de2..306bdb99d93 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml index ebc0f2a771f..015f9db8f29 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml b/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml index dbdd146e087..ea5ead61fc3 100644 --- a/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml +++ b/examples/karaf-blueprint-example/karaf-blueprint-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-blueprint-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-blueprint-example/pom.xml b/examples/karaf-blueprint-example/pom.xml index 4e34fd0db87..72c9ff2adc0 100644 --- a/examples/karaf-blueprint-example/pom.xml +++ b/examples/karaf-blueprint-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-branding-example/pom.xml b/examples/karaf-branding-example/pom.xml index a6c30c8acf9..a115e608d29 100644 --- a/examples/karaf-branding-example/pom.xml +++ b/examples/karaf-branding-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml index 11c4ee13dfd..53278b61440 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml index c7991c86066..52694aa8c6d 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml index 03c33be7f7a..c9aae82aaca 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml index f2de93da71b..63fc5b64d7f 100644 --- a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml +++ b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-bundle-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-bundle-example/pom.xml b/examples/karaf-bundle-example/pom.xml index ed3674256db..2b01a12f5f4 100644 --- a/examples/karaf-bundle-example/pom.xml +++ b/examples/karaf-bundle-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml b/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml index c10b4c1ebd1..9e0aeaced7f 100644 --- a/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-features/pom.xml b/examples/karaf-camel-example/karaf-camel-example-features/pom.xml index 013d9a6c8e9..f02cb59b2e3 100644 --- a/examples/karaf-camel-example/karaf-camel-example-features/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml index 34a3c83641e..86aafa474ba 100644 --- a/examples/karaf-camel-example/karaf-camel-example-java/pom.xml +++ b/examples/karaf-camel-example/karaf-camel-example-java/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-camel-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-camel-example/pom.xml b/examples/karaf-camel-example/pom.xml index b3e1eee23dd..9ca9bcaed3d 100644 --- a/examples/karaf-camel-example/pom.xml +++ b/examples/karaf-camel-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml index fd8a0095b6d..e2e353be744 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml index 306c425ed14..6b9d284f7ce 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml index 114aeb7937f..a3c18f0e32a 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml index ea437152caa..5dc29d5f49d 100644 --- a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml +++ b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-cdi-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-cdi-example/pom.xml b/examples/karaf-cdi-example/pom.xml index e408ab89590..5a314df5eb6 100644 --- a/examples/karaf-cdi-example/pom.xml +++ b/examples/karaf-cdi-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-api/pom.xml b/examples/karaf-command-example/karaf-command-example-api/pom.xml index f788875ab7e..3f334461b67 100644 --- a/examples/karaf-command-example/karaf-command-example-api/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-command/pom.xml b/examples/karaf-command-example/karaf-command-example-command/pom.xml index 22ff2c3ff4e..0feb9cc12d8 100644 --- a/examples/karaf-command-example/karaf-command-example-command/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-features/pom.xml b/examples/karaf-command-example/karaf-command-example-features/pom.xml index fbd18885cab..369fd862a5b 100644 --- a/examples/karaf-command-example/karaf-command-example-features/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-command-example/karaf-command-example-provider/pom.xml b/examples/karaf-command-example/karaf-command-example-provider/pom.xml index 5cdbe84a36d..b3a0848e489 100644 --- a/examples/karaf-command-example/karaf-command-example-provider/pom.xml +++ b/examples/karaf-command-example/karaf-command-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-command-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-command-example/pom.xml b/examples/karaf-command-example/pom.xml index 4ecbce39bd2..3f8b9296673 100644 --- a/examples/karaf-command-example/pom.xml +++ b/examples/karaf-command-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml b/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml index c89f9d45ab5..7905cd62f51 100644 --- a/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-features/pom.xml b/examples/karaf-config-example/karaf-config-example-features/pom.xml index abf9339732f..d160d02503a 100644 --- a/examples/karaf-config-example/karaf-config-example-features/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-listener/pom.xml b/examples/karaf-config-example/karaf-config-example-listener/pom.xml index 15046bbb9c4..31384f184cc 100644 --- a/examples/karaf-config-example/karaf-config-example-listener/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-listener/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml b/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml index a5c5fc5768c..dd2eb1f0e44 100644 --- a/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-managed-factory/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-managed/pom.xml b/examples/karaf-config-example/karaf-config-example-managed/pom.xml index 6e6d78c5d12..21286681feb 100644 --- a/examples/karaf-config-example/karaf-config-example-managed/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-managed/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-scr/pom.xml b/examples/karaf-config-example/karaf-config-example-scr/pom.xml index ad89c5a557e..b1ff099ddcf 100644 --- a/examples/karaf-config-example/karaf-config-example-scr/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/karaf-config-example-static/pom.xml b/examples/karaf-config-example/karaf-config-example-static/pom.xml index 8c3d97d9b16..04f7fa25c49 100644 --- a/examples/karaf-config-example/karaf-config-example-static/pom.xml +++ b/examples/karaf-config-example/karaf-config-example-static/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-config-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-config-example/pom.xml b/examples/karaf-config-example/pom.xml index 4d99e8289cc..069d5f8182a 100644 --- a/examples/karaf-config-example/pom.xml +++ b/examples/karaf-config-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-deployer-example/pom.xml b/examples/karaf-deployer-example/pom.xml index 54ad1c6e257..cb77b8439f3 100644 --- a/examples/karaf-deployer-example/pom.xml +++ b/examples/karaf-deployer-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml index d31b84d5831..8cf52ec130a 100644 --- a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml index 043625be88c..5962c5f1ba5 100644 --- a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml index 81c13f9faa6..2fc400e0ff4 100644 --- a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-docker-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-docker-example/pom.xml b/examples/karaf-docker-example/pom.xml index f88d3497b2a..c525d843f0f 100644 --- a/examples/karaf-docker-example/pom.xml +++ b/examples/karaf-docker-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-dump-example/pom.xml b/examples/karaf-dump-example/pom.xml index f2b6fef893d..82070d171c3 100644 --- a/examples/karaf-dump-example/pom.xml +++ b/examples/karaf-dump-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml index cf8ef12d1c4..0ba1dbc6504 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-graphql-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml index 514e32c7d16..471dcf76668 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-graphql-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml index 5185d5864ae..fe93f4672ae 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml index 1270d7d6bae..ec7afa35cb4 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-features/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml index 16f92e4d9bf..7aeb03e423d 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml index c9aafb753e1..9ba50d726bd 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml @@ -24,7 +24,7 @@ karaf-graphql-example org.apache.karaf.examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-graphql-example/pom.xml b/examples/karaf-graphql-example/pom.xml index c6554e0e16e..6d643e012ad 100644 --- a/examples/karaf-graphql-example/pom.xml +++ b/examples/karaf-graphql-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml b/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml index 0f69a6b127b..deb80f62fe2 100644 --- a/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml +++ b/examples/karaf-http-resource-example/karaf-http-resource-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-http-resource-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml b/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml index dcf251a7f1a..bbcfa208a53 100644 --- a/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml +++ b/examples/karaf-http-resource-example/karaf-http-resource-example-whiteboard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-http-resource-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-http-resource-example/pom.xml b/examples/karaf-http-resource-example/pom.xml index 467e0ed630a..d9088a10428 100644 --- a/examples/karaf-http-resource-example/pom.xml +++ b/examples/karaf-http-resource-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-itest-example/pom.xml b/examples/karaf-itest-example/pom.xml index 296ce248cc5..e3fcd975c1b 100644 --- a/examples/karaf-itest-example/pom.xml +++ b/examples/karaf-itest-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml index bcf68634fa5..d9a1407a529 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml index f63d364fa6f..f75efbebfe1 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml index 0f6a77c5f89..0809c255d08 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml b/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml index dcf77abf621..9865a9accb1 100644 --- a/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml +++ b/examples/karaf-jaas-example/karaf-jaas-example-war/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jaas-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jaas-example/pom.xml b/examples/karaf-jaas-example/pom.xml index cde106305d0..765c51d2821 100644 --- a/examples/karaf-jaas-example/pom.xml +++ b/examples/karaf-jaas-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml index bdc533f679e..91b5ea1127f 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml index 8915851690c..57cd87a46b4 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml index 36a7081af99..e93b39f9a62 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml index a5b81120261..b4c87d2fa64 100644 --- a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml +++ b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jdbc-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jdbc-example/pom.xml b/examples/karaf-jdbc-example/pom.xml index c372b59de92..1d23c2b45d8 100644 --- a/examples/karaf-jdbc-example/pom.xml +++ b/examples/karaf-jdbc-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml index 08241b74d48..1ecfd57dacb 100644 --- a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml +++ b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jms-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jms-example/karaf-jms-example-features/pom.xml b/examples/karaf-jms-example/karaf-jms-example-features/pom.xml index 928ca3c75b1..d41a6d0325b 100644 --- a/examples/karaf-jms-example/karaf-jms-example-features/pom.xml +++ b/examples/karaf-jms-example/karaf-jms-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jms-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jms-example/pom.xml b/examples/karaf-jms-example/pom.xml index bf8d896aa9f..f8cae32fd42 100644 --- a/examples/karaf-jms-example/pom.xml +++ b/examples/karaf-jms-example/pom.xml @@ -25,7 +25,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml index 8c88a868044..d135a2c6dca 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml index 8704a9cf460..dae7faaf276 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml index 7f47007ec9b..00a08c674ea 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml index 9a4f1e73f08..e806cb9c202 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml index 21e30f628f0..a4faa91f220 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml index bb19ab88d0b..bbe4178d08a 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-blueprint - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml index ae2c70d5f5c..4c615d2348b 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml index 62992cb94a8..e9f6fac074b 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml index a9da3372b93..a66f8649197 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml index 653b9887d51..e686fedbd30 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider-ds - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml index 9c0a60787f4..cda0910b017 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml @@ -22,7 +22,7 @@ org.apache.karaf.examples karaf-jpa-example-provider - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml index 39fd5f0a016..5c7dac09209 100644 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml +++ b/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-jpa-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-jpa-example/pom.xml b/examples/karaf-jpa-example/pom.xml index db1a50a2ddc..e78b101d957 100644 --- a/examples/karaf-jpa-example/pom.xml +++ b/examples/karaf-jpa-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml b/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml index 6bc94419628..f08d96ae07b 100644 --- a/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml +++ b/examples/karaf-log-appender-example/karaf-log-appender-example-core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-log-appender-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml b/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml index 4eed1e1b4f0..6bae2abb3dc 100644 --- a/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml +++ b/examples/karaf-log-appender-example/karaf-log-appender-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-log-appender-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-log-appender-example/pom.xml b/examples/karaf-log-appender-example/pom.xml index f5283f840c9..b1c39d42ec0 100644 --- a/examples/karaf-log-appender-example/pom.xml +++ b/examples/karaf-log-appender-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml b/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml index 5af674f19e7..37638c3fe93 100644 --- a/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml +++ b/examples/karaf-maven-example/karaf-maven-example-run-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-maven-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-maven-example/karaf-maven-example-run/pom.xml b/examples/karaf-maven-example/karaf-maven-example-run/pom.xml index 7ffb887cd88..dc51d763de7 100644 --- a/examples/karaf-maven-example/karaf-maven-example-run/pom.xml +++ b/examples/karaf-maven-example/karaf-maven-example-run/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-maven-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-maven-example/pom.xml b/examples/karaf-maven-example/pom.xml index c06f0a21043..b452d925270 100644 --- a/examples/karaf-maven-example/pom.xml +++ b/examples/karaf-maven-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml index ba60a8433b9..ce50b975446 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml index da17e4c4f9c..ab0964d6e10 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml index 3195f6300e4..4da14712a68 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml index 4bccc73eadd..5b17c1e4c24 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml index 79babd4a019..147dce181c4 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml b/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml index 943bb0be04b..22eb360bdbf 100644 --- a/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml +++ b/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-mbean-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-mbean-example/pom.xml b/examples/karaf-mbean-example/pom.xml index ee300488d37..034f87ca440 100644 --- a/examples/karaf-mbean-example/pom.xml +++ b/examples/karaf-mbean-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-api/pom.xml b/examples/karaf-redis-example/karaf-redis-example-api/pom.xml index 47847c135f6..d7e67b26ba9 100644 --- a/examples/karaf-redis-example/karaf-redis-example-api/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-command/pom.xml b/examples/karaf-redis-example/karaf-redis-example-command/pom.xml index fe8a4231a24..d48720d0f51 100644 --- a/examples/karaf-redis-example/karaf-redis-example-command/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-features/pom.xml b/examples/karaf-redis-example/karaf-redis-example-features/pom.xml index b400f9ba67b..e639b93687c 100644 --- a/examples/karaf-redis-example/karaf-redis-example-features/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-redis-example/karaf-redis-example-service/pom.xml b/examples/karaf-redis-example/karaf-redis-example-service/pom.xml index 64200ab4c1e..5b3a9eb00d3 100644 --- a/examples/karaf-redis-example/karaf-redis-example-service/pom.xml +++ b/examples/karaf-redis-example/karaf-redis-example-service/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-redis-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-redis-example/pom.xml b/examples/karaf-redis-example/pom.xml index 7dfcd9a0be9..1843d736be6 100644 --- a/examples/karaf-redis-example/pom.xml +++ b/examples/karaf-redis-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-api/pom.xml b/examples/karaf-rest-example/karaf-rest-example-api/pom.xml index 3d03508fd56..6871711fcd5 100644 --- a/examples/karaf-rest-example/karaf-rest-example-api/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml index b67d647b264..3848acf67c0 100644 --- a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml index 4c9eecf8f3b..022f2f7554c 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml @@ -17,7 +17,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml index 9ca74e82a94..ca8cad6c71d 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml index 59d85a20f11..01f57c3f967 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example-client - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-client/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/pom.xml index 7b1aefbefa3..0ee921e4bd5 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-features/pom.xml b/examples/karaf-rest-example/karaf-rest-example-features/pom.xml index 4e345938859..7d0ec896499 100644 --- a/examples/karaf-rest-example/karaf-rest-example-features/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml index 60831e0269d..7b1c056308d 100644 --- a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml index d82422a4438..b8c386ec7ff 100644 --- a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-rest-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-rest-example/pom.xml b/examples/karaf-rest-example/pom.xml index 8784ab62bb7..df028653586 100644 --- a/examples/karaf-rest-example/pom.xml +++ b/examples/karaf-rest-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml b/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml index 7dc1b8bff99..f7840d53fd1 100644 --- a/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml +++ b/examples/karaf-scheduler-example/karaf-scheduler-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scheduler-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml b/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml index 13cf3b48cc4..f3a09683f6f 100644 --- a/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml +++ b/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scheduler-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scheduler-example/pom.xml b/examples/karaf-scheduler-example/pom.xml index 7a7bcd245a9..747ce8b73b5 100644 --- a/examples/karaf-scheduler-example/pom.xml +++ b/examples/karaf-scheduler-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-api/pom.xml b/examples/karaf-scr-example/karaf-scr-example-api/pom.xml index cbe5ea12279..2b3fbf4365d 100644 --- a/examples/karaf-scr-example/karaf-scr-example-api/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-client/pom.xml b/examples/karaf-scr-example/karaf-scr-example-client/pom.xml index c91461d6fcd..c1a3a8b29cb 100644 --- a/examples/karaf-scr-example/karaf-scr-example-client/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-features/pom.xml b/examples/karaf-scr-example/karaf-scr-example-features/pom.xml index ec1b7675af8..a92c5d6397c 100644 --- a/examples/karaf-scr-example/karaf-scr-example-features/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml b/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml index dc86f37e550..50939932f64 100644 --- a/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml +++ b/examples/karaf-scr-example/karaf-scr-example-provider/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-scr-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-scr-example/pom.xml b/examples/karaf-scr-example/pom.xml index 815e3c8a822..6bef48671b7 100644 --- a/examples/karaf-scr-example/pom.xml +++ b/examples/karaf-scr-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml index 1661050e4d7..aeed7c13986 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml index e8f0acaa3af..758d6ca4ce4 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml index b6f906f76e5..0153c8e10d3 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml index 0ef4dfbecc3..3b3570d8e10 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml index eb646b653a9..96e75b8fe4e 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml index 72bdcbfbe54..7ab05aa2d21 100644 --- a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml +++ b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-servlet-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-servlet-example/pom.xml b/examples/karaf-servlet-example/pom.xml index 1e7c7d9c400..12a53ae053a 100644 --- a/examples/karaf-servlet-example/pom.xml +++ b/examples/karaf-servlet-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-api/pom.xml b/examples/karaf-soap-example/karaf-soap-example-api/pom.xml index d027223a9df..541599abbde 100644 --- a/examples/karaf-soap-example/karaf-soap-example-api/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml index cec76295134..ac6b841cb11 100644 --- a/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-client/pom.xml b/examples/karaf-soap-example/karaf-soap-example-client/pom.xml index 2dc168d8f4d..0673189154d 100644 --- a/examples/karaf-soap-example/karaf-soap-example-client/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-client/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-features/pom.xml b/examples/karaf-soap-example/karaf-soap-example-features/pom.xml index e8964a5a4ff..32442b0610a 100644 --- a/examples/karaf-soap-example/karaf-soap-example-features/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml index 1f311fc2a21..e1f4a7c1cf5 100644 --- a/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml +++ b/examples/karaf-soap-example/karaf-soap-example-scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-soap-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-soap-example/pom.xml b/examples/karaf-soap-example/pom.xml index 76862cfffac..8228d6a3d5e 100644 --- a/examples/karaf-soap-example/pom.xml +++ b/examples/karaf-soap-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml index 045d0c252cd..39bdd531e3f 100644 --- a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml +++ b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-url-namespace-handler-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml index bc7dc8c731b..1e8fd3d7471 100644 --- a/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml +++ b/examples/karaf-url-namespace-handler-example/karaf-url-namespace-handler-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-url-namespace-handler-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-url-namespace-handler-example/pom.xml b/examples/karaf-url-namespace-handler-example/pom.xml index 757e9a0bed2..8b9a9846ca8 100644 --- a/examples/karaf-url-namespace-handler-example/pom.xml +++ b/examples/karaf-url-namespace-handler-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-war-example/karaf-war-example-features/pom.xml b/examples/karaf-war-example/karaf-war-example-features/pom.xml index ed8ddb50139..46cda6542b9 100644 --- a/examples/karaf-war-example/karaf-war-example-features/pom.xml +++ b/examples/karaf-war-example/karaf-war-example-features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-war-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-war-example/karaf-war-example-webapp/pom.xml b/examples/karaf-war-example/karaf-war-example-webapp/pom.xml index 0e620323e72..9a14a2552af 100644 --- a/examples/karaf-war-example/karaf-war-example-webapp/pom.xml +++ b/examples/karaf-war-example/karaf-war-example-webapp/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples karaf-war-example - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-war-example/pom.xml b/examples/karaf-war-example/pom.xml index 9ac7c5fc3d1..2a2fa0113ad 100644 --- a/examples/karaf-war-example/pom.xml +++ b/examples/karaf-war-example/pom.xml @@ -25,7 +25,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/karaf-websocket-example/pom.xml b/examples/karaf-websocket-example/pom.xml index 08dfcaea44b..b36ac322aaf 100644 --- a/examples/karaf-websocket-example/pom.xml +++ b/examples/karaf-websocket-example/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.examples apache-karaf-examples - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index e5f35049952..3efaeb45bf8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/features/command/pom.xml b/features/command/pom.xml index e7e1ffbbcf1..734cacd2bcd 100644 --- a/features/command/pom.xml +++ b/features/command/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/features/core/pom.xml b/features/core/pom.xml index ec62364a660..03c3e4c58e9 100644 --- a/features/core/pom.xml +++ b/features/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/features/extension/pom.xml b/features/extension/pom.xml index 1c9c63b1846..d0facd980f8 100644 --- a/features/extension/pom.xml +++ b/features/extension/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.features features - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/features/pom.xml b/features/pom.xml index e0e3c4ee9ba..0667af756d7 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/http/pom.xml b/http/pom.xml index 8f0a988eb3e..3be80e8d3c6 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/instance/pom.xml b/instance/pom.xml index 2f570a07f69..afb24e84593 100644 --- a/instance/pom.xml +++ b/instance/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/itests/common/pom.xml b/itests/common/pom.xml index 894596e9696..1c74c3ab7bf 100644 --- a/itests/common/pom.xml +++ b/itests/common/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.itests itests - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/itests/pom.xml b/itests/pom.xml index 1d7145611b3..2f26e6bd40d 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/itests/test/pom.xml b/itests/test/pom.xml index 36e40cce23e..86f4c312aad 100644 --- a/itests/test/pom.xml +++ b/itests/test/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.itests itests - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jaas/blueprint/config/pom.xml b/jaas/blueprint/config/pom.xml index dda591774d3..b046fe43341 100644 --- a/jaas/blueprint/config/pom.xml +++ b/jaas/blueprint/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas.blueprint blueprint - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jaas/blueprint/jasypt/pom.xml b/jaas/blueprint/jasypt/pom.xml index a742062c50c..270cb64d25c 100644 --- a/jaas/blueprint/jasypt/pom.xml +++ b/jaas/blueprint/jasypt/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas.blueprint blueprint - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jaas/blueprint/pom.xml b/jaas/blueprint/pom.xml index 6a337bf4399..44dc70fb5d9 100644 --- a/jaas/blueprint/pom.xml +++ b/jaas/blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jaas/boot/pom.xml b/jaas/boot/pom.xml index 3bdeba8cee7..b24777f58f2 100644 --- a/jaas/boot/pom.xml +++ b/jaas/boot/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jaas/command/pom.xml b/jaas/command/pom.xml index 6e6594d9cd3..caa437520a2 100644 --- a/jaas/command/pom.xml +++ b/jaas/command/pom.xml @@ -24,7 +24,7 @@ jaas org.apache.karaf.jaas - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jaas/config/pom.xml b/jaas/config/pom.xml index 7beec960e64..1dfe1de2faa 100644 --- a/jaas/config/pom.xml +++ b/jaas/config/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml index 271892d3f8b..86ecbe6f942 100644 --- a/jaas/jasypt/pom.xml +++ b/jaas/jasypt/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml index 0034adb9b6a..c3fd364858a 100644 --- a/jaas/modules/pom.xml +++ b/jaas/modules/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jaas/pom.xml b/jaas/pom.xml index 20bda526eec..d5115cdb036 100644 --- a/jaas/pom.xml +++ b/jaas/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jaas/spring-security-crypto/pom.xml b/jaas/spring-security-crypto/pom.xml index 796b1de9a53..80b4f63cb64 100644 --- a/jaas/spring-security-crypto/pom.xml +++ b/jaas/spring-security-crypto/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.jaas jaas - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 7729591192f..042e6148724 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jms/pom.xml b/jms/pom.xml index 7e66b9d8265..2402c00f937 100644 --- a/jms/pom.xml +++ b/jms/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/jndi/pom.xml b/jndi/pom.xml index 753ca121969..bc79553e6ed 100644 --- a/jndi/pom.xml +++ b/jndi/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/kar/pom.xml b/kar/pom.xml index f97e5fe3b01..50fe3de1865 100644 --- a/kar/pom.xml +++ b/kar/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/log/pom.xml b/log/pom.xml index 821fa009954..a0206f995f9 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/main/pom.xml b/main/pom.xml index 9cc828fe0eb..6112db518a9 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/management/pom.xml b/management/pom.xml index 463ecca4f6d..1d1fa052163 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/management/server/pom.xml b/management/server/pom.xml index a8c9e8a74ef..94595b1b328 100644 --- a/management/server/pom.xml +++ b/management/server/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.management management - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/manual/pom.xml b/manual/pom.xml index 41836552dd7..c84ac921245 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -17,7 +17,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/maven/core/pom.xml b/maven/core/pom.xml index 3f6e6c196fc..70b4c2d4f4f 100644 --- a/maven/core/pom.xml +++ b/maven/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../../pom.xml diff --git a/maven/pom.xml b/maven/pom.xml index 3d22bbda80c..7264a3b9e98 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/obr/pom.xml b/obr/pom.xml index 65d6a30c544..91911efdb6a 100644 --- a/obr/pom.xml +++ b/obr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/package/pom.xml b/package/pom.xml index 5f0ef553f7c..4ba91b23bea 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 27bf3d7cf03..aa1d5749390 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.karaf karaf pom - 4.4.7 + 4.4.8-SNAPSHOT Apache Karaf 2007 @@ -84,7 +84,7 @@ ${scm.connection} ${scm.developerConnection} ${scm.url} - karaf-4.4.7 + karaf-4.4.5 @@ -150,7 +150,7 @@ - 1737368101 + 1737368569 scm:git:https://gitbox.apache.org/repos/asf/karaf.git scm:git:https://gitbox.apache.org/repos/asf/karaf.git diff --git a/profile/pom.xml b/profile/pom.xml index 8801378d607..8d86a918fe4 100644 --- a/profile/pom.xml +++ b/profile/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/scheduler/pom.xml b/scheduler/pom.xml index 7ccaeb64cc5..3e49b0b34d0 100644 --- a/scheduler/pom.xml +++ b/scheduler/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/scr/management/pom.xml b/scr/management/pom.xml index e583f9a595c..eb5d343556c 100644 --- a/scr/management/pom.xml +++ b/scr/management/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.scr scr - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/scr/pom.xml b/scr/pom.xml index e6fb90a0bf0..a35c2d2a08d 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/scr/state/pom.xml b/scr/state/pom.xml index 371621c83b4..352a44e4d8d 100644 --- a/scr/state/pom.xml +++ b/scr/state/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.scr scr - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/service/core/pom.xml b/service/core/pom.xml index 5f21112172b..fdf389a57f2 100644 --- a/service/core/pom.xml +++ b/service/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.service service - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/service/guard/pom.xml b/service/guard/pom.xml index 2f230841761..d9cad0031e9 100644 --- a/service/guard/pom.xml +++ b/service/guard/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.service service - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/service/pom.xml b/service/pom.xml index 2b7f9faf549..9faaaba27a6 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/services/coordinator/pom.xml b/services/coordinator/pom.xml index bb377f2ae17..7f932a9a458 100644 --- a/services/coordinator/pom.xml +++ b/services/coordinator/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.7 + 4.4.8-SNAPSHOT ../../pom.xml diff --git a/services/eventadmin/pom.xml b/services/eventadmin/pom.xml index 5362c00b9ef..2d3316a2d5d 100644 --- a/services/eventadmin/pom.xml +++ b/services/eventadmin/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.7 + 4.4.8-SNAPSHOT ../../pom.xml diff --git a/services/interceptor/api/pom.xml b/services/interceptor/api/pom.xml index 1cf25c11644..73ff8166242 100644 --- a/services/interceptor/api/pom.xml +++ b/services/interceptor/api/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services org.apache.karaf.services.interceptor - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/services/interceptor/impl/pom.xml b/services/interceptor/impl/pom.xml index 30aa6535e81..47afb50776b 100644 --- a/services/interceptor/impl/pom.xml +++ b/services/interceptor/impl/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services org.apache.karaf.services.interceptor - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/services/interceptor/pom.xml b/services/interceptor/pom.xml index a26b8c5b4dd..52b35b78e58 100644 --- a/services/interceptor/pom.xml +++ b/services/interceptor/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.services services - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/services/pom.xml b/services/pom.xml index c79203c12cc..4e725bfed86 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/services/staticcm/pom.xml b/services/staticcm/pom.xml index 1d021c0ae68..74678514333 100644 --- a/services/staticcm/pom.xml +++ b/services/staticcm/pom.xml @@ -24,7 +24,7 @@ karaf org.apache.karaf - 4.4.7 + 4.4.8-SNAPSHOT ../../pom.xml diff --git a/shell/commands/pom.xml b/shell/commands/pom.xml index 90fe4ad71e2..b6bf68e11ec 100644 --- a/shell/commands/pom.xml +++ b/shell/commands/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/shell/console/pom.xml b/shell/console/pom.xml index 7120de1effe..57db3ba09dc 100644 --- a/shell/console/pom.xml +++ b/shell/console/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/shell/core/pom.xml b/shell/core/pom.xml index f5e051f24da..dcdea0a1c82 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/shell/groovy/pom.xml b/shell/groovy/pom.xml index 56770861cc4..e902a20c2dc 100644 --- a/shell/groovy/pom.xml +++ b/shell/groovy/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/shell/pom.xml b/shell/pom.xml index 4fa8a07ae3a..c1c931cf31e 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index fb13a4168e9..58c20f67abf 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/shell/table/pom.xml b/shell/table/pom.xml index 636af74f1db..294c750a2f4 100644 --- a/shell/table/pom.xml +++ b/shell/table/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.shell shell - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/specs/activator/pom.xml b/specs/activator/pom.xml index fa23cd6a56f..2cc18cd0df2 100644 --- a/specs/activator/pom.xml +++ b/specs/activator/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.7 + 4.4.8-SNAPSHOT org.apache.karaf.specs.activator diff --git a/specs/java.xml.ws/pom.xml b/specs/java.xml.ws/pom.xml index 4776cd1c5d9..257778dc531 100644 --- a/specs/java.xml.ws/pom.xml +++ b/specs/java.xml.ws/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.7 + 4.4.8-SNAPSHOT org.apache.karaf.specs.java.xml.ws diff --git a/specs/java.xml/pom.xml b/specs/java.xml/pom.xml index 9ad87a87f90..e528ea5294b 100644 --- a/specs/java.xml/pom.xml +++ b/specs/java.xml/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.7 + 4.4.8-SNAPSHOT org.apache.karaf.specs.java.xml diff --git a/specs/locator/pom.xml b/specs/locator/pom.xml index 8981de86781..a9bf54ed39c 100644 --- a/specs/locator/pom.xml +++ b/specs/locator/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.specs specs - 4.4.7 + 4.4.8-SNAPSHOT org.apache.karaf.specs.locator diff --git a/specs/pom.xml b/specs/pom.xml index c6d88938277..b93f1d27983 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/subsystem/pom.xml b/subsystem/pom.xml index 9f411718199..f0c05968b50 100644 --- a/subsystem/pom.xml +++ b/subsystem/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT org.apache.karaf.subsystem diff --git a/system/pom.xml b/system/pom.xml index 502effd06b6..89f5d2c99df 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index 1e0654b4df1..70b16b7bc35 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/tooling/karaf-services-maven-plugin/pom.xml b/tooling/karaf-services-maven-plugin/pom.xml index c40d79fa213..952d505d5f9 100644 --- a/tooling/karaf-services-maven-plugin/pom.xml +++ b/tooling/karaf-services-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/tooling/pom.xml b/tooling/pom.xml index 32fdf29731f..b2550596b58 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/tooling/utils/pom.xml b/tooling/utils/pom.xml index 92041ea3ad9..4ca7b86b662 100644 --- a/tooling/utils/pom.xml +++ b/tooling/utils/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.tooling tooling - 4.4.7 + 4.4.8-SNAPSHOT org.apache.karaf.tools.utils diff --git a/util/pom.xml b/util/pom.xml index 4c9eb7fbcb7..e030c138307 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/web/pom.xml b/web/pom.xml index a2e7e5b24f5..ab46f8eb820 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml index ec60b0b8920..91ade5a38ec 100644 --- a/webconsole/console/pom.xml +++ b/webconsole/console/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml index 88d74ee481f..b2e1fa311f7 100644 --- a/webconsole/features/pom.xml +++ b/webconsole/features/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/webconsole/gogo/pom.xml b/webconsole/gogo/pom.xml index d771fb2f6a0..ba0b1b1e99f 100644 --- a/webconsole/gogo/pom.xml +++ b/webconsole/gogo/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/webconsole/http/pom.xml b/webconsole/http/pom.xml index dfddf5fb670..b80553ba00d 100644 --- a/webconsole/http/pom.xml +++ b/webconsole/http/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf.webconsole webconsole - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/webconsole/instance/pom.xml b/webconsole/instance/pom.xml index 7fad39b3384..623b848c04f 100644 --- a/webconsole/instance/pom.xml +++ b/webconsole/instance/pom.xml @@ -19,7 +19,7 @@ org.apache.karaf.webconsole webconsole - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/webconsole/pom.xml b/webconsole/pom.xml index 697b98592f6..ef38b8b08b2 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml diff --git a/wrapper/pom.xml b/wrapper/pom.xml index b9dc9b0e15c..ecae42c3d5f 100644 --- a/wrapper/pom.xml +++ b/wrapper/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.4.7 + 4.4.8-SNAPSHOT ../pom.xml From 8c51c3d180254ad101953a8d2b69b7401a37b27e Mon Sep 17 00:00:00 2001 From: Andre Schlegel-Tylla Date: Wed, 22 Jan 2025 06:48:59 +0100 Subject: [PATCH 141/440] KARAF-7940 Upgrade to CXF 3.6.5 (cherry picked from commit f0c2b0c0a9e0049cab99292f70f5b7c5dfbad10e) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa1d5749390..19dfa5fa334 100644 --- a/pom.xml +++ b/pom.xml @@ -172,7 +172,7 @@ 1.78.1 3.6.0 3.2.9_1 - 3.6.4 + 3.6.5 2.18.2 5.16.0 2.3.9 From 22a1e2a13873e5ae0a4a06ced4b02db7272fde02 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 23 Apr 2025 17:35:28 +0200 Subject: [PATCH 142/440] [KARAF-7949] Add karaf-bom-nodeps artifact Some downstream do not want the entire dependencyManagement section from our bom. This adds a minimal bom, which list only Karaf artifacts. Signed-off-by: Robert Varga (cherry picked from commit 6d1c155d373eea1f07881fe4277e4d4774a8b388) --- bom/nodeps/pom.xml | 500 +++++++++++++++++++++++++++++++++++++++++++++ bom/pom.xml | 466 ++---------------------------------------- 2 files changed, 512 insertions(+), 454 deletions(-) create mode 100644 bom/nodeps/pom.xml diff --git a/bom/nodeps/pom.xml b/bom/nodeps/pom.xml new file mode 100644 index 00000000000..3f09a915d76 --- /dev/null +++ b/bom/nodeps/pom.xml @@ -0,0 +1,500 @@ + + + + + + 4.0.0 + + + org.apache.karaf + karaf + 4.5.0-SNAPSHOT + ../../pom.xml + + + karaf-bom-nodeps + Apache Karaf :: BOM :: Karaf Only + pom + + + + + + org.apache.karaf + apache-karaf + tar.gz + ${project.version} + + + org.apache.karaf + apache-karaf + zip + ${project.version} + + + org.apache.karaf + apache-karaf-minimal + tar.gz + ${project.version} + + + org.apache.karaf + apache-karaf-minimal + zip + ${project.version} + + + org.apache.karaf + manual + ${project.version} + + + org.apache.karaf + manual + html + ${project.version} + + + org.apache.karaf + manual + pdf + ${project.version} + + + org.apache.karaf + org.apache.karaf.client + ${project.version} + + + org.apache.karaf + org.apache.karaf.event + ${project.version} + + + org.apache.karaf + org.apache.karaf.main + ${project.version} + + + org.apache.karaf + org.apache.karaf.util + ${project.version} + + + + org.apache.karaf.audit + org.apache.karaf.audit.core + ${project.version} + + + + org.apache.karaf.bundle + org.apache.karaf.bundle.core + ${project.version} + + + org.apache.karaf.bundle + org.apache.karaf.bundle.blueprintstate + ${project.version} + + + org.apache.karaf.bundle + org.apache.karaf.bundle.springstate + ${project.version} + + + + org.apache.karaf.config + org.apache.karaf.config.core + ${project.version} + + + + org.apache.karaf.deployer + org.apache.karaf.deployer.blueprint + ${project.version} + + + org.apache.karaf.deployer + org.apache.karaf.deployer.features + ${project.version} + + + org.apache.karaf.deployer + org.apache.karaf.deployer.kar + ${project.version} + + + org.apache.karaf.deployer + org.apache.karaf.deployer.spring + ${project.version} + + + org.apache.karaf.deployer + org.apache.karaf.deployer.wrap + ${project.version} + + + + org.apache.karaf.diagnostic + org.apache.karaf.diagnostic.boot + ${project.version} + + + org.apache.karaf.diagnostic + org.apache.karaf.diagnostic.core + ${project.version} + + + + org.apache.karaf.features + base + ${project.version} + + + org.apache.karaf.features + org.apache.karaf.features.command + ${project.version} + + + org.apache.karaf.features + org.apache.karaf.features.core + ${project.version} + + + org.apache.karaf.features + org.apache.karaf.features.extension + ${project.version} + + + + org.apache.karaf.http + org.apache.karaf.http.core + ${project.version} + + + + org.apache.karaf.instance + org.apache.karaf.instance.core + ${project.version} + + + + org.apache.karaf.itests + itests + ${project.version} + + + + org.apache.karaf.jaas + org.apache.karaf.jaas.boot + ${project.version} + + + org.apache.karaf.jaas + org.apache.karaf.jaas.command + ${project.version} + + + org.apache.karaf.jaas + org.apache.karaf.jaas.config + ${project.version} + + + org.apache.karaf.jaas + org.apache.karaf.jaas.jasypt + ${project.version} + + + org.apache.karaf.jaas + org.apache.karaf.jaas.modules + ${project.version} + + + org.apache.karaf.jaas + org.apache.karaf.jaas.spring-security-crypto + ${project.version} + + + + org.apache.karaf.jaas.blueprint + org.apache.karaf.jaas.blueprint.config + ${project.version} + + + org.apache.karaf.jaas.blueprint + org.apache.karaf.jaas.blueprint.jasypt + ${project.version} + + + + org.apache.karaf.jdbc + org.apache.karaf.jdbc.core + ${project.version} + + + + org.apache.karaf.jms + org.apache.karaf.jms.core + ${project.version} + + + + org.apache.karaf.jndi + org.apache.karaf.jndi.core + ${project.version} + + + + org.apache.karaf.kar + org.apache.karaf.kar.core + ${project.version} + + + + org.apache.karaf.log + org.apache.karaf.log.core + ${project.version} + + + + org.apache.karaf.management + org.apache.karaf.management.server + ${project.version} + + + + org.apache.karaf.obr + org.apache.karaf.obr.core + ${project.version} + + + + org.apache.karaf.package + org.apache.karaf.package.core + ${project.version} + + + + org.apache.karaf.profile + org.apache.karaf.profile.core + ${project.version} + + + + org.apache.karaf.scheduler + org.apache.karaf.scheduler.core + ${project.version} + + + + org.apache.karaf.scr + org.apache.karaf.scr.management + ${project.version} + + + org.apache.karaf.scr + org.apache.karaf.scr.state + ${project.version} + + + + org.apache.karaf.service + org.apache.karaf.service.core + ${project.version} + + + org.apache.karaf.service + org.apache.karaf.service.guard + ${project.version} + + + + org.apache.karaf.services + org.apache.karaf.services.coordinator + ${project.version} + + + org.apache.karaf.services + org.apache.karaf.services.eventadmin + ${project.version} + + + org.apache.karaf.services + org.apache.karaf.services.staticcm + ${project.version} + + + + org.apache.karaf.shell + org.apache.karaf.shell.commands + ${project.version} + + + org.apache.karaf.shell + org.apache.karaf.shell.console + ${project.version} + + + org.apache.karaf.shell + org.apache.karaf.shell.core + ${project.version} + + + org.apache.karaf.shell + org.apache.karaf.shell.ssh + ${project.version} + + + org.apache.karaf.shell + org.apache.karaf.shell.table + ${project.version} + + + + org.apache.karaf.specs + org.apache.karaf.specs.locator + ${project.version} + + + org.apache.karaf.specs + org.apache.karaf.specs.activator + ${project.version} + + + org.apache.karaf.specs + org.apache.karaf.specs.java.xml + ${project.version} + + + org.apache.karaf.specs + org.apache.karaf.specs.java.xml.ws + ${project.version} + + + + org.apache.karaf.subsystem + org.apache.karaf.subsystem.core + ${project.version} + + + + org.apache.karaf.tooling.exam + org.apache.karaf.tooling.exam.container + ${project.version} + + + + org.apache.karaf.system + org.apache.karaf.system.core + ${project.version} + + + + org.apache.karaf.web + org.apache.karaf.web.core + ${project.version} + + + + org.apache.karaf.webconsole + org.apache.karaf.webconsole.console + ${project.version} + + + org.apache.karaf.webconsole + org.apache.karaf.webconsole.features + ${project.version} + + + org.apache.karaf.webconsole + org.apache.karaf.webconsole.gogo + ${project.version} + + + org.apache.karaf.webconsole + org.apache.karaf.webconsole.http + ${project.version} + + + org.apache.karaf.webconsole + org.apache.karaf.webconsole.instance + ${project.version} + + + + org.apache.karaf.wrapper + org.apache.karaf.wrapper.core + ${project.version} + + + + + org.apache.karaf.features + enterprise + xml + features + ${project.version} + + + org.apache.karaf.features + framework + features + xml + ${project.version} + + + org.apache.karaf.features + specs + xml + features + ${project.version} + + + org.apache.karaf.features + spring + xml + features + ${project.version} + + + org.apache.karaf.features + standard + xml + features + ${project.version} + + + + + org.apache.karaf.features + framework + kar + ${project.version} + + + org.apache.karaf.features + static + kar + ${project.version} + + + + + diff --git a/bom/pom.xml b/bom/pom.xml index 2fa27ab29d7..c74e258ff65 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -34,6 +34,14 @@ + + org.apache.karaf + karaf-bom-nodeps + ${project.version} + pom + import + + org.glassfish.jaxb jaxb-bom @@ -114,460 +122,6 @@ provided - - org.apache.karaf - manual - ${project.version} - - - org.apache.karaf - manual - pdf - ${project.version} - - - org.apache.karaf - manual - html - ${project.version} - - - org.apache.karaf - org.apache.karaf.main - ${project.version} - - - org.apache.karaf.audit - org.apache.karaf.audit.core - ${project.version} - - - org.apache.karaf - org.apache.karaf.util - ${project.version} - - - org.apache.karaf - org.apache.karaf.client - ${project.version} - - - org.apache.karaf.specs - org.apache.karaf.specs.locator - ${project.version} - - - org.apache.karaf.specs - org.apache.karaf.specs.activator - ${project.version} - - - org.apache.karaf.specs - org.apache.karaf.specs.java.xml - ${project.version} - - - org.apache.karaf.specs - org.apache.karaf.specs.java.xml.ws - ${project.version} - - - - org.apache.karaf.bundle - org.apache.karaf.bundle.core - ${project.version} - - - org.apache.karaf.bundle - org.apache.karaf.bundle.springstate - ${project.version} - - - org.apache.karaf.bundle - org.apache.karaf.bundle.blueprintstate - ${project.version} - - - - org.apache.karaf.package - org.apache.karaf.package.core - ${project.version} - - - - org.apache.karaf.http - org.apache.karaf.http.core - ${project.version} - - - - org.apache.karaf.jdbc - org.apache.karaf.jdbc.core - ${project.version} - - - - org.apache.karaf.jms - org.apache.karaf.jms.core - ${project.version} - - - - org.apache.karaf.jndi - org.apache.karaf.jndi.core - ${project.version} - - - - org.apache.karaf.service - org.apache.karaf.service.core - ${project.version} - - - org.apache.karaf.service - org.apache.karaf.service.guard - ${project.version} - - - - org.apache.karaf.log - org.apache.karaf.log.core - ${project.version} - - - - org.apache.karaf.config - org.apache.karaf.config.core - ${project.version} - - - - org.apache.karaf.deployer - org.apache.karaf.deployer.spring - ${project.version} - - - org.apache.karaf.deployer - org.apache.karaf.deployer.blueprint - ${project.version} - - - org.apache.karaf.deployer - org.apache.karaf.deployer.features - ${project.version} - - - org.apache.karaf.deployer - org.apache.karaf.deployer.kar - ${project.version} - - - org.apache.karaf.deployer - org.apache.karaf.deployer.wrap - ${project.version} - - - - org.apache.karaf.kar - org.apache.karaf.kar.core - ${project.version} - - - - org.apache.karaf.obr - org.apache.karaf.obr.core - ${project.version} - - - - org.apache.karaf.management - org.apache.karaf.management.server - ${project.version} - - - - org.apache.karaf.features - org.apache.karaf.features.extension - ${project.version} - - - org.apache.karaf.features - org.apache.karaf.features.core - ${project.version} - - - org.apache.karaf.features - org.apache.karaf.features.command - ${project.version} - - - - - org.apache.karaf.profile - org.apache.karaf.profile.core - ${project.version} - - - - org.apache.karaf.diagnostic - org.apache.karaf.diagnostic.boot - ${project.version} - - - org.apache.karaf.diagnostic - org.apache.karaf.diagnostic.core - ${project.version} - - - - org.apache.karaf.instance - org.apache.karaf.instance.core - ${project.version} - - - - org.apache.karaf.system - org.apache.karaf.system.core - ${project.version} - - - - org.apache.karaf.web - org.apache.karaf.web.core - ${project.version} - - - - org.apache.karaf.wrapper - org.apache.karaf.wrapper.core - ${project.version} - - - - org.apache.karaf.shell - org.apache.karaf.shell.console - ${project.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.ssh - ${project.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.commands - ${project.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.table - ${project.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.core - ${project.version} - - - - org.apache.karaf.jaas - org.apache.karaf.jaas.boot - ${project.version} - - - org.apache.karaf.jaas - org.apache.karaf.jaas.command - ${project.version} - - - org.apache.karaf.jaas - org.apache.karaf.jaas.config - ${project.version} - - - org.apache.karaf.jaas - org.apache.karaf.jaas.jasypt - ${project.version} - - - org.apache.karaf.jaas - org.apache.karaf.jaas.spring-security-crypto - ${project.version} - - - org.apache.karaf.jaas - org.apache.karaf.jaas.modules - ${project.version} - - - org.apache.karaf.jaas.blueprint - org.apache.karaf.jaas.blueprint.config - ${project.version} - - - org.apache.karaf.jaas.blueprint - org.apache.karaf.jaas.blueprint.jasypt - ${project.version} - - - - org.apache.karaf.webconsole - org.apache.karaf.webconsole.instance - ${project.version} - - - org.apache.karaf.webconsole - org.apache.karaf.webconsole.console - ${project.version} - - - org.apache.karaf.webconsole - org.apache.karaf.webconsole.features - ${project.version} - - - org.apache.karaf.webconsole - org.apache.karaf.webconsole.gogo - ${project.version} - - - org.apache.karaf.webconsole - org.apache.karaf.webconsole.http - ${project.version} - - - - org.apache.karaf.scheduler - org.apache.karaf.scheduler.core - ${project.version} - - - - org.apache.karaf.services - org.apache.karaf.services.staticcm - ${project.version} - - - org.apache.karaf.services - org.apache.karaf.services.eventadmin - ${project.version} - - - org.apache.karaf - org.apache.karaf.event - ${project.version} - - - org.apache.karaf.services - org.apache.karaf.services.coordinator - ${project.version} - - - - org.apache.karaf.subsystem - org.apache.karaf.subsystem.core - ${project.version} - - - - org.apache.karaf.scr - org.apache.karaf.scr.management - ${project.version} - - - org.apache.karaf.scr - org.apache.karaf.scr.state - ${project.version} - - - - org.apache.karaf.tooling.exam - org.apache.karaf.tooling.exam.container - ${project.version} - - - - org.apache.karaf - apache-karaf - tar.gz - ${project.version} - - - org.apache.karaf - apache-karaf - zip - ${project.version} - - - org.apache.karaf - apache-karaf-minimal - tar.gz - ${project.version} - - - org.apache.karaf - apache-karaf-minimal - zip - ${project.version} - - - org.apache.karaf.features - enterprise - xml - features - ${project.version} - - - org.apache.karaf.features - base - ${project.version} - - - org.apache.karaf.features - framework - kar - ${project.version} - - - org.apache.karaf.features - framework - features - xml - ${project.version} - - - org.apache.karaf.features - static - kar - ${project.version} - - - org.apache.karaf.features - specs - xml - features - ${project.version} - - - org.apache.karaf.features - spring - xml - features - ${project.version} - - - org.apache.karaf.features - standard - xml - features - ${project.version} - - - org.apache.karaf.itests - itests - ${project.version} - - javax.mail mail @@ -1626,4 +1180,8 @@ + + nodeps + + From de9a50fd0a602a3b9709e08aa481a0c19e70fdc4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 3 Jul 2025 00:18:07 +0200 Subject: [PATCH 143/440] [KARAF-7971] Support Java 26 Update jre.properties and Builder.JavaVersion to suport Javaversions up to, and including Java 26. Signed-off-by: Robert Varga (cherry picked from commit 521aa5d93dc0c7efe1a5c4842999690f2ae1d200) --- .../main/filtered-resources/resources/etc/jre.properties | 3 +++ .../java/org/apache/karaf/profile/assembly/Builder.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties index 57b572abfc9..80137d6c66f 100644 --- a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties +++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties @@ -508,3 +508,6 @@ jre-19 = ${jre-9} jre-20 = ${jre-9} jre-21 = ${jre-9} jre-23 = ${jre-9} +jre-24 = ${jre-9} +jre-25 = ${jre-9} +jre-26 = ${jre-9} diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java index 160f0596151..76bc5d403cf 100644 --- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java +++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java @@ -199,7 +199,12 @@ public enum JavaVersion { Java18("18"), Java19("19"), Java20("20"), - Java21("21"); + Java21("21"), + Java22("22"), + Java23("23"), + Java24("24"), + Java25("25"), + Java26("26"); private String version; From fe26dd0d6e345b2fd9f3b0dd8429516a04137cc3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 3 Jul 2025 00:29:55 +0200 Subject: [PATCH 144/440] [KARAF-7961]: Bump SSHD to 2.15.0 https://github.com/apache/mina-sshd/blob/master/docs/changes/2.15.0.md Signed-off-by: Robert Varga (cherry picked from commit 40d49242d848654104b8cf714af7a1e5dd5f87d3) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19dfa5fa334..72ddb0d65e5 100644 --- a/pom.xml +++ b/pom.xml @@ -349,7 +349,7 @@ 6.2.1_1 1.2.16 - 2.14.0 + 2.15.0 1.3.10_1 4.26 1.4.7 From 99552f6ea2be1e4b1185c3dfd18abb6ddad340e3 Mon Sep 17 00:00:00 2001 From: Matt Pavlovich Date: Wed, 7 May 2025 10:09:52 -0500 Subject: [PATCH 145/440] [KARAF-7856] Improve support for JAAS roles that extend Karaf's RolePrincipal (cherry picked from commit 41b428e0cef6775d3d9f1c06ffec43b2c1497e96) --- .../secured/SecuredSessionFactoryImpl.java | 13 ++++++-- .../shell/ssh/ExtendedRolePrincipal.java | 31 +++++++++++++++++++ .../shell/ssh/KarafJaasAuthenticatorTest.java | 10 +++++- 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 shell/ssh/src/test/java/org/apache/karaf/shell/ssh/ExtendedRolePrincipal.java diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java index 5de937131c3..e9544265ea6 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java @@ -266,9 +266,12 @@ void checkSecurity(String scope, String name, List arguments) { static boolean currentUserHasRole(String requestedRole) { String clazz; String role; + boolean customClazz = false; + int index = requestedRole.indexOf(':'); if (index > 0) { clazz = requestedRole.substring(0, index); + customClazz = true; role = requestedRole.substring(index + 1); } else { clazz = RolePrincipal.class.getName(); @@ -286,8 +289,14 @@ static boolean currentUserHasRole(String requestedRole) { } for (Principal p : subject.getPrincipals()) { - if (clazz.equals(p.getClass().getName()) && role.equals(p.getName())) { - return true; + if (customClazz) { + if(clazz.equals(p.getClass().getName()) && role.equals(p.getName())) { + return true; + } + } else { + if(RolePrincipal.class.isAssignableFrom(p.getClass()) && role.equals(p.getName())) { + return true; + } } } diff --git a/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/ExtendedRolePrincipal.java b/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/ExtendedRolePrincipal.java new file mode 100644 index 00000000000..a67e32efd7f --- /dev/null +++ b/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/ExtendedRolePrincipal.java @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.karaf.shell.ssh; + +import org.apache.karaf.jaas.boot.principal.RolePrincipal; + +public class ExtendedRolePrincipal extends RolePrincipal { + + private static final long serialVersionUID = 1L; + + public ExtendedRolePrincipal(String name) { + super(name); + } + +} diff --git a/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticatorTest.java b/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticatorTest.java index 577d6971056..fe88588a31d 100644 --- a/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticatorTest.java +++ b/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticatorTest.java @@ -175,7 +175,12 @@ public void customRole() { new Class[]{UserPrincipal.class}); assertTrue(authenticator.authenticate("customRole", "test", session)); } - + @Test + public void extendedRole() { + final KarafJaasAuthenticator authenticator = new KarafJaasAuthenticator("karaf", "test", + new Class[]{RolePrincipal.class}); + assertTrue(authenticator.authenticate("extendedRole", "test", session)); + } public static class SayYes implements LoginModule { private String name; private Subject subject; @@ -208,6 +213,9 @@ public boolean commit() { case "customRole": subject.getPrincipals().add(new UserPrincipal("test")); break; + case "extendedRole": + subject.getPrincipals().add(new ExtendedRolePrincipal("test")); + break; case "test": subject.getPrincipals().add(new RolePrincipal("test")); break; From 73841945f8b3da5ee7e56451bfc31b57b8dddcf1 Mon Sep 17 00:00:00 2001 From: Matt Pavlovich Date: Mon, 23 Jun 2025 10:26:55 -0500 Subject: [PATCH 146/440] [KARAF-6158] Update AbstractKarafLoginModule to use an ordered set for principals (cherry picked from commit 7faf00c0af03f1e4d420751db84d988656b8994d) --- .../apache/karaf/jaas/modules/AbstractKarafLoginModule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java index cd017113b6f..e3b5e1da5d3 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/AbstractKarafLoginModule.java @@ -15,7 +15,7 @@ package org.apache.karaf.jaas.modules; import java.security.Principal; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; import javax.security.auth.Subject; @@ -37,7 +37,7 @@ public abstract class AbstractKarafLoginModule implements LoginModule { private static final transient Logger LOGGER = LoggerFactory.getLogger(AbstractKarafLoginModule.class); - protected Set principals = new HashSet<>(); + protected Set principals = new LinkedHashSet<>(); protected Subject subject; protected String user; protected CallbackHandler callbackHandler; From 5ac0f1e798ed100c00ba869a7c5c156bf9763ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 3 Jul 2025 06:10:52 +0200 Subject: [PATCH 147/440] KARAF-7958: Upgrade to commons-io 2.19.0 (cherry picked from commit 95151c24dd5bcd36320a6e5aec59d5928b47c35d) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 72ddb0d65e5..c48cace58f2 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,7 @@ 3.17.0 1.3.4 2.12.0 - 2.18.0 + 2.19.0 2.7.15 1.9.3_1 1.7.1 From 0fec7d67e4242fdae5340e9ac941dee3a1b185ce Mon Sep 17 00:00:00 2001 From: Matt Pavlovich Date: Thu, 8 May 2025 10:03:00 -0500 Subject: [PATCH 148/440] [KARAF-7805] Add JAAS Subject to SSH shell session (cherry picked from commit 0d836aac632488c769567ddd347cb7ddf0429b12) --- .../java/org/apache/karaf/shell/ssh/ShellCommand.java | 11 ++++++----- .../org/apache/karaf/shell/ssh/ShellFactoryImpl.java | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java index 3eefbddce5b..1affedb0546 100644 --- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java +++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellCommand.java @@ -62,7 +62,7 @@ public class ShellCommand implements Command { private OutputStream out; private OutputStream err; private ExitCallback callback; - private ServerSession session; + private ServerSession serverSession; private SessionFactory sessionFactory; private Environment env; @@ -89,7 +89,7 @@ public void setExitCallback(ExitCallback callback) { @Override public void start(ChannelSession channelSession, Environment environment) throws IOException { - this.session = channelSession.getServerSession(); + this.serverSession = channelSession.getServerSession(); this.env = environment; new Thread(this::run).start(); } @@ -102,9 +102,10 @@ public void run() { session.put(e.getKey(), e.getValue()); } try { - Subject subject = this.session != null ? this.session.getAttribute(KarafJaasAuthenticator.SUBJECT_ATTRIBUTE_KEY) : null; + Subject subject = this.serverSession != null ? this.serverSession.getAttribute(KarafJaasAuthenticator.SUBJECT_ATTRIBUTE_KEY) : null; Object result; if (subject != null) { + session.put(Subject.class.getName(), subject); try { result = JaasHelper.doAs(subject, (PrivilegedExceptionAction) () -> { String scriptFileName = System.getProperty(EXEC_INIT_SCRIPT); @@ -145,8 +146,8 @@ public void run() { } finally { callback.onExit(exitStatus); StreamUtils.close(in, out, err); - if (session != null) { - session.close(false); + if (serverSession != null) { + serverSession.close(false); } } } diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java index dcfec7c1787..54487b71447 100644 --- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java +++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java @@ -108,6 +108,7 @@ public void start(ChannelSession channelSession, Environment environment) throws for (Map.Entry e : environment.getEnv().entrySet()) { shell.put(e.getKey(), e.getValue()); } + shell.put(Subject.class.getName(), subject); JaasHelper.runAs(subject, () -> new Thread(shell, "Karaf ssh console user " + ShellUtil.getCurrentUserName()).start()); } catch (Exception e) { From c7c61a339b0553b22283eef1664e2f3d0aa804c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 3 Jul 2025 09:52:00 +0200 Subject: [PATCH 149/440] KARAF-7959: Upgrade to commons-logging 1.3.5 (cherry picked from commit 858c82626f425be91c40c4e9ad80a03741dbdee4) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c48cace58f2..8825e1fcaa0 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ 1.27.1 1.5 3.17.0 - 1.3.4 + 1.3.5 2.12.0 2.19.0 2.7.15 From 9ba5c5fcded38750f10ded1c2c82689499ed88e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 3 Jul 2025 10:58:27 +0200 Subject: [PATCH 150/440] KARAF-7960: Upgrade to JNA 5.17.0 (cherry picked from commit c718977c8c531ce6c20fd36df9d13468cc824431) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8825e1fcaa0..99f9a40ad08 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ 3.2.9_1 3.6.5 2.18.2 - 5.16.0 + 5.17.0 2.3.9 1.9.4 1.15 From 086a8012153daff670e75ba2e6841824e9af55ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 3 Jul 2025 13:45:58 +0200 Subject: [PATCH 151/440] KARAF-7962: Upgrade to xbean 4.27 (cherry picked from commit 3201ecc99255deba9135737cdb89754c0a16be8c) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99f9a40ad08..9dc5de463e5 100644 --- a/pom.xml +++ b/pom.xml @@ -351,7 +351,7 @@ 1.2.16 2.15.0 1.3.10_1 - 4.26 + 4.27 1.4.7 2.3.0 From ee1a53449d2f8b88a5abc161171e5c34ac700908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Sat, 5 Jul 2025 06:48:18 +0200 Subject: [PATCH 152/440] KARAF-7963: Upgrade to jansi 2.4.2 (cherry picked from commit f713031b4e2ca4f8bce010a5219a4846fd41740c) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9dc5de463e5..9ec00855f84 100644 --- a/pom.xml +++ b/pom.xml @@ -278,7 +278,7 @@ 5.6.7.Final 7.0.2.Final 4.5.13 - 2.4.1 + 2.4.2 3.9.0.GA 3.21.0 4.13.2 From 1720906f7427034b1890bb85249e28e9c3b83518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Sat, 5 Jul 2025 17:05:33 +0200 Subject: [PATCH 153/440] KARAF-7964: Upgrade to ASM 9.8 (cherry picked from commit 3791feaf9263eddc46a9abcef0d6d05f9fdcc37c) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ec00855f84..da390405213 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 5.17.1 1.0_6 1.9.5_1 - 9.7.1 + 9.8 1.3.2 3.1.6 1.78.1 From 53d6ce8b3f6e6906884e84f9163588e65837651a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Sun, 6 Jul 2025 06:37:14 +0200 Subject: [PATCH 154/440] KARAF-7975: Upgrade to Pax Web 8.0.32 (cherry picked from commit 6256178d43292b64933c2f25f6be68d41deea285) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index da390405213..a9467af8d8f 100644 --- a/pom.xml +++ b/pom.xml @@ -311,7 +311,7 @@ 1.5.1 1.8.5 2.6.16 - 8.0.30 + 8.0.32 9.4.57.v20241219 3.0.0 1.5.7 From b5223964733da2c8444d5a61d9bac87128112a6a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 23 Apr 2025 19:07:26 +0200 Subject: [PATCH 155/440] [KARAF-7950] Use modular OSGi dependencies osgi-core is non-modular, i.e. it has no Automatic-Module-Name declaration. This patches switches to using org.osgi.{dto,framework,resource,...}, which are provide this stability. Signed-off-by: Robert Varga (cherry picked from commit e62f7cb4c4001421ad6128e731622b202feed88e) --- audit/pom.xml | 2 +- bom/pom.xml | 121 ++++++++++++++++++++++++++-- bundle/blueprintstate/pom.xml | 3 +- bundle/core/pom.xml | 16 ++-- bundle/springstate/pom.xml | 3 +- config/command/pom.xml | 5 +- config/core/pom.xml | 9 +-- deployer/blueprint/pom.xml | 7 +- deployer/features/pom.xml | 9 ++- deployer/kar/pom.xml | 3 +- deployer/spring/pom.xml | 7 +- deployer/wrap/pom.xml | 7 +- diagnostic/boot/pom.xml | 3 +- diagnostic/core/pom.xml | 8 +- docker/pom.xml | 3 +- event/pom.xml | 7 +- features/command/pom.xml | 3 +- features/core/pom.xml | 18 ++--- features/extension/pom.xml | 7 +- http/pom.xml | 5 +- instance/pom.xml | 3 +- itests/common/pom.xml | 9 ++- itests/test/pom.xml | 3 +- jaas/blueprint/config/pom.xml | 5 -- jaas/boot/pom.xml | 3 +- jaas/command/pom.xml | 3 +- jaas/config/pom.xml | 7 +- jaas/jasypt/pom.xml | 14 ++-- jaas/modules/pom.xml | 13 +-- jaas/spring-security-crypto/pom.xml | 14 ++-- jdbc/pom.xml | 5 +- jms/pom.xml | 4 +- jndi/pom.xml | 2 +- kar/pom.xml | 4 +- log/pom.xml | 7 +- main/pom.xml | 3 +- management/server/pom.xml | 9 ++- maven/core/pom.xml | 2 +- obr/pom.xml | 3 +- package/pom.xml | 7 +- pom.xml | 17 +++- profile/pom.xml | 8 +- scheduler/pom.xml | 8 +- scr/management/pom.xml | 9 ++- scr/state/pom.xml | 21 +++-- service/core/pom.xml | 7 +- service/guard/pom.xml | 12 ++- services/coordinator/pom.xml | 5 -- services/eventadmin/pom.xml | 9 ++- services/interceptor/impl/pom.xml | 3 +- services/staticcm/pom.xml | 9 ++- shell/commands/pom.xml | 7 +- shell/console/pom.xml | 12 ++- shell/core/pom.xml | 13 ++- shell/ssh/pom.xml | 8 +- specs/activator/pom.xml | 3 +- specs/locator/pom.xml | 20 ----- subsystem/pom.xml | 7 +- system/pom.xml | 3 +- util/pom.xml | 16 ++-- web/pom.xml | 3 +- webconsole/console/pom.xml | 10 ++- webconsole/features/pom.xml | 3 +- webconsole/gogo/pom.xml | 3 +- webconsole/http/pom.xml | 3 +- webconsole/instance/pom.xml | 3 +- wrapper/pom.xml | 2 +- 67 files changed, 358 insertions(+), 232 deletions(-) diff --git a/audit/pom.xml b/audit/pom.xml index 61d6599b7d8..fe2ac81bc28 100644 --- a/audit/pom.xml +++ b/audit/pom.xml @@ -53,7 +53,7 @@ org.osgi - osgi.core + org.osgi.framework org.osgi diff --git a/bom/pom.xml b/bom/pom.xml index c74e258ff65..9552dea33ca 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -49,12 +49,111 @@ pom import + + org.osgi osgi.core ${osgi.version} provided + + + + org.osgi + org.osgi.annotation.bundle + ${org.osgi.annotation.bundle.version} + provided + + + org.osgi + org.osgi.annotation.versioning + ${org.osgi.annotation.versioning.version} + provided + + + + + org.osgi + org.osgi.dto + ${org.osgi.dto.version} + provided + + + org.osgi + org.osgi.framework + ${org.osgi.framework.version} + provided + + + org.osgi + org.osgi.resource + ${org.osgi.resource.version} + provided + + + org.osgi + org.osgi.service.condition + ${org.osgi.service.condition.version} + provided + + + org.osgi + org.osgi.service.condpermadmin + ${org.osgi.service.condpermadmin.version} + provided + + + org.osgi + org.osgi.service.log + ${org.osgi.service.log.version} + provided + + + + org.osgi + org.osgi.service.packageadmin + ${org.osgi.service.packageadmin.version} + provided + + + org.osgi + org.osgi.service.permissionadmin + ${org.osgi.service.permissionadmin.version} + provided + + + org.osgi + org.osgi.service.resolver + ${org.osgi.service.resolver.version} + provided + + + org.osgi + org.osgi.service.startlevel + ${org.osgi.service.startlevel.version} + provided + + + org.osgi + org.osgi.service.url + ${org.osgi.service.url.version} + provided + + + org.osgi + org.osgi.util.tracker + ${org.osgi.util.tracker.version} + provided + + + + + org.osgi + org.osgi.namespace.service + ${org.osgi.namespace.service.version} + provided + org.osgi org.osgi.service.cm @@ -91,12 +190,6 @@ ${org.osgi.service.jdbc.version} provided - - org.osgi - org.osgi.service.log - ${org.osgi.service.log.version} - provided - org.osgi org.osgi.service.metatype @@ -105,8 +198,8 @@ org.osgi - org.osgi.namespace.service - ${org.osgi.service.namespace.version} + org.osgi.service.metatype.annotations + ${org.osgi.service.metatype.annotations.version} provided @@ -115,6 +208,18 @@ ${org.osgi.service.repository.version} provided + + org.osgi + org.osgi.service.subsystem + ${org.osgi.service.subsystem.version} + provided + + + org.osgi + org.osgi.util.converter + ${org.osgi.util.converter.version} + provided + org.osgi org.osgi.util.promise diff --git a/bundle/blueprintstate/pom.xml b/bundle/blueprintstate/pom.xml index 8448054eeb4..14f1b48d987 100644 --- a/bundle/blueprintstate/pom.xml +++ b/bundle/blueprintstate/pom.xml @@ -59,8 +59,7 @@ org.osgi - osgi.core - provided + org.osgi.framework org.slf4j diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml index 9e48d693b15..1fb413af447 100644 --- a/bundle/core/pom.xml +++ b/bundle/core/pom.xml @@ -56,16 +56,22 @@ org.apache.aries.blueprint.api provided - - + + org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.resource org.osgi org.osgi.service.cm - provided + + + org.osgi + org.osgi.util.tracker diff --git a/bundle/springstate/pom.xml b/bundle/springstate/pom.xml index f7bc6bb4b39..048abbacbaf 100644 --- a/bundle/springstate/pom.xml +++ b/bundle/springstate/pom.xml @@ -59,8 +59,7 @@ org.osgi - osgi.core - provided + org.osgi.framework org.slf4j diff --git a/config/command/pom.xml b/config/command/pom.xml index 842074c25dc..31ccfba95f6 100644 --- a/config/command/pom.xml +++ b/config/command/pom.xml @@ -53,18 +53,15 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided org.osgi org.osgi.service.metatype - provided diff --git a/config/core/pom.xml b/config/core/pom.xml index ebb4376f8c8..ceba4e0aa8e 100644 --- a/config/core/pom.xml +++ b/config/core/pom.xml @@ -53,26 +53,21 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided org.osgi org.osgi.service.metatype - provided org.osgi org.osgi.util.converter - 1.0.9 - provided - + org.slf4j slf4j-api diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml index daa4654e90b..306db4f8900 100644 --- a/deployer/blueprint/pom.xml +++ b/deployer/blueprint/pom.xml @@ -68,8 +68,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.service.url org.apache.felix diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml index 41becf80478..ab1e089d9e0 100644 --- a/deployer/features/pom.xml +++ b/deployer/features/pom.xml @@ -62,14 +62,15 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.annotation.versioning - ${org.osgi.annotation.versioning.version} - provided + + + org.osgi + org.osgi.service.url org.springframework.osgi diff --git a/deployer/kar/pom.xml b/deployer/kar/pom.xml index 8fd82266216..f49022f4a15 100644 --- a/deployer/kar/pom.xml +++ b/deployer/kar/pom.xml @@ -62,8 +62,7 @@ org.osgi - osgi.core - provided + org.osgi.framework diff --git a/deployer/spring/pom.xml b/deployer/spring/pom.xml index d54a9e35675..43656ea8098 100644 --- a/deployer/spring/pom.xml +++ b/deployer/spring/pom.xml @@ -67,8 +67,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.service.url org.springframework.osgi diff --git a/deployer/wrap/pom.xml b/deployer/wrap/pom.xml index 17df31cf998..4ad92bc0b7b 100644 --- a/deployer/wrap/pom.xml +++ b/deployer/wrap/pom.xml @@ -57,8 +57,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.service.url org.apache.felix diff --git a/diagnostic/boot/pom.xml b/diagnostic/boot/pom.xml index 966e04baa25..06f222d7dfb 100644 --- a/diagnostic/boot/pom.xml +++ b/diagnostic/boot/pom.xml @@ -53,8 +53,7 @@ org.osgi - osgi.core - provided + org.osgi.framework diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml index 8d50bd3ae28..0605a2f5ab2 100644 --- a/diagnostic/core/pom.xml +++ b/diagnostic/core/pom.xml @@ -53,13 +53,15 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided + + + org.osgi + org.osgi.util.tracker diff --git a/docker/pom.xml b/docker/pom.xml index b6c6ad1c040..b34e09fe7b5 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -52,8 +52,7 @@ org.osgi - osgi.core - provided + org.osgi.framework com.fasterxml.jackson.core diff --git a/event/pom.xml b/event/pom.xml index e363578508d..37277339180 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -66,8 +66,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.service.event org.apache.felix diff --git a/features/command/pom.xml b/features/command/pom.xml index 734cacd2bcd..fa387f197fa 100644 --- a/features/command/pom.xml +++ b/features/command/pom.xml @@ -52,8 +52,7 @@ org.osgi - osgi.core - provided + org.osgi.framework org.apache.karaf.features diff --git a/features/core/pom.xml b/features/core/pom.xml index 03c3e4c58e9..40e24fee79c 100644 --- a/features/core/pom.xml +++ b/features/core/pom.xml @@ -52,37 +52,35 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi - org.osgi.service.cm - provided + org.osgi.namespace.service true org.osgi - org.osgi.service.event - provided + org.osgi.service.cm true org.osgi - org.osgi.namespace.service - provided + org.osgi.service.event true org.osgi org.osgi.service.repository - provided true + + org.osgi + org.osgi.util.tracker + org.osgi org.osgi.util.promise - provided true diff --git a/features/extension/pom.xml b/features/extension/pom.xml index d0facd980f8..d22035d6301 100644 --- a/features/extension/pom.xml +++ b/features/extension/pom.xml @@ -52,8 +52,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.resource org.apache.karaf diff --git a/http/pom.xml b/http/pom.xml index 3be80e8d3c6..efb5524316e 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -53,18 +53,15 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided org.osgi org.osgi.service.http - provided diff --git a/instance/pom.xml b/instance/pom.xml index afb24e84593..abc889e6b85 100644 --- a/instance/pom.xml +++ b/instance/pom.xml @@ -54,8 +54,7 @@ org.osgi - osgi.core - provided + org.osgi.framework diff --git a/itests/common/pom.xml b/itests/common/pom.xml index 1c74c3ab7bf..21d55b0ad93 100644 --- a/itests/common/pom.xml +++ b/itests/common/pom.xml @@ -84,8 +84,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.util.tracker org.apache.felix @@ -121,4 +124,4 @@ - \ No newline at end of file + diff --git a/itests/test/pom.xml b/itests/test/pom.xml index 86f4c312aad..a71d879b276 100644 --- a/itests/test/pom.xml +++ b/itests/test/pom.xml @@ -77,8 +77,7 @@ org.osgi - osgi.core - provided + org.osgi.framework diff --git a/jaas/blueprint/config/pom.xml b/jaas/blueprint/config/pom.xml index b046fe43341..b52f7d2188c 100644 --- a/jaas/blueprint/config/pom.xml +++ b/jaas/blueprint/config/pom.xml @@ -50,11 +50,6 @@ - - org.osgi - osgi.core - provided - org.apache.karaf.jaas org.apache.karaf.jaas.boot diff --git a/jaas/boot/pom.xml b/jaas/boot/pom.xml index b24777f58f2..3c58e5481d4 100644 --- a/jaas/boot/pom.xml +++ b/jaas/boot/pom.xml @@ -52,8 +52,7 @@ org.osgi - osgi.core - provided + org.osgi.framework diff --git a/jaas/command/pom.xml b/jaas/command/pom.xml index caa437520a2..70003c13c54 100644 --- a/jaas/command/pom.xml +++ b/jaas/command/pom.xml @@ -52,8 +52,7 @@ org.osgi - osgi.core - provided + org.osgi.framework diff --git a/jaas/config/pom.xml b/jaas/config/pom.xml index 1dfe1de2faa..4a8b8fb2adc 100644 --- a/jaas/config/pom.xml +++ b/jaas/config/pom.xml @@ -67,8 +67,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.util.tracker org.springframework.osgi diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml index 86ecbe6f942..8b7bdbc695e 100644 --- a/jaas/jasypt/pom.xml +++ b/jaas/jasypt/pom.xml @@ -18,21 +18,21 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 - + org.apache.karaf.jaas jaas 4.4.8-SNAPSHOT ../pom.xml - + org.apache.karaf.jaas.jasypt bundle Apache Karaf :: JAAS :: Jasypt Encryption This bundle provide Jasypt service for the encryption support in the JAAS security framework. - + ${basedir}/../../etc/appended-resources @@ -48,17 +48,17 @@ - + org.osgi - osgi.core + org.osgi.framework org.apache.karaf.jaas - org.apache.karaf.jaas.modules + org.apache.karaf.jaas.modules org.apache.karaf.jaas diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml index c3fd364858a..93940b153c2 100644 --- a/jaas/modules/pom.xml +++ b/jaas/modules/pom.xml @@ -74,18 +74,19 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided org.osgi org.osgi.service.event - provided + + + org.osgi + org.osgi.util.tracker @@ -93,7 +94,7 @@ org.apache.karaf.util provided - + org.apache.httpcomponents httpclient @@ -188,7 +189,7 @@ !net.spy.memcached*, com.sun.security.auth.module;resolution:=optional, javax.xml.bind*;version="[2.2,3)", - org.apache.commons.logging;version="[1,2)", + org.apache.commons.logging;version="[1,2)", * diff --git a/jaas/spring-security-crypto/pom.xml b/jaas/spring-security-crypto/pom.xml index 80b4f63cb64..54ac9f01d75 100644 --- a/jaas/spring-security-crypto/pom.xml +++ b/jaas/spring-security-crypto/pom.xml @@ -18,21 +18,21 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 - + org.apache.karaf.jaas jaas 4.4.8-SNAPSHOT ../pom.xml - + org.apache.karaf.jaas.spring-security-crypto bundle Apache Karaf :: JAAS :: Spring Security Crypto Encryption This bundle provide Spring Security Crypto service for the encryption support in the JAAS security framework. - + ${basedir}/../../etc/appended-resources @@ -48,17 +48,17 @@ - + org.osgi - osgi.core + org.osgi.framework org.apache.karaf.jaas - org.apache.karaf.jaas.modules + org.apache.karaf.jaas.modules org.apache.karaf.jaas diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 042e6148724..502aa3fdf11 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -53,18 +53,15 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided org.osgi org.osgi.service.jdbc - provided org.apache.karaf diff --git a/jms/pom.xml b/jms/pom.xml index 2402c00f937..47e65f1e5e9 100644 --- a/jms/pom.xml +++ b/jms/pom.xml @@ -53,13 +53,11 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided javax.jms diff --git a/jndi/pom.xml b/jndi/pom.xml index bc79553e6ed..a3f7650829b 100644 --- a/jndi/pom.xml +++ b/jndi/pom.xml @@ -57,7 +57,7 @@ org.osgi - osgi.core + org.osgi.framework org.apache.aries.proxy diff --git a/kar/pom.xml b/kar/pom.xml index 50fe3de1865..46be3801813 100644 --- a/kar/pom.xml +++ b/kar/pom.xml @@ -53,13 +53,11 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided diff --git a/log/pom.xml b/log/pom.xml index a0206f995f9..7b83da39532 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -53,8 +53,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.util.tracker diff --git a/main/pom.xml b/main/pom.xml index 6112db518a9..664b3d0f61d 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -53,8 +53,7 @@ org.osgi - osgi.core - provided + org.osgi.framework diff --git a/management/server/pom.xml b/management/server/pom.xml index 94595b1b328..a3bf48587b4 100644 --- a/management/server/pom.xml +++ b/management/server/pom.xml @@ -53,18 +53,19 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided org.osgi org.osgi.service.event - provided + + + org.osgi + org.osgi.util.tracker diff --git a/maven/core/pom.xml b/maven/core/pom.xml index 70b4c2d4f4f..0cd3b501d88 100644 --- a/maven/core/pom.xml +++ b/maven/core/pom.xml @@ -49,7 +49,7 @@ org.osgi - osgi.core + org.osgi.framework org.osgi diff --git a/obr/pom.xml b/obr/pom.xml index 91911efdb6a..f92caba1f00 100644 --- a/obr/pom.xml +++ b/obr/pom.xml @@ -53,8 +53,7 @@ org.osgi - osgi.core - provided + org.osgi.framework org.apache.felix diff --git a/package/pom.xml b/package/pom.xml index 4ba91b23bea..643344da292 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -60,8 +60,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.resource org.slf4j diff --git a/pom.xml b/pom.xml index a9467af8d8f..98970606ca1 100644 --- a/pom.xml +++ b/pom.xml @@ -290,20 +290,35 @@ 1.8.2 8.0.0 + 1.1.0 1.1.2 + 1.1.1 + 1.10.0 + 1.0.0 + 1.0.1 1.6.1 1.5.1 1.5.1 + 1.0.0 + 1.1.2 1.4.1 1.2.2 1.1.0 1.0.0 1.5.0 1.4.1 - 1.0.0 + 1.4.1 + 1.2.1 + 1.2.1 1.1.0 + 1.1.1 + 1.1.1 + 1.1.0 + 1.0.1 + 1.0.9 1.2.0 1.3.0 + 1.5.4 1.1.4 4.13.5 diff --git a/profile/pom.xml b/profile/pom.xml index 8d86a918fe4..5b5cd3f5d35 100644 --- a/profile/pom.xml +++ b/profile/pom.xml @@ -54,13 +54,15 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.resource org.osgi org.osgi.service.cm - provided diff --git a/scheduler/pom.xml b/scheduler/pom.xml index 3e49b0b34d0..360b67ee09c 100644 --- a/scheduler/pom.xml +++ b/scheduler/pom.xml @@ -109,13 +109,15 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided + + + org.osgi + org.osgi.util.tracker org.slf4j diff --git a/scr/management/pom.xml b/scr/management/pom.xml index eb5d343556c..a721edd791d 100644 --- a/scr/management/pom.xml +++ b/scr/management/pom.xml @@ -57,18 +57,19 @@ org.osgi - osgi.core - provided + org.osgi.dto + + + org.osgi + org.osgi.framework org.osgi org.osgi.service.component - provided org.osgi org.osgi.service.component.annotations - provided org.apache.felix diff --git a/scr/state/pom.xml b/scr/state/pom.xml index 352a44e4d8d..628872448e4 100644 --- a/scr/state/pom.xml +++ b/scr/state/pom.xml @@ -53,8 +53,15 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.service.component + + + org.osgi + org.osgi.service.component.annotations org.slf4j @@ -70,16 +77,6 @@ org.apache.karaf.bundle org.apache.karaf.bundle.core - - org.osgi - org.osgi.service.component - provided - - - org.osgi - org.osgi.service.component.annotations - provided - org.apache.felix org.apache.felix.scr diff --git a/service/core/pom.xml b/service/core/pom.xml index fdf389a57f2..b1b77af8fd7 100644 --- a/service/core/pom.xml +++ b/service/core/pom.xml @@ -52,8 +52,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.util.tracker org.apache.karaf diff --git a/service/guard/pom.xml b/service/guard/pom.xml index d9cad0031e9..0cea42cf2cd 100644 --- a/service/guard/pom.xml +++ b/service/guard/pom.xml @@ -67,13 +67,19 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.resource org.osgi org.osgi.service.cm - provided + + + org.osgi + org.osgi.util.tracker org.slf4j diff --git a/services/coordinator/pom.xml b/services/coordinator/pom.xml index 7f932a9a458..07828232a3c 100644 --- a/services/coordinator/pom.xml +++ b/services/coordinator/pom.xml @@ -47,11 +47,6 @@ - - org.osgi - osgi.core - provided - org.eclipse.platform org.eclipse.equinox.coordinator diff --git a/services/eventadmin/pom.xml b/services/eventadmin/pom.xml index 2d3316a2d5d..9d24eaba2d1 100644 --- a/services/eventadmin/pom.xml +++ b/services/eventadmin/pom.xml @@ -108,18 +108,19 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided org.osgi org.osgi.service.metatype - provided + + + org.osgi + org.osgi.util.tracker org.apache.felix diff --git a/services/interceptor/impl/pom.xml b/services/interceptor/impl/pom.xml index 47afb50776b..7e997e3410a 100644 --- a/services/interceptor/impl/pom.xml +++ b/services/interceptor/impl/pom.xml @@ -53,8 +53,7 @@ org.osgi - osgi.core - provided + org.osgi.framework org.ow2.asm diff --git a/services/staticcm/pom.xml b/services/staticcm/pom.xml index 74678514333..cb6cd94dde3 100644 --- a/services/staticcm/pom.xml +++ b/services/staticcm/pom.xml @@ -90,14 +90,15 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - 1.6.0 - provided + + + org.osgi + org.osgi.util.tracker org.apache.felix diff --git a/shell/commands/pom.xml b/shell/commands/pom.xml index b6bf68e11ec..6fbf791d35b 100644 --- a/shell/commands/pom.xml +++ b/shell/commands/pom.xml @@ -65,8 +65,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.util.tracker org.slf4j diff --git a/shell/console/pom.xml b/shell/console/pom.xml index 57db3ba09dc..2542b836a6b 100644 --- a/shell/console/pom.xml +++ b/shell/console/pom.xml @@ -52,13 +52,19 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided + + + org.osgi + org.osgi.service.packageadmin + + + org.osgi + org.osgi.util.tracker diff --git a/shell/core/pom.xml b/shell/core/pom.xml index dcdea0a1c82..6fee20f8e8d 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -61,18 +61,23 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.resource org.osgi org.osgi.service.cm - provided org.osgi org.osgi.service.event - provided + + + org.osgi + org.osgi.util.tracker org.apache.karaf.jaas diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index 58c20f67abf..f24c823231f 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -63,13 +63,15 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided + + + org.osgi + org.osgi.util.tracker diff --git a/specs/activator/pom.xml b/specs/activator/pom.xml index 2cc18cd0df2..3ff339a3076 100644 --- a/specs/activator/pom.xml +++ b/specs/activator/pom.xml @@ -49,8 +49,7 @@ org.osgi - osgi.core - provided + org.osgi.framework diff --git a/specs/locator/pom.xml b/specs/locator/pom.xml index a9bf54ed39c..329ecaac541 100644 --- a/specs/locator/pom.xml +++ b/specs/locator/pom.xml @@ -30,24 +30,4 @@ org.apache.karaf.specs.locator Apache Karaf :: Specs :: Locator - - - - org.apache.karaf - karaf-bom - ${project.version} - pom - import - - - - - - - org.osgi - osgi.core - provided - - - diff --git a/subsystem/pom.xml b/subsystem/pom.xml index f0c05968b50..76ccd353edf 100644 --- a/subsystem/pom.xml +++ b/subsystem/pom.xml @@ -52,8 +52,11 @@ org.osgi - osgi.core - provided + org.osgi.framework + + + org.osgi + org.osgi.service.subsystem diff --git a/system/pom.xml b/system/pom.xml index 89f5d2c99df..6f3db23f6e7 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -55,8 +55,7 @@ org.osgi - osgi.core - provided + org.osgi.framework org.slf4j diff --git a/util/pom.xml b/util/pom.xml index e030c138307..fc7bdf50be9 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -18,16 +18,16 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 - + org.apache.karaf karaf 4.4.8-SNAPSHOT ../pom.xml - + org.apache.karaf.util jar Apache Karaf :: Util @@ -48,13 +48,15 @@ org.osgi - osgi.core - provided + org.osgi.framework org.osgi org.osgi.service.cm - provided + + + org.osgi + org.osgi.util.tracker org.apache.felix @@ -75,7 +77,7 @@ test - + ${basedir}/../etc/appended-resources diff --git a/web/pom.xml b/web/pom.xml index ab46f8eb820..1d3b06eee4e 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -55,8 +55,7 @@ org.osgi - osgi.core - provided + org.osgi.framework org.ops4j.pax.web diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml index 91ade5a38ec..e25f8c6ddeb 100644 --- a/webconsole/console/pom.xml +++ b/webconsole/console/pom.xml @@ -20,7 +20,7 @@ --> 4.0.0 - + org.apache.karaf.webconsole webconsole @@ -56,7 +56,7 @@ org.osgi - osgi.core + org.osgi.framework org.osgi @@ -66,6 +66,10 @@ org.osgi org.osgi.service.http + + org.osgi + org.osgi.util.tracker + org.apache.karaf org.apache.karaf.util @@ -183,7 +187,7 @@ org.apache.felix.framework;inline=org/apache/felix/framework/util/VersionRange**, - osgi.core;inline=org/osgi/util/tracker/*, + org.osgi.util.tracker;inline=**, commons-fileupload, diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml index b2e1fa311f7..7e82825d0cb 100644 --- a/webconsole/features/pom.xml +++ b/webconsole/features/pom.xml @@ -52,8 +52,7 @@ org.osgi - osgi.core - provided + org.osgi.framework org.slf4j diff --git a/webconsole/gogo/pom.xml b/webconsole/gogo/pom.xml index ba0b1b1e99f..b8de8d11a67 100644 --- a/webconsole/gogo/pom.xml +++ b/webconsole/gogo/pom.xml @@ -52,8 +52,7 @@ org.osgi - osgi.core - provided + org.osgi.framework diff --git a/webconsole/http/pom.xml b/webconsole/http/pom.xml index b80553ba00d..14b454f8b16 100644 --- a/webconsole/http/pom.xml +++ b/webconsole/http/pom.xml @@ -52,8 +52,7 @@ org.osgi - osgi.core - provided + org.osgi.framework org.slf4j diff --git a/webconsole/instance/pom.xml b/webconsole/instance/pom.xml index 623b848c04f..bfcd47f5691 100644 --- a/webconsole/instance/pom.xml +++ b/webconsole/instance/pom.xml @@ -57,8 +57,7 @@ org.osgi - osgi.core - provided + org.osgi.framework org.apache.felix diff --git a/wrapper/pom.xml b/wrapper/pom.xml index ecae42c3d5f..f1f70500296 100644 --- a/wrapper/pom.xml +++ b/wrapper/pom.xml @@ -56,7 +56,7 @@ org.osgi - osgi.core + org.osgi.framework org.apache.karaf From 4a0a3639cbf62663fc8162d15c94f630e189cd34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Tue, 8 Jul 2025 12:56:58 -0400 Subject: [PATCH 156/440] KARAF-7889: Upgrade to Apache POM 35 and target Java SE 11 (cherry picked from commit 63d38a9a3defd1e891654cc2a2d96ebf68ac4971) --- .../resources/archetype-resources/pom.xml | 2 +- assemblies/apache-karaf-minimal/pom.xml | 2 +- assemblies/apache-karaf/pom.xml | 2 +- assemblies/features/enterprise/pom.xml | 2 +- assemblies/features/specs/pom.xml | 2 +- assemblies/features/standard/pom.xml | 2 +- .../karaf-docker-example-dynamic-dist/pom.xml | 2 +- .../karaf-docker-example-static-dist/pom.xml | 2 +- ...solverRegisteredBeforeConfigAdminTest.java | 2 + ...verRegisteredOnlyAfterConfigAdminTest.java | 2 + main/pom.xml | 2 + management/server/pom.xml | 1 - .../management/ConnectorServerFactory.java | 193 +----------------- .../karaf/management/RmiRegistryFactory.java | 181 ++++++++++++++++ .../karaf/management/internal/Activator.java | 30 ++- pom.xml | 116 ++--------- specs/java.xml.ws/pom.xml | 4 + specs/java.xml/pom.xml | 4 + specs/locator/pom.xml | 4 + 19 files changed, 247 insertions(+), 308 deletions(-) create mode 100644 management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java diff --git a/archetypes/assembly/src/main/resources/archetype-resources/pom.xml b/archetypes/assembly/src/main/resources/archetype-resources/pom.xml index 90dffdad005..e255be1e278 100644 --- a/archetypes/assembly/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/assembly/src/main/resources/archetype-resources/pom.xml @@ -174,7 +174,7 @@ - 1.8 + 11 diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml index f58bcd9f344..f4ad9811b22 100644 --- a/assemblies/apache-karaf-minimal/pom.xml +++ b/assemblies/apache-karaf-minimal/pom.xml @@ -145,7 +145,7 @@ !org.apache.karaf.command.acl.*, * - 1.8 + 11 diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index da9d63ebc43..788a1c894a2 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -178,7 +178,7 @@ - 1.8 + 11 ${project.build.directory} Apache Karaf (full) diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml index 1d2c04dcb2d..c5e3eaba47e 100644 --- a/assemblies/features/enterprise/pom.xml +++ b/assemblies/features/enterprise/pom.xml @@ -241,7 +241,7 @@ file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 1.8 + 11 framework diff --git a/assemblies/features/specs/pom.xml b/assemblies/features/specs/pom.xml index c8708102e1d..ee54e8b012c 100644 --- a/assemblies/features/specs/pom.xml +++ b/assemblies/features/specs/pom.xml @@ -96,7 +96,7 @@ file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 9 + 11 framework diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index 1ec6ee39e72..e24872205ab 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -465,7 +465,7 @@ file:${project.build.directory}/feature/feature.xml org.apache.karaf.features:framework - 9 + 11 framework diff --git a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml index 5962c5f1ba5..88805efd907 100644 --- a/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-dynamic-dist/pom.xml @@ -138,7 +138,7 @@ - 1.8 + 11 diff --git a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml index 2fc400e0ff4..b4966b823c2 100644 --- a/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml +++ b/examples/karaf-docker-example/karaf-docker-example-static-dist/pom.xml @@ -108,7 +108,7 @@ static true static - 1.8 + 11 diff --git a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java index 7de267ed534..9e42e7c0cf8 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java @@ -24,6 +24,7 @@ import java.io.File; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -58,6 +59,7 @@ public Option[] config() throws Exception { } @Test + @Ignore("Tinybundles should be updated in KarafMinimalMonitoredTestSupport") public void mavenResolverAvailable() throws Exception { long count = numberOfServiceEventsFor("org.ops4j.pax.url.mvn.MavenResolver"); assertEquals("There should be two registrations/unregistrations of MavenResolver before final (ConfigAdmin based) registration", diff --git a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java index 81484862f3a..f052b688a83 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java @@ -22,6 +22,7 @@ import java.io.File; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -55,6 +56,7 @@ public Option[] config() throws Exception { } @Test + @Ignore("Tinybundles should be updated in KarafMinimalMonitoredTestSupport") public void mavenResolverAvailable() throws Exception { long count = numberOfServiceEventsFor("org.ops4j.pax.url.mvn.MavenResolver"); assertEquals("There should be only one MavenResolver registration - after non-INITIAL ConfigAdmin update", 1l, count); diff --git a/main/pom.xml b/main/pom.xml index 664b3d0f61d..5f5937957d7 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -36,6 +36,8 @@ ${basedir}/../etc/appended-resources + + 8 diff --git a/management/server/pom.xml b/management/server/pom.xml index a3bf48587b4..0783c8e6f85 100644 --- a/management/server/pom.xml +++ b/management/server/pom.xml @@ -142,7 +142,6 @@ org.osgi.framework;version="[1,3)", com.sun.jmx.remote.protocol;resolution:=optional, com.sun.jdmk.security.sasl;resolution:=optional, - sun.rmi*;resolution:=optional, * diff --git a/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java b/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java index a79ef7c8690..e3f28bb30d0 100644 --- a/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java +++ b/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java @@ -18,10 +18,8 @@ import org.apache.karaf.jaas.config.KeystoreManager; import org.apache.karaf.management.internal.MBeanInvocationHandler; -import org.osgi.framework.BundleContext; import java.io.IOException; -import java.lang.reflect.Field; import java.lang.reflect.Proxy; import java.net.BindException; import java.net.InetAddress; @@ -30,24 +28,12 @@ import java.net.Socket; import java.net.SocketAddress; import java.net.SocketException; -import java.net.URI; -import java.net.URISyntaxException; import java.nio.channels.ServerSocketChannel; -import java.rmi.AccessException; -import java.rmi.AlreadyBoundException; -import java.rmi.NotBoundException; -import java.rmi.Remote; -import java.rmi.RemoteException; -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; import java.rmi.server.RMIClientSocketFactory; import java.rmi.server.RMIServerSocketFactory; -import java.rmi.server.UnicastRemoteObject; import java.security.GeneralSecurityException; import java.security.Security; import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Iterator; import java.util.Map; import javax.management.JMException; @@ -57,7 +43,6 @@ import javax.management.remote.JMXConnectorServerFactory; import javax.management.remote.JMXServiceURL; import javax.management.remote.rmi.RMIConnectorServer; -import javax.management.remote.rmi.RMIJRMPServerImpl; import javax.net.ServerSocketFactory; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLParameters; @@ -82,8 +67,6 @@ private enum AuthenticatorType {NONE, PASSWORD, CERTIFICATE} private boolean threaded = false; private boolean daemon = false; private JMXConnectorServer connectorServer; - private Remote remoteServerStub; - private RMIJRMPServerImpl rmiServer; private JMXConnectorServer jmxmpConnectorServer; private long keyStoreAvailabilityTimeout = 5000; @@ -98,14 +81,6 @@ private enum AuthenticatorType {NONE, PASSWORD, CERTIFICATE} private String trustStore; private String keyAlias; - private int port = Registry.REGISTRY_PORT; - private String host; - private Registry registry; - private boolean locate; - private boolean create = true; - private boolean locallyCreated; - private BundleContext bundleContext; - public MBeanServer getServer() { return server; } @@ -295,88 +270,12 @@ private boolean isClientAuth() { return this.authenticatorType.equals(AuthenticatorType.CERTIFICATE); } - /** - * @return the create - */ - public boolean isCreate() { - return create; - } - - /** - * @param create the create to set - */ - public void setCreate(boolean create) { - this.create = create; - } - - /** - * @return the locate - */ - public boolean isLocate() { - return locate; - } - - /** - * @param locate the locate to set - */ - public void setLocate(boolean locate) { - this.locate = locate; - } - - /** - * @return the port - */ - public int getPort() { - return port; - } - - /** - * @param port the port to set - */ - public void setPort(int port) { - this.port = port; - } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } - public void init() throws Exception { - JMXServiceURL url = new JMXServiceURL(this.serviceUrl); - - if (registry == null && locate) { - try { - Registry reg = LocateRegistry.getRegistry(host, getPort()); - reg.list(); - registry = reg; - } catch (RemoteException e) { - // ignore - } - } - if (registry == null && create) { - registry = new JmxRegistry(getPort(), getBindingName(url)); - locallyCreated = true; - } - if (registry != null) { - // register the registry as an OSGi service - Hashtable props = new Hashtable<>(); - props.put("port", getPort()); - props.put("host", getHost()); - bundleContext.registerService(Registry.class, registry, props); - } - if (this.server == null) { throw new IllegalArgumentException("server must be set"); } + JMXServiceURL url = new JMXServiceURL(this.serviceUrl); if ( isClientAuth() ) { this.secured = true; } @@ -393,12 +292,7 @@ public void init() throws Exception { MBeanInvocationHandler handler = new MBeanInvocationHandler(server, guard); MBeanServer guardedServer = (MBeanServer) Proxy.newProxyInstance(server.getClass().getClassLoader(), new Class[]{ MBeanServer.class }, handler); - rmiServer = new RMIJRMPServerImpl(url.getPort(), - (RMIClientSocketFactory)environment.get(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE), - (RMIServerSocketFactory)environment.get(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE), environment); - - // Create the connector server now. - this.connectorServer = new RMIConnectorServer(url, environment, rmiServer, guardedServer); + this.connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, this.environment, guardedServer); if (this.objectName != null) { this.server.registerMBean(this.connectorServer, this.objectName); @@ -419,7 +313,6 @@ public void init() throws Exception { try { Thread.currentThread().setContextClassLoader(ConnectorServerFactory.class.getClassLoader()); connectorServer.start(); - remoteServerStub = rmiServer.toStub(); if (jmxmpEnabled && jmxmpConnectorServer != null) { jmxmpConnectorServer.start(); } @@ -443,7 +336,6 @@ public void init() throws Exception { connectorThread.start(); } else { this.connectorServer.start(); - remoteServerStub = rmiServer.toStub(); if (jmxmpEnabled && jmxmpConnectorServer != null) { jmxmpConnectorServer.start(); } @@ -459,21 +351,6 @@ public void init() throws Exception { } } - protected static String getBindingName(final JMXServiceURL jmxServiceURL) { - final String urlPath = jmxServiceURL.getURLPath(); - - try { - if (urlPath.startsWith("/jndi/")) { - return new URI(urlPath.substring(6)).getPath() - .replaceAll("^/+", "").replaceAll("/+$", ""); - } - } catch (URISyntaxException e) { - // ignore - } - - return "jmxrmi"; // use the default - } - public void destroy() throws Exception { try { if (this.connectorServer != null) { @@ -482,33 +359,6 @@ public void destroy() throws Exception { if (this.jmxmpEnabled && this.jmxmpConnectorServer != null) { this.jmxmpConnectorServer.stop(); } - - if (registry != null && locallyCreated) { - Registry reg = registry; - registry = null; - UnicastRemoteObject.unexportObject(reg, true); - - // clear TCPEndpointCache - try { - Class cls = getClass().getClassLoader().loadClass("sun.rmi.transport.tcp.TCPEndpoint"); - Field localEndpointsField = cls.getDeclaredField("localEndpoints"); - Field ssfField = cls.getDeclaredField("ssf"); - localEndpointsField.setAccessible(true); - ssfField.setAccessible(true); - Object localEndpoints = localEndpointsField.get(null); - if (localEndpoints != null) { - Map map = (Map) localEndpoints; - for (Iterator it = map.keySet().iterator(); it.hasNext(); ) { - Object key = it.next(); - Object ssf = ssfField.get(key); - if (ssf != null && ssf.getClass().getPackage().getName().equals("org.apache.karaf.management")) { - it.remove(); - } - } - } - } catch (Exception ignored) { - } - } } finally { if (this.objectName != null) { doUnregister(this.objectName); @@ -555,7 +405,7 @@ private static class KarafSslRMIServerSocketFactory implements RMIServerSocketFa private String[] enabledProtocols; private String[] enabledCipherSuites; - public KarafSslRMIServerSocketFactory(SSLServerSocketFactory sssf, boolean clientAuth, String rmiServerHost, + public KarafSslRMIServerSocketFactory(SSLServerSocketFactory sssf, boolean clientAuth, String rmiServerHost, String[] enabledProtocols, String[] enabledCipherSuites) { this.sssf = sssf; @@ -917,40 +767,5 @@ public String[] getEnabledCipherSuites() { public void setEnabledCipherSuites(String[] enabledCipherSuites) { this.enabledCipherSuites = enabledCipherSuites; } - - /* - * Better to use the internal API than re-invent the wheel. - */ - @SuppressWarnings("restriction") - private class JmxRegistry extends sun.rmi.registry.RegistryImpl { - private final String lookupName; - - JmxRegistry(final int port, final String lookupName) throws RemoteException { - super(port, null, new KarafRMIServerSocketFactory(getHost())); - this.lookupName = lookupName; - } - - @Override - public Remote lookup(String s) throws RemoteException, NotBoundException { - return lookupName.equals(s) ? remoteServerStub : null; - } - - @Override - public void bind(String s, Remote remote) throws RemoteException, AlreadyBoundException, AccessException { - } - - @Override - public void unbind(String s) throws RemoteException, NotBoundException, AccessException { - } - - @Override - public void rebind(String s, Remote remote) throws RemoteException, AccessException { - } - - @Override - public String[] list() throws RemoteException { - return new String[] {lookupName}; - } - } - + } diff --git a/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java b/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java new file mode 100644 index 00000000000..a08ef20d0b7 --- /dev/null +++ b/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.karaf.management; + +import org.osgi.framework.BundleContext; + +import java.io.IOException; +import java.lang.reflect.Field; +import java.net.InetAddress; +import java.net.ServerSocket; +import java.net.UnknownHostException; +import java.rmi.RemoteException; +import java.rmi.registry.LocateRegistry; +import java.rmi.registry.Registry; +import java.rmi.server.RMIClientSocketFactory; +import java.rmi.server.RMIServerSocketFactory; +import java.rmi.server.RMISocketFactory; +import java.rmi.server.UnicastRemoteObject; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Map; + +public class RmiRegistryFactory { + + private int port = Registry.REGISTRY_PORT; + private String host; + private Registry registry; + private boolean locate; + private boolean create = true; + private boolean locallyCreated; + + private BundleContext bundleContext; + + /** + * @return the create + */ + public boolean isCreate() { + return create; + } + + /** + * @param create the create to set + */ + public void setCreate(boolean create) { + this.create = create; + } + + /** + * @return the locate + */ + public boolean isLocate() { + return locate; + } + + /** + * @param locate the locate to set + */ + public void setLocate(boolean locate) { + this.locate = locate; + } + + /** + * @return the port + */ + public int getPort() { + return port; + } + + /** + * @param port the port to set + */ + public void setPort(int port) { + this.port = port; + } + + public String getHost() { + return host; + } + + public void setHost(String host) { + this.host = host; + } + + public Object getObject() throws Exception { + return registry; + } + + public void setBundleContext(BundleContext bundleContext) { + this.bundleContext = bundleContext; + } + + public void init() throws RemoteException, UnknownHostException { + if (registry == null && locate) { + try { + Registry reg = LocateRegistry.getRegistry(host, getPort()); + reg.list(); + registry = reg; + } catch (RemoteException e) { + // ignore + } + } + if (registry == null && create) { + if (host != null && !host.isEmpty()) { + RMIClientSocketFactory socketFactory = RMISocketFactory.getDefaultSocketFactory(); + InetAddress addr = InetAddress.getByName(host); + RMIServerSocketFactory serverSocketFactory = new KarafServerSocketFactory(addr, port); + + registry = LocateRegistry.createRegistry(getPort(), socketFactory, serverSocketFactory); + } else { + registry = LocateRegistry.createRegistry(getPort()); + } + locallyCreated = true; + } + if (registry != null) { + // register the registry as an OSGi service + Hashtable props = new Hashtable<>(); + props.put("port", getPort()); + props.put("host", getHost()); + bundleContext.registerService(Registry.class, registry, props); + } + } + + public void destroy() throws RemoteException { + if (registry != null && locallyCreated) { + Registry reg = registry; + registry = null; + UnicastRemoteObject.unexportObject(reg, true); + + // clear TCPEndpointCache + try { + Class cls = getClass().getClassLoader().loadClass("sun.rmi.transport.tcp.TCPEndpoint"); + Field localEndpointsField = cls.getDeclaredField("localEndpoints"); + Field ssfField = cls.getDeclaredField("ssf"); + localEndpointsField.setAccessible(true); + ssfField.setAccessible(true); + Object localEndpoints = localEndpointsField.get(null); + if (localEndpoints != null) { + Map map = (Map) localEndpoints; + for (Iterator it = map.keySet().iterator(); it.hasNext(); ) { + Object key = it.next(); + Object ssf = ssfField.get(key); + if (ssf != null && ssf.getClass().getPackage().getName().equals("org.apache.karaf.management")) { + it.remove(); + } + } + } + } catch (Exception ignored) { + } + } + } + + private static class KarafServerSocketFactory implements RMIServerSocketFactory { + private final int port; + private final InetAddress addr; + + private KarafServerSocketFactory(InetAddress addr, int port) { + this.addr = addr; + this.port = port; + } + + @Override + public ServerSocket createServerSocket(int i) throws IOException { + return new ServerSocket(port, 0, addr); + } + } + +} diff --git a/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java b/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java index 7b94c212e1a..3754e3dcede 100644 --- a/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java +++ b/management/server/src/main/java/org/apache/karaf/management/internal/Activator.java @@ -29,6 +29,7 @@ import org.apache.karaf.management.JaasAuthenticator; import org.apache.karaf.management.KarafMBeanServerGuard; import org.apache.karaf.management.MBeanServerFactory; +import org.apache.karaf.management.RmiRegistryFactory; import org.apache.karaf.util.tracker.BaseActivator; import org.apache.karaf.util.tracker.annotation.Managed; import org.apache.karaf.util.tracker.annotation.ProvideService; @@ -51,12 +52,13 @@ ) @Managed("org.apache.karaf.management") public class Activator extends BaseActivator implements ManagedService { - - private static final Logger LOG = LoggerFactory.getLogger(Activator.class); + + private static final Logger LOG = LoggerFactory.getLogger(Activator.class); private ConnectorServerFactory connectorServerFactory; + private RmiRegistryFactory rmiRegistryFactory; private MBeanServerFactory mbeanServerFactory; - + private ServiceTracker keystoreInstanceServiceTracker; private EventAdminLogger eventAdminLogger; @@ -145,6 +147,14 @@ public void log(String methodName, String[] signature, Object result, Throwable guard.setLogger(eventAdminLogger); guard.setConfigAdmin(configurationAdmin); + rmiRegistryFactory = new RmiRegistryFactory(); + rmiRegistryFactory.setCreate(createRmiRegistry); + rmiRegistryFactory.setLocate(locateRmiRegistry); + rmiRegistryFactory.setHost(rmiRegistryHost); + rmiRegistryFactory.setPort(rmiRegistryPort); + rmiRegistryFactory.setBundleContext(bundleContext); + rmiRegistryFactory.init(); + mbeanServerFactory = new MBeanServerFactory(); mbeanServerFactory.setLocateExistingServerIfPossible(locateExistingMBeanServerIfPossible); mbeanServerFactory.init(); @@ -156,12 +166,6 @@ public void log(String methodName, String[] signature, Object result, Throwable jaasAuthenticator.setRealm(jmxRealm); connectorServerFactory = new ConnectorServerFactory(); - connectorServerFactory.setCreate(createRmiRegistry); - connectorServerFactory.setLocate(locateRmiRegistry); - connectorServerFactory.setHost(rmiRegistryHost); - connectorServerFactory.setPort(rmiRegistryPort); - connectorServerFactory.setBundleContext(bundleContext); - connectorServerFactory.setServer(mbeanServer); connectorServerFactory.setServiceUrl(serviceUrl); connectorServerFactory.setGuard(guard); @@ -252,6 +256,14 @@ protected void doStop() { } mbeanServerFactory = null; } + if (rmiRegistryFactory != null) { + try { + rmiRegistryFactory.destroy(); + } catch (Exception e) { + logger.warn("Error destroying RMIRegistryFactory", e); + } + rmiRegistryFactory = null; + } if (keystoreInstanceServiceTracker != null) { try { keystoreInstanceServiceTracker.close(); diff --git a/pom.xml b/pom.xml index 98970606ca1..843232fdd3c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache apache - 31 + 35 @@ -151,6 +151,7 @@ 1737368569 + 11 scm:git:https://gitbox.apache.org/repos/asf/karaf.git scm:git:https://gitbox.apache.org/repos/asf/karaf.git @@ -445,46 +446,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.5.0 - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.7 - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.11.2 - - - org.apache.maven.plugins - maven-jar-plugin - 3.4.2 - - - org.apache.maven.plugins - maven-remote-resources-plugin - 3.2.0 - - - org.apache.maven.plugins - maven-install-plugin - 3.1.3 - org.apache.maven.plugins maven-eclipse-plugin @@ -495,19 +456,6 @@ true - - org.apache.maven.plugins - maven-release-plugin - 3.1.1 - - clean install - release,deploy,src - release,deploy,src - deploy - -Prelease,deploy,src - true - - org.apache.maven.plugins maven-idea-plugin @@ -520,36 +468,19 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 once ${surefire.argLine} - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - org.apache.servicemix.tooling depends-maven-plugin ${plugin.depends.version} - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.7.1 - org.apache.maven.plugins maven-antrun-plugin - 3.1.0 ant-contrib @@ -584,26 +515,11 @@ exec-maven-plugin 3.5.0 - - org.apache.maven.plugins - maven-dependency-plugin - 3.8.1 - org.codehaus.mojo build-helper-maven-plugin 3.6.0 - - org.apache.maven.plugins - maven-site-plugin - 3.12.1 - - - org.apache.maven.plugins - maven-war-plugin - 3.4.0 - org.apache.karaf.tooling karaf-maven-plugin @@ -689,17 +605,8 @@ + - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - 256M - ${compiler.fork} - - org.apache.maven.plugins maven-enforcer-plugin @@ -739,6 +646,18 @@ + + org.apache.maven.plugins + maven-release-plugin + + clean install + release,deploy,src + release,deploy,src + deploy + -Prelease,deploy,src + true + + org.apache.maven.plugins maven-resources-plugin @@ -782,27 +701,22 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.2 org.apache.maven.plugins maven-jxr-plugin - 3.6.0 org.apache.maven.plugins maven-site-plugin - 3.12.1 org.apache.maven.plugins maven-surefire-report-plugin - 3.5.2 org.apache.maven.plugins maven-project-info-reports-plugin - 3.8.0 diff --git a/specs/java.xml.ws/pom.xml b/specs/java.xml.ws/pom.xml index 257778dc531..d8b1fd0a733 100644 --- a/specs/java.xml.ws/pom.xml +++ b/specs/java.xml.ws/pom.xml @@ -30,6 +30,10 @@ org.apache.karaf.specs.java.xml.ws Apache Karaf :: Specs :: Java Xml WS + + 8 + + diff --git a/specs/java.xml/pom.xml b/specs/java.xml/pom.xml index e528ea5294b..4daecb8d360 100644 --- a/specs/java.xml/pom.xml +++ b/specs/java.xml/pom.xml @@ -31,6 +31,10 @@ jar Apache Karaf :: Specs :: Java Xml + + 8 + + diff --git a/specs/locator/pom.xml b/specs/locator/pom.xml index 329ecaac541..08df3180137 100644 --- a/specs/locator/pom.xml +++ b/specs/locator/pom.xml @@ -30,4 +30,8 @@ org.apache.karaf.specs.locator Apache Karaf :: Specs :: Locator + + 8 + + From 823f4c06ccb3abe4bbdb95db8cba13de6d19ae7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Sat, 19 Jul 2025 07:24:49 +0200 Subject: [PATCH 157/440] Fix build --- bom/nodeps/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/nodeps/pom.xml b/bom/nodeps/pom.xml index 3f09a915d76..7c0dd3e2cf9 100644 --- a/bom/nodeps/pom.xml +++ b/bom/nodeps/pom.xml @@ -24,7 +24,7 @@ org.apache.karaf karaf - 4.5.0-SNAPSHOT + 4.4.8-SNAPSHOT ../../pom.xml From ec48fca4e3f578bbf7d3c425c6ec7d38bcdc5c66 Mon Sep 17 00:00:00 2001 From: Matt Pavlovich Date: Sat, 19 Jul 2025 23:38:41 -0500 Subject: [PATCH 158/440] [KARAF-7957] Rename karaf-bom-nodeps to karaf-bom-artifacts (#1947) * [KARAF-7957] Rename karaf-bom-nodeps to karaf-bom-artifacts - Add transitive dep excludes for dist artifacts * [KARAF-7950] Update itests common and example/karaf-example-itests dependency scopes (cherry picked from commit 531122d96fb4b7dd66d8da28c427eebaa6cd69f4) --- bom/{nodeps => artifacts}/pom.xml | 30 +++++++++++++++++++++++++--- bom/pom.xml | 4 ++-- examples/karaf-itest-example/pom.xml | 5 +++++ itests/common/pom.xml | 3 +++ 4 files changed, 37 insertions(+), 5 deletions(-) rename bom/{nodeps => artifacts}/pom.xml (95%) diff --git a/bom/nodeps/pom.xml b/bom/artifacts/pom.xml similarity index 95% rename from bom/nodeps/pom.xml rename to bom/artifacts/pom.xml index 7c0dd3e2cf9..a713359ca5e 100644 --- a/bom/nodeps/pom.xml +++ b/bom/artifacts/pom.xml @@ -28,8 +28,8 @@ ../../pom.xml - karaf-bom-nodeps - Apache Karaf :: BOM :: Karaf Only + karaf-bom-artifacts + Apache Karaf :: BOM :: Karaf Artifacts pom @@ -40,25 +40,49 @@ apache-karaf tar.gz ${project.version} + + + * + * + + org.apache.karaf apache-karaf zip ${project.version} + + + * + * + + org.apache.karaf apache-karaf-minimal tar.gz ${project.version} + + + * + * + + org.apache.karaf apache-karaf-minimal zip ${project.version} - + + + * + * + + + org.apache.karaf manual diff --git a/bom/pom.xml b/bom/pom.xml index 9552dea33ca..08c181e5614 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -36,7 +36,7 @@ org.apache.karaf - karaf-bom-nodeps + karaf-bom-artifacts ${project.version} pom import @@ -1286,7 +1286,7 @@ - nodeps + artifacts diff --git a/examples/karaf-itest-example/pom.xml b/examples/karaf-itest-example/pom.xml index e3fcd975c1b..f89edf08bb5 100644 --- a/examples/karaf-itest-example/pom.xml +++ b/examples/karaf-itest-example/pom.xml @@ -52,6 +52,11 @@ ${project.version} test + + javax.annotation + javax.annotation-api + ${javax.annotation.version} + diff --git a/itests/common/pom.xml b/itests/common/pom.xml index 21d55b0ad93..6f8843eb6b5 100644 --- a/itests/common/pom.xml +++ b/itests/common/pom.xml @@ -85,14 +85,17 @@ org.osgi org.osgi.framework + compile org.osgi org.osgi.util.tracker + compile org.apache.felix org.apache.felix.configadmin + compile From e7aa212e0274a83cf47a5f9190751b5971e796af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 24 Jul 2025 11:27:44 +0200 Subject: [PATCH 159/440] KARAF-7905: Upgrade to Pax Tinybundles 4.0.1 (#1918) * KARAF-7905: Upgrade to Pax TinyBundles 4.0.1 * KARAF-7903: Upgrade to Pax Exam 4.14.0 * Remove use of hamcrest in ConfigTest (cherry picked from commit 1c3a2b0348ba6cbe6c6126a233d0e2d5cdd75b1c) --- .../org/apache/karaf/itests/ConfigTest.java | 13 +++++---- .../karaf/itests/ImportServiceTest.java | 23 ++++++++-------- .../KarafMinimalMonitoredTestSupport.java | 15 +++++------ ...bleConfigAdminPropertyPlaceholderTest.java | 27 ++++++++++--------- .../EncryptablePropertyPlaceholderTest.java | 27 ++++++++++--------- .../apache/karaf/main/MainLockingTest.java | 26 ++++++++---------- pom.xml | 4 +-- 7 files changed, 65 insertions(+), 70 deletions(-) diff --git a/itests/test/src/test/java/org/apache/karaf/itests/ConfigTest.java b/itests/test/src/test/java/org/apache/karaf/itests/ConfigTest.java index 20a6d0f193f..f53014ff8e3 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/ConfigTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/ConfigTest.java @@ -13,11 +13,6 @@ */ package org.apache.karaf.itests; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.hasKey; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; - import java.lang.management.ManagementFactory; import java.util.List; import java.util.Map; @@ -31,6 +26,8 @@ import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; +import static org.junit.Assert.*; + @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class ConfigTest extends BaseTest { @@ -66,10 +63,12 @@ public void configsViaMBean() throws Exception { MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); ObjectName name = new ObjectName("org.apache.karaf:type=config,name=root"); List configs = (List) mbeanServer.getAttribute(name, "Configs"); - assertThat(configs, hasItem("org.apache.karaf.features")); + String found = configs.stream().filter(c -> c.equals("org.apache.karaf.features")).findAny().orElse(null); + assertNotNull(found); Map properties = (Map) mbeanServer .invoke(name, "listProperties", new Object[]{"org.apache.karaf.features"}, new String[]{"java.lang.String"}); - assertThat(properties, hasKey("featuresRepositories")); + String key = properties.keySet().stream().filter(c -> c.equals("featuresRepositories")).findAny().orElse(null); + assertNotNull(key); } } diff --git a/itests/test/src/test/java/org/apache/karaf/itests/ImportServiceTest.java b/itests/test/src/test/java/org/apache/karaf/itests/ImportServiceTest.java index acaad0234b8..5b4ca1bcb56 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/ImportServiceTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/ImportServiceTest.java @@ -13,8 +13,6 @@ */ package org.apache.karaf.itests; -import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle; - import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; @@ -29,6 +27,7 @@ import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; +import org.ops4j.pax.tinybundles.TinyBundles; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; @@ -43,18 +42,18 @@ public class ImportServiceTest extends BaseTest { @Configuration public Option[] config() { List