This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf-cellar.git
The following commit(s) were added to refs/heads/main by this push:
new 430c783d Cleanup and update to support Karaf 4.4.x and prepare 4.4.8
release (#142)
430c783d is described below
commit 430c783d8e66896a90a9f77218c7308071fc05f6
Author: JB Onofré <[email protected]>
AuthorDate: Wed Aug 27 07:57:50 2025 +0200
Cleanup and update to support Karaf 4.4.x and prepare 4.4.8 release (#142)
---
LICENSE | 25 +--
NOTICE | 35 +---
README.md | 2 +-
assembly/pom.xml | 4 +-
assembly/src/main/resources/features.xml | 1 +
bundle/NOTICE | 36 ----
bundle/pom.xml | 15 +-
cloud/NOTICE | 36 ----
cloud/pom.xml | 10 +-
config/NOTICE | 36 ----
config/pom.xml | 15 +-
core/NOTICE | 36 ----
core/pom.xml | 14 +-
dns/NOTICE | 36 ----
dns/pom.xml | 13 +-
dosgi/NOTICE | 36 ----
dosgi/pom.xml | 12 +-
etcd/NOTICE | 40 ----
etcd/pom.xml | 10 +-
event/NOTICE | 36 ----
event/pom.xml | 16 +-
features/NOTICE | 36 ----
features/pom.xml | 16 +-
hazelcast/NOTICE | 36 ----
hazelcast/pom.xml | 14 +-
http/balancer/NOTICE | 36 ----
http/balancer/pom.xml | 22 +-
.../cellar/http/balancer/LocalServletListener.java | 45 +++--
.../http/balancer/internal/osgi/Activator.java | 6 +-
http/pom.xml | 2 +-
itests/pom.xml | 6 +-
kar/NOTICE | 36 ----
kar/pom.xml | 12 +-
kubernetes/NOTICE | 36 ----
kubernetes/pom.xml | 12 +-
log/NOTICE.txt | 36 ----
log/pom.xml | 18 +-
manual/pom.xml | 2 +-
obr/NOTICE | 36 ----
obr/pom.xml | 16 +-
pom.xml | 223 ++-------------------
samples/camel-hazelcast-app/NOTICE | 36 ----
samples/camel-hazelcast-app/consumer/pom.xml | 2 +-
samples/camel-hazelcast-app/pom.xml | 2 +-
samples/camel-hazelcast-app/producer/pom.xml | 2 +-
samples/dosgi-greeter/NOTICE | 36 ----
samples/dosgi-greeter/api/pom.xml | 2 +-
samples/dosgi-greeter/client/pom.xml | 2 +-
samples/dosgi-greeter/pom.xml | 2 +-
samples/dosgi-greeter/service/pom.xml | 4 +-
samples/hazelcast-app/NOTICE | 36 ----
samples/hazelcast-app/pom.xml | 8 +-
samples/http-session-replication/NOTICE | 36 ----
samples/http-session-replication/pom.xml | 2 +-
samples/pom.xml | 2 +-
shell/NOTICE | 36 ----
shell/pom.xml | 10 +-
utils/NOTICE | 36 ----
utils/pom.xml | 10 +-
webconsole/NOTICE | 36 ----
webconsole/pom.xml | 20 +-
61 files changed, 192 insertions(+), 1238 deletions(-)
diff --git a/LICENSE b/LICENSE
index cbb2b4e7..7a4a3ea2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,27 +199,4 @@
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.
-
-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
+ limitations under the License.
\ No newline at end of file
diff --git a/NOTICE b/NOTICE
index 4f6258b6..dd286265 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,36 +1,5 @@
Apache Karaf Cellar
-Copyright 2011-2019 The Apache Software Foundation
-
-I. Used Software
+Copyright 2011-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 uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/README.md b/README.md
index 95e4e39b..8b75a3a5 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ BUILDING for instructions on building Apache Karaf.
To install Apache Karaf Cellar, first you have to register the Cellar features
descriptor:
```shell
-karaf@root()> feature:repo-add
mvn:org.apache.karaf.cellar/apache-karaf-cellar/4.0.0/xml/features
+karaf@root()> feature:repo-add
mvn:org.apache.karaf.cellar/apache-karaf-cellar/4.4.8/xml/features
```
Now, you can install the Cellar feature simply by typing:
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4bb6def6..260750e2 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -89,7 +89,7 @@
<descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
</descriptors>
<distribution>org.apache.karaf.features:framework</distribution>
- <javase>1.8</javase>
+ <javase>11</javase>
<framework>
<feature>framework</feature>
</framework>
diff --git a/assembly/src/main/resources/features.xml
b/assembly/src/main/resources/features.xml
index 4208c486..73dccdef 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -149,6 +149,7 @@
<conditional>
<condition>webconsole</condition>
<feature dependency="true">cellar-hazelcast</feature>
+ <feature>http</feature>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.webconsole/${project.version}</bundle>
</conditional>
</feature>
diff --git a/bundle/NOTICE b/bundle/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/bundle/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/bundle/pom.xml b/bundle/pom.xml
index d1da2fe3..5912776e 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -48,15 +48,18 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
</dependency>
+
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<!-- Karaf features -->
@@ -91,7 +94,7 @@
org.apache.karaf.cellar.bundle*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
org.apache.karaf.shell*;resolution:=optional,
*
</Import-Package>
diff --git a/cloud/NOTICE b/cloud/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/cloud/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/cloud/pom.xml b/cloud/pom.xml
index 958c3079..fdbf2744 100644
--- a/cloud/pom.xml
+++ b/cloud/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -59,13 +59,11 @@
<!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
</dependency>
<!-- Misc Dependencies -->
@@ -106,7 +104,7 @@
org.apache.karaf.cellar.cloud*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
*
</Import-Package>
<Private-Package>
diff --git a/config/NOTICE b/config/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/config/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/config/pom.xml b/config/pom.xml
index 9a7df2a5..ecaea92b 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -53,15 +53,18 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
</dependency>
+
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<!-- Karaf features -->
@@ -96,7 +99,7 @@
org.apache.karaf.cellar.config*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
org.apache.karaf.shell*;resolution:=optional,
*
</Import-Package>
diff --git a/core/NOTICE b/core/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/core/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/core/pom.xml b/core/pom.xml
index ebb7fb86..1e6e2632 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -37,13 +37,15 @@
<!-- OSGi dependencies -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<!-- Core dependencies -->
@@ -135,7 +137,7 @@
org.apache.karaf.cellar.core*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
*
</Import-Package>
<Private-Package>
diff --git a/dns/NOTICE b/dns/NOTICE
deleted file mode 100644
index 16efa27d..00000000
--- a/dns/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/dns/pom.xml b/dns/pom.xml
index 98fa713a..8b6d688b 100644
--- a/dns/pom.xml
+++ b/dns/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -46,15 +46,14 @@
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.util</artifactId>
</dependency>
+
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
</dependency>
<!-- Logging Dependencies -->
@@ -94,7 +93,7 @@
org.apache.karaf.cellar.dns.*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
*
</Import-Package>
<Private-Package>
@@ -107,4 +106,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/dosgi/NOTICE b/dosgi/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/dosgi/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/dosgi/pom.xml b/dosgi/pom.xml
index b575be3b..7a0bdea6 100644
--- a/dosgi/pom.xml
+++ b/dosgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -47,16 +47,16 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
</dependency>
+
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -93,7 +93,7 @@
org.apache.karaf.cellar.dosgi*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
org.apache.karaf.shell*;resolution:=optional,
*
</Import-Package>
diff --git a/etcd/NOTICE b/etcd/NOTICE
deleted file mode 100644
index 4e92c2ab..00000000
--- a/etcd/NOTICE
+++ /dev/null
@@ -1,40 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-This product uses software developed at
-Netflix (https://github.com/Netflix/).
-Licensed under the Apache License 2.0.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/etcd/pom.xml b/etcd/pom.xml
index b72e25a5..a76f5dfa 100644
--- a/etcd/pom.xml
+++ b/etcd/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -66,13 +66,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
</dependency>
<!-- Logging Dependencies -->
@@ -113,7 +111,7 @@
org.apache.karaf.cellar.etcd.*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
*
</Import-Package>
<Private-Package>
diff --git a/event/NOTICE b/event/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/event/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/event/pom.xml b/event/pom.xml
index 042a5afa..fba7aa9f 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -45,13 +45,15 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
</dependency>
<!-- Logging Dependencies -->
@@ -78,7 +80,7 @@
org.apache.karaf.cellar.event*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
*
</Import-Package>
<Private-Package>
@@ -91,4 +93,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/NOTICE b/features/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/features/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/features/pom.xml b/features/pom.xml
index 6082a365..9a1e09b0 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -49,13 +49,15 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<!-- Karaf features -->
@@ -110,9 +112,9 @@
org.apache.karaf.cellar.features*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
org.apache.karaf.shell*;resolution:=optional,
- javax.xml.bind*;version="[2.2,3)",
+ javax.xml.bind*,
*
</Import-Package>
<Private-Package>
diff --git a/hazelcast/NOTICE b/hazelcast/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/hazelcast/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml
index 069a1a41..31006634 100644
--- a/hazelcast/pom.xml
+++ b/hazelcast/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -52,13 +52,15 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -101,7 +103,7 @@
org.apache.karaf.cellar.hazelcast*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
*
</Import-Package>
<Private-Package>
diff --git a/http/balancer/NOTICE b/http/balancer/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/http/balancer/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/http/balancer/pom.xml b/http/balancer/pom.xml
index 5d40b508..31ce03e6 100644
--- a/http/balancer/pom.xml
+++ b/http/balancer/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.cellar</groupId>
<artifactId>http</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -34,7 +34,7 @@
<name>Apache Karaf :: Cellar :: HTTP :: Balancer</name>
<properties>
- <pax.web.version>4.2.0</pax.web.version>
+ <pax.web.version>8.0.33</pax.web.version>
</properties>
<dependencies>
@@ -71,13 +71,15 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -110,10 +112,10 @@
org.apache.karaf.cellar.http.balancer*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
org.apache.commons.logging;resolution:=optional,
- javax.servlet;version="[2,5)",
- org.ops4j.pax.web.service.spi;version="[4,7)",
+ javax.servlet;version="[4,8)",
+ org.ops4j.pax.web.service.spi;version="[8,9)",
*
</Import-Package>
<Private-Package>
@@ -128,4 +130,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git
a/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/LocalServletListener.java
b/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/LocalServletListener.java
index d05d4039..3d5e4a83 100644
---
a/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/LocalServletListener.java
+++
b/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/LocalServletListener.java
@@ -19,8 +19,9 @@ import org.apache.karaf.cellar.core.Group;
import org.apache.karaf.cellar.core.GroupManager;
import org.apache.karaf.cellar.core.control.SwitchStatus;
import org.apache.karaf.cellar.core.event.EventProducer;
-import org.ops4j.pax.web.service.spi.ServletEvent;
-import org.ops4j.pax.web.service.spi.ServletListener;
+import org.ops4j.pax.web.service.spi.model.events.ServletEventData;
+import org.ops4j.pax.web.service.spi.model.events.WebElementEvent;
+import org.ops4j.pax.web.service.spi.model.events.WebElementEventListener;
import org.osgi.service.cm.ConfigurationAdmin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,7 +33,7 @@ import java.util.*;
* Listen local node servlet event, in order to update the cluster servlet map
* and send a cluster event to the other nodes
*/
-public class LocalServletListener implements ServletListener {
+public class LocalServletListener implements WebElementEventListener {
private final static Logger LOGGER =
LoggerFactory.getLogger(LocalServletListener.class);
@@ -42,14 +43,21 @@ public class LocalServletListener implements
ServletListener {
private EventProducer eventProducer;
@Override
- public synchronized void servletEvent(ServletEvent servletEvent) {
+ public synchronized void registrationEvent(WebElementEvent event) {
+
+ // only listen for servlet event
+ if (!(event.getData() instanceof ServletEventData)) {
+ return;
+ }
if (eventProducer.getSwitch().getStatus().equals(SwitchStatus.OFF)) {
LOGGER.warn("CELLAR HTTP BALANCER: cluster event producer is OFF");
return;
}
- Servlet servlet = servletEvent.getServlet();
+ ServletEventData data = (ServletEventData) event.getData();
+ Servlet servlet = data.getServlet();
+
if (servlet != null &&
servlet.getClass().getName().equals(CellarBalancerProxyServlet.class.getName()))
{
LOGGER.trace("CELLAR HTTP BALANCER: ignoring
CellarBalancerProxyServlet servlet event");
return;
@@ -60,13 +68,13 @@ public class LocalServletListener implements
ServletListener {
BalancedServletUtil util = new BalancedServletUtil();
util.setClusterManager(clusterManager);
util.setConfigurationAdmin(configurationAdmin);
- String alias = servletEvent.getAlias();
+ String alias = data.getAlias();
String location = util.constructLocation(alias);
for (Group group : localGroups) {
Map<String, List<String>> clusterServlets =
clusterManager.getMap(Constants.BALANCER_MAP + Configurations.SEPARATOR +
group.getName());
- if (servletEvent.getType() == ServletEvent.DEPLOYED) {
+ if (event.getType() == WebElementEvent.State.DEPLOYED) {
// update the cluster servlets
List<String> locations = clusterServlets.get(alias);
if (locations == null) {
@@ -78,15 +86,15 @@ public class LocalServletListener implements
ServletListener {
locations.add(location);
clusterServlets.put(alias, locations);
// send cluster event
- ClusterBalancerEvent event = new
ClusterBalancerEvent(alias, ClusterBalancerEvent.ADDING, locations);
- event.setSourceGroup(group);
- event.setSourceNode(clusterManager.getNode());
- event.setLocal(clusterManager.getNode());
- eventProducer.produce(event);
+ ClusterBalancerEvent cellarEvent = new
ClusterBalancerEvent(alias, ClusterBalancerEvent.ADDING, locations);
+ cellarEvent.setSourceGroup(group);
+ cellarEvent.setSourceNode(clusterManager.getNode());
+ cellarEvent.setLocal(clusterManager.getNode());
+ eventProducer.produce(cellarEvent);
} else {
LOGGER.debug("CELLAR HTTP BALANCER: location {} already
defined for servlet {} on cluster", location, alias);
}
- } else if (servletEvent.getType() == ServletEvent.UNDEPLOYED) {
+ } else if (event.getType() == WebElementEvent.State.UNDEPLOYED) {
List<String> locations = clusterServlets.get(alias);
if (locations == null)
locations = new ArrayList<String>();
@@ -96,11 +104,11 @@ public class LocalServletListener implements
ServletListener {
// update cluster state
clusterServlets.put(alias, locations);
// send cluster event
- ClusterBalancerEvent event = new
ClusterBalancerEvent(alias, ClusterBalancerEvent.REMOVING, locations);
- event.setSourceGroup(group);
- event.setSourceNode(clusterManager.getNode());
- event.setLocal(clusterManager.getNode());
- eventProducer.produce(event);
+ ClusterBalancerEvent cellarEvent = new
ClusterBalancerEvent(alias, ClusterBalancerEvent.REMOVING, locations);
+ cellarEvent.setSourceGroup(group);
+ cellarEvent.setSourceNode(clusterManager.getNode());
+ cellarEvent.setLocal(clusterManager.getNode());
+ eventProducer.produce(cellarEvent);
}
if (locations.isEmpty()) {
LOGGER.debug("CELLAR HTTP BALANCER: destroying servlet {}
from cluster", alias);
@@ -109,7 +117,6 @@ public class LocalServletListener implements
ServletListener {
}
}
}
-
}
public void setClusterManager(ClusterManager clusterManager) {
diff --git
a/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/internal/osgi/Activator.java
b/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/internal/osgi/Activator.java
index 58d87b1e..28e638a9 100644
---
a/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/internal/osgi/Activator.java
+++
b/http/balancer/src/main/java/org/apache/karaf/cellar/http/balancer/internal/osgi/Activator.java
@@ -28,7 +28,7 @@ import org.apache.karaf.util.tracker.BaseActivator;
import org.apache.karaf.util.tracker.annotation.ProvideService;
import org.apache.karaf.util.tracker.annotation.RequireService;
import org.apache.karaf.util.tracker.annotation.Services;
-import org.ops4j.pax.web.service.spi.ServletListener;
+import org.ops4j.pax.web.service.spi.model.events.WebElementEventListener;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.slf4j.Logger;
@@ -38,7 +38,7 @@ import java.util.Hashtable;
@Services(
provides = {
- @ProvideService(ServletListener.class),
+ @ProvideService(WebElementEventListener.class),
@ProvideService(EventHandler.class),
@ProvideService(Synchronizer.class),
@ProvideService(CellarHttpMBean.class)
@@ -111,7 +111,7 @@ public class Activator extends BaseActivator {
servletListener.setGroupManager(groupManager);
servletListener.setConfigurationAdmin(configurationAdmin);
servletListener.setEventProducer(eventProducer);
- register(ServletListener.class, servletListener);
+ register(WebElementEventListener.class, servletListener);
LOGGER.debug("CELLAR HTTP BALANCER: register MBean");
CellarHttpMBeanImpl mbean = new CellarHttpMBeanImpl();
diff --git a/http/pom.xml b/http/pom.xml
index 6bdbbd64..70658984 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/itests/pom.xml b/itests/pom.xml
index 09300982..4d0b67e5 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
- <version>${karaf.version}</version>
<type>tar.gz</type>
</dependency>
<dependency>
@@ -69,19 +68,16 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-karaf</artifactId>
- <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.2</version>
<scope>test</scope>
</dependency>
diff --git a/kar/NOTICE b/kar/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/kar/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/kar/pom.xml b/kar/pom.xml
index 4cb809c5..ff584ab4 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -41,13 +41,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.kar</groupId>
@@ -78,7 +76,7 @@
org.apache.karaf.cellar.kar*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
org.apache.karaf.shell*;resolution:=optional,
*
</Import-Package>
@@ -93,4 +91,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/kubernetes/NOTICE b/kubernetes/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/kubernetes/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml
index 604feb61..b8cc1eb6 100644
--- a/kubernetes/pom.xml
+++ b/kubernetes/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -66,13 +66,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
</dependency>
</dependencies>
@@ -93,7 +91,7 @@
org.apache.karaf.cellar.kubernetes.*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
*
</Import-Package>
<DynamicImport-Package>io.fabric8.*</DynamicImport-Package>
@@ -107,4 +105,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/log/NOTICE.txt b/log/NOTICE.txt
deleted file mode 100644
index 08afaffa..00000000
--- a/log/NOTICE.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/log/pom.xml b/log/pom.xml
index 72d85003..54275281 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -41,23 +41,15 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-service</artifactId>
- <version>1.7.3</version>
+ <artifactId>pax-logging-log4j2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.log</groupId>
<artifactId>org.apache.karaf.log.core</artifactId>
- <version>${karaf.version}</version>
</dependency>
<!-- Logging dependencies -->
@@ -90,7 +82,7 @@
org.apache.karaf.cellar.log*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
*
</Import-Package>
<Private-Package>
@@ -104,4 +96,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/manual/pom.xml b/manual/pom.xml
index ebe8d479..f5f0a2a0 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/obr/NOTICE b/obr/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/obr/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/obr/pom.xml b/obr/pom.xml
index fa68a9aa..2fe9d04d 100644
--- a/obr/pom.xml
+++ b/obr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -49,13 +49,15 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
</dependency>
<!-- OBR dependency -->
@@ -89,7 +91,7 @@
org.apache.karaf.cellar.obr*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
org.apache.karaf.shell*;resolution:=optional,
*
</Import-Package>
@@ -107,4 +109,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index de774e19..cc0b2826 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,31 +24,25 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>35</version>
<relativePath />
</parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Karaf :: Cellar</name>
<properties>
- <commons-lang3.version>3.18.0</commons-lang3.version>
- <easymock.version>3.6</easymock.version>
+
<project.build.outputTimestamp>1695310533</project.build.outputTimestamp>
+ <maven.compiler.target>11</maven.compiler.target>
<fabric8.kubernetes-client.version>4.13.3</fabric8.kubernetes-client.version>
- <felix.bundlerepository.version>2.0.10</felix.bundlerepository.version>
- <felix.utils.version>1.11.8</felix.utils.version>
<felix.webconsole.version>4.2.14</felix.webconsole.version>
<hazelcast.version>3.12.8</hazelcast.version>
<jclouds.version>2.1.2</jclouds.version>
<joda-time.version>2.14.0</joda-time.version>
- <junit.version>4.13.2</junit.version>
- <karaf.version>4.2.8</karaf.version>
- <osgi.version>6.0.0</osgi.version>
- <osgi.compendium.version>5.0.0</osgi.compendium.version>
- <slf4j.version>1.7.7</slf4j.version>
+ <karaf.version>4.4.8</karaf.version>
<netflix.feign.version>8.18.0</netflix.feign.version>
<gson.version>2.13.1</gson.version>
<bnd.version.policy>[$(version;==;$(@)),$(version;+;$(@)))</bnd.version.policy>
@@ -125,6 +119,15 @@
<dependencyManagement>
<dependencies>
+ <!-- Karaf BoM -->
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf-bom</artifactId>
+ <version>${karaf.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<!-- Cellar -->
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
@@ -186,33 +189,6 @@
<classifier>features</classifier>
</dependency>
- <!-- Felix -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>${felix.bundlerepository.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>${felix.webconsole.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
- <version>${felix.utils.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- Hazelcast -->
<dependency>
<groupId>com.hazelcast</groupId>
@@ -220,78 +196,12 @@
<version>${hazelcast.version}</version>
</dependency>
- <!-- Karaf -->
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.core</artifactId>
- <version>${karaf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.command</artifactId>
- <version>${karaf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.util</artifactId>
- <version>${karaf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.kar</groupId>
- <artifactId>org.apache.karaf.kar.core</artifactId>
- <version>${karaf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.core</artifactId>
- <version>${karaf.version}</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>org.apache.karaf.tooling.testing</artifactId>
- <version>${karaf.version}</version>
- </dependency>
-
- <!-- OSGi -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${osgi.compendium.version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${osgi.version}</version>
- </dependency>
-
- <!-- Servlet API -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>1.0</version>
- </dependency>
-
- <!-- SLF4J -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
<!-- JClouds -->
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId>
<version>${jclouds.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-allblobstore</artifactId>
@@ -305,13 +215,6 @@
<version>${joda-time.version}</version>
</dependency>
- <!-- Apache common-lang3 -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
- </dependency>
-
<!-- Kubernetes -->
<dependency>
<groupId>io.fabric8</groupId>
@@ -340,20 +243,6 @@
<artifactId>feign-gson</artifactId>
<version>${netflix.feign.version}</version>
</dependency>
-
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
-
- <!-- Easymock -->
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>${easymock.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -362,31 +251,6 @@
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.6</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -397,18 +261,6 @@
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <preparationGoals>clean install</preparationGoals>
- <goals>deploy</goals>
- <arguments>-Prelease,deploy</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-services-maven-plugin</artifactId>
@@ -448,46 +300,11 @@
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.12</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.14.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.5</version>
- </plugin>
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
@@ -496,14 +313,6 @@
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -598,7 +407,7 @@
<version>[3,4)</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>[1.7,1.9)</version>
+ <version>[11,21)</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -676,7 +485,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <source>1.7</source>
+ <source>11</source>
</configuration>
<executions>
<execution>
diff --git a/samples/camel-hazelcast-app/NOTICE
b/samples/camel-hazelcast-app/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/samples/camel-hazelcast-app/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/samples/camel-hazelcast-app/consumer/pom.xml
b/samples/camel-hazelcast-app/consumer/pom.xml
index 599a1c7a..893806bc 100644
--- a/samples/camel-hazelcast-app/consumer/pom.xml
+++ b/samples/camel-hazelcast-app/consumer/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.cellar.samples</groupId>
<artifactId>camel-hazelcast-app</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/camel-hazelcast-app/pom.xml
b/samples/camel-hazelcast-app/pom.xml
index 69acddb1..b66371ca 100644
--- a/samples/camel-hazelcast-app/pom.xml
+++ b/samples/camel-hazelcast-app/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.karaf.cellar</groupId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/camel-hazelcast-app/producer/pom.xml
b/samples/camel-hazelcast-app/producer/pom.xml
index bc8aade0..5841f2a7 100644
--- a/samples/camel-hazelcast-app/producer/pom.xml
+++ b/samples/camel-hazelcast-app/producer/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.cellar.samples</groupId>
<artifactId>camel-hazelcast-app</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/dosgi-greeter/NOTICE b/samples/dosgi-greeter/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/samples/dosgi-greeter/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/samples/dosgi-greeter/api/pom.xml
b/samples/dosgi-greeter/api/pom.xml
index 6f42d3ab..cd972d10 100644
--- a/samples/dosgi-greeter/api/pom.xml
+++ b/samples/dosgi-greeter/api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.cellar.samples</groupId>
<artifactId>dosgi-greeter</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/dosgi-greeter/client/pom.xml
b/samples/dosgi-greeter/client/pom.xml
index 38e8cd05..572d5ba5 100644
--- a/samples/dosgi-greeter/client/pom.xml
+++ b/samples/dosgi-greeter/client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.cellar.samples</groupId>
<artifactId>dosgi-greeter</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/dosgi-greeter/pom.xml b/samples/dosgi-greeter/pom.xml
index 4505d851..b12d02b0 100644
--- a/samples/dosgi-greeter/pom.xml
+++ b/samples/dosgi-greeter/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.cellar</groupId>
<artifactId>samples</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/dosgi-greeter/service/pom.xml
b/samples/dosgi-greeter/service/pom.xml
index 87eb3653..6486e9b1 100644
--- a/samples/dosgi-greeter/service/pom.xml
+++ b/samples/dosgi-greeter/service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.cellar.samples</groupId>
<artifactId>dosgi-greeter</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
diff --git a/samples/hazelcast-app/NOTICE b/samples/hazelcast-app/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/samples/hazelcast-app/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/samples/hazelcast-app/pom.xml b/samples/hazelcast-app/pom.xml
index 3116da12..069917a0 100644
--- a/samples/hazelcast-app/pom.xml
+++ b/samples/hazelcast-app/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.cellar</groupId>
<artifactId>samples</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -37,7 +37,7 @@
<!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
@@ -64,7 +64,7 @@
<Import-Package>
com.hazelcast.core,
org.osgi*,
- org.slf4j;version="[1.6,2)";resolution:=optional
+ org.slf4j;version="[2,3)";resolution:=optional
</Import-Package>
<Bundle-Activator>
org.apache.karaf.cellar.samples.hazelcast.Activator
@@ -75,4 +75,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/http-session-replication/NOTICE
b/samples/http-session-replication/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/samples/http-session-replication/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/samples/http-session-replication/pom.xml
b/samples/http-session-replication/pom.xml
index 645395b5..ecd2c68a 100644
--- a/samples/http-session-replication/pom.xml
+++ b/samples/http-session-replication/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf.cellar</groupId>
<artifactId>samples</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/samples/pom.xml b/samples/pom.xml
index 07877fe3..8e69f1cb 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>cellar</artifactId>
<groupId>org.apache.karaf</groupId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/shell/NOTICE b/shell/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/shell/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/shell/pom.xml b/shell/pom.xml
index 27ab2b8b..1e74b5da 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -37,13 +37,11 @@
<!-- Internal Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -93,7 +91,7 @@
org.apache.karaf.cellar.shell*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
*
</Import-Package>
</instructions>
diff --git a/utils/NOTICE b/utils/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/utils/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/utils/pom.xml b/utils/pom.xml
index e8a3d079..6fefed9e 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -42,13 +42,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.service.cm</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -78,7 +76,7 @@
org.apache.karaf.cellar.utils*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.slf4j;version="[2,3)";resolution:=optional,
*
</Import-Package>
<Private-Package>
diff --git a/webconsole/NOTICE b/webconsole/NOTICE
deleted file mode 100644
index 08afaffa..00000000
--- a/webconsole/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Cellar
-Copyright 2011-2015 The Apache Software Foundation
-
-I. Used Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Hazelcast (http://www.hazelcast.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-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
-JClouds (http://www.jclouds.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-II. License Summary
-- Apache License 2.0
-- MIT License
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index e0f25ab3..13c62548 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>cellar</artifactId>
<groupId>org.apache.karaf</groupId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>4.4.8-SNAPSHOT</version>
</parent>
<groupId>org.apache.karaf.cellar</groupId>
@@ -45,13 +45,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -69,8 +63,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -111,9 +105,9 @@
org.apache.karaf.cellar.webconsole*
</Export-Package>
<Import-Package>
- org.slf4j;version="[1.6,2)";resolution:=optional,
- javax.servlet*;version="[3,4)",
- org.apache.felix.webconsole*;version="[3,5)",
+ org.slf4j;version="[2,3)";resolution:=optional,
+ javax.servlet*;version="[4,8)",
+ org.apache.felix.webconsole*;version="[8,9)",
*
</Import-Package>
<Embed-Dependency>json</Embed-Dependency>
