This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 55ac2dd [KARAF-6847] Upgrade examples to use R7 "style"
new aea6d3a Merge pull request #1194 from jbonofre/KARAF-6847
55ac2dd is described below
commit 55ac2dd40e23594902373156b09674033f807a91
Author: jbonofre <jbono...@apache.org>
AuthorDate: Fri Sep 18 13:57:07 2020 +0200
[KARAF-6847] Upgrade examples to use R7 "style"
---
.../karaf-blueprint-example-common/pom.xml | 13 ++++++++-----
.../karaf/examples/blueprint/common/package-info.java | 19 +++++++++++++++++++
.../karaf-bundle-example-client/pom.xml | 7 -------
.../karaf/examples/bundle/client/Activator.java | 7 +++----
.../karaf/examples/bundle/client/package-info.java | 18 ++++++++++++++++++
.../karaf-bundle-example-common/pom.xml | 13 ++++++++-----
.../karaf/examples/bundle/common/package-info.java | 19 +++++++++++++++++++
.../karaf-bundle-example-provider/pom.xml | 6 ------
.../examples/bundle/provider/internal/Activator.java | 3 +++
.../karaf-command-example-api/pom.xml | 13 ++++++++-----
.../karaf/examples/command/api/package-info.java | 19 +++++++++++++++++++
.../karaf-command-example-provider/pom.xml | 2 +-
.../karaf-config-example-listener/pom.xml | 14 +++++++-------
.../karaf/example/config/listener/Activator.java | 3 +++
.../karaf-config-example-managed-factory/pom.xml | 14 +++++++-------
.../example/config/managedfactory/Activator.java | 2 ++
.../karaf-config-example-managed/pom.xml | 14 +++++++-------
.../karaf/example/config/managed/Activator.java | 2 ++
.../karaf-config-example-static/pom.xml | 10 +++++-----
.../org/apache/karaf/example/config/Activator.java | 3 +++
examples/karaf-deployer-example/pom.xml | 12 ++----------
examples/karaf-dump-example/pom.xml | 18 ++++++------------
.../org/apache/karaf/examples/dump/package-info.java | 17 +++++++++++++++++
.../karaf-jaas-example/karaf-jaas-example-app/pom.xml | 16 +++++-----------
.../apache/karaf/examples/jaas/app/package-info.java | 17 +++++++++++++++++
.../karaf-jdbc-example/karaf-jdbc-example-api/pom.xml | 13 ++++++++-----
.../apache/karaf/examples/jdbc/api/package-info.java | 17 +++++++++++++++++
.../karaf-jdbc-example-provider/pom.xml | 14 ++------------
.../karaf-log-appender-example-core/pom.xml | 10 +---------
.../karaf-mbean-example-api/pom.xml | 15 ++++++++-------
.../apache/karaf/examples/mbean/api/package-info.java | 17 +++++++++++++++++
.../karaf-mbean-example-provider/pom.xml | 2 +-
.../karaf-mbean-example-simple/pom.xml | 2 +-
.../karaf-scheduler-example-runnable/pom.xml | 2 +-
.../karaf-servlet-example-registration/pom.xml | 17 +++++++----------
.../examples/servlet/registration/Activator.java | 3 +++
.../karaf-soap-example/karaf-soap-example-api/pom.xml | 13 ++++++++-----
.../apache/karaf/examples/soap/api/package-info.java | 18 ++++++++++++++++++
.../karaf-url-namespace-handler-example-core/pom.xml | 13 +++++++++++--
39 files changed, 292 insertions(+), 145 deletions(-)
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 2708c60..5dac965 100644
--- a/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml
+++ b/examples/karaf-blueprint-example/karaf-blueprint-example-common/pom.xml
@@ -32,16 +32,19 @@
<name>Apache Karaf :: Examples :: Blueprint :: Common</name>
<packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Export-Package>org.apache.karaf.examples.blueprint.common</Export-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-blueprint-example/karaf-blueprint-example-common/src/main/java/org/apache/karaf/examples/blueprint/common/package-info.java
b/examples/karaf-blueprint-example/karaf-blueprint-example-common/src/main/java/org/apache/karaf/examples/blueprint/common/package-info.java
new file mode 100644
index 0000000..746fb8b
--- /dev/null
+++
b/examples/karaf-blueprint-example/karaf-blueprint-example-common/src/main/java/org/apache/karaf/examples/blueprint/common/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+@org.osgi.annotation.bundle.Export
+@org.osgi.annotation.versioning.Version("1.0")
+package org.apache.karaf.examples.blueprint.common;
\ No newline at end of file
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 de3cdb5..8a0926f 100644
--- a/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml
+++ b/examples/karaf-bundle-example/karaf-bundle-example-client/pom.xml
@@ -49,13 +49,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Import-Package>org.apache.karaf.examples.bundle.common,*</Import-Package>
-
<Private-Package>org.apache.karaf.examples.bundle.client</Private-Package>
-
<Bundle-Activator>org.apache.karaf.examples.bundle.client.Activator</Bundle-Activator>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-bundle-example/karaf-bundle-example-client/src/main/java/org/apache/karaf/examples/bundle/client/Activator.java
b/examples/karaf-bundle-example/karaf-bundle-example-client/src/main/java/org/apache/karaf/examples/bundle/client/Activator.java
index 89f7148..ab09899 100644
---
a/examples/karaf-bundle-example/karaf-bundle-example-client/src/main/java/org/apache/karaf/examples/bundle/client/Activator.java
+++
b/examples/karaf-bundle-example/karaf-bundle-example-client/src/main/java/org/apache/karaf/examples/bundle/client/Activator.java
@@ -17,12 +17,11 @@
package org.apache.karaf.examples.bundle.client;
import org.apache.karaf.examples.bundle.common.BookingService;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
+import org.osgi.annotation.bundle.Header;
+import org.osgi.framework.*;
import org.osgi.util.tracker.ServiceTracker;
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
private ServiceTracker<BookingService, BookingService>
bookingServiceTracker;
diff --git
a/examples/karaf-bundle-example/karaf-bundle-example-client/src/main/java/org/apache/karaf/examples/bundle/client/package-info.java
b/examples/karaf-bundle-example/karaf-bundle-example-client/src/main/java/org/apache/karaf/examples/bundle/client/package-info.java
new file mode 100644
index 0000000..65d1756
--- /dev/null
+++
b/examples/karaf-bundle-example/karaf-bundle-example-client/src/main/java/org/apache/karaf/examples/bundle/client/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+@org.osgi.annotation.bundle.Export
+package org.apache.karaf.examples.bundle.client;
\ No newline at end of file
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 a528587..72e443d 100644
--- a/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml
+++ b/examples/karaf-bundle-example/karaf-bundle-example-common/pom.xml
@@ -32,16 +32,19 @@
<name>Apache Karaf :: Examples :: Bundle :: Common</name>
<packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Export-Package>org.apache.karaf.examples.bundle.common</Export-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-bundle-example/karaf-bundle-example-common/src/main/java/org/apache/karaf/examples/bundle/common/package-info.java
b/examples/karaf-bundle-example/karaf-bundle-example-common/src/main/java/org/apache/karaf/examples/bundle/common/package-info.java
new file mode 100644
index 0000000..00ee2a2
--- /dev/null
+++
b/examples/karaf-bundle-example/karaf-bundle-example-common/src/main/java/org/apache/karaf/examples/bundle/common/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+@org.osgi.annotation.bundle.Export
+@org.osgi.annotation.versioning.Version("1.0")
+package org.apache.karaf.examples.bundle.common;
\ No newline at end of file
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 588fe55..d5780ea 100644
--- a/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml
+++ b/examples/karaf-bundle-example/karaf-bundle-example-provider/pom.xml
@@ -49,12 +49,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Private-Package>org.apache.karaf.examples.bundle.provider.internal</Private-Package>
-
<Bundle-Activator>org.apache.karaf.examples.bundle.provider.internal.Activator</Bundle-Activator>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-bundle-example/karaf-bundle-example-provider/src/main/java/org/apache/karaf/examples/bundle/provider/internal/Activator.java
b/examples/karaf-bundle-example/karaf-bundle-example-provider/src/main/java/org/apache/karaf/examples/bundle/provider/internal/Activator.java
index b054b9a..5156f7f 100644
---
a/examples/karaf-bundle-example/karaf-bundle-example-provider/src/main/java/org/apache/karaf/examples/bundle/provider/internal/Activator.java
+++
b/examples/karaf-bundle-example/karaf-bundle-example-provider/src/main/java/org/apache/karaf/examples/bundle/provider/internal/Activator.java
@@ -17,10 +17,13 @@
package org.apache.karaf.examples.bundle.provider.internal;
import org.apache.karaf.examples.bundle.common.BookingService;
+import org.osgi.annotation.bundle.Header;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
private ServiceRegistration serviceRegistration;
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 175fcad..a51b5fe 100644
--- a/examples/karaf-command-example/karaf-command-example-api/pom.xml
+++ b/examples/karaf-command-example/karaf-command-example-api/pom.xml
@@ -32,16 +32,19 @@
<name>Apache Karaf :: Examples :: Shell Command :: API</name>
<packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Export-Package>org.apache.karaf.examples.command.api</Export-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-command-example/karaf-command-example-api/src/main/java/org/apache/karaf/examples/command/api/package-info.java
b/examples/karaf-command-example/karaf-command-example-api/src/main/java/org/apache/karaf/examples/command/api/package-info.java
new file mode 100644
index 0000000..64b7c4b
--- /dev/null
+++
b/examples/karaf-command-example/karaf-command-example-api/src/main/java/org/apache/karaf/examples/command/api/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+@org.osgi.annotation.bundle.Export
+@org.osgi.annotation.versioning.Version("1.0")
+package org.apache.karaf.examples.command.api;
\ No newline at end of file
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 92cea31..7c760eb 100644
--- a/examples/karaf-command-example/karaf-command-example-provider/pom.xml
+++ b/examples/karaf-command-example/karaf-command-example-provider/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
</dependencies>
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 ebffbd3..588d649 100644
--- a/examples/karaf-config-example/karaf-config-example-listener/pom.xml
+++ b/examples/karaf-config-example/karaf-config-example-listener/pom.xml
@@ -36,12 +36,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
</dependency>
</dependencies>
@@ -50,11 +55,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Bundle-Activator>org.apache.karaf.example.config.listener.Activator</Bundle-Activator>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-config-example/karaf-config-example-listener/src/main/java/org/apache/karaf/example/config/listener/Activator.java
b/examples/karaf-config-example/karaf-config-example-listener/src/main/java/org/apache/karaf/example/config/listener/Activator.java
index eb9cd47..fa3eeb0 100644
---
a/examples/karaf-config-example/karaf-config-example-listener/src/main/java/org/apache/karaf/example/config/listener/Activator.java
+++
b/examples/karaf-config-example/karaf-config-example-listener/src/main/java/org/apache/karaf/example/config/listener/Activator.java
@@ -16,12 +16,15 @@
*/
package org.apache.karaf.example.config.listener;
+import org.osgi.annotation.bundle.Header;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ConfigurationEvent;
import org.osgi.service.cm.ConfigurationListener;
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
private ServiceRegistration<ConfigurationListener> registration;
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 eb0df40..73ab63d 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
@@ -36,12 +36,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
</dependency>
</dependencies>
@@ -50,11 +55,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Bundle-Activator>org.apache.karaf.example.config.managedfactory.Activator</Bundle-Activator>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-config-example/karaf-config-example-managed-factory/src/main/java/org/apache/karaf/example/config/managedfactory/Activator.java
b/examples/karaf-config-example/karaf-config-example-managed-factory/src/main/java/org/apache/karaf/example/config/managedfactory/Activator.java
index 6912ff8..0050606 100644
---
a/examples/karaf-config-example/karaf-config-example-managed-factory/src/main/java/org/apache/karaf/example/config/managedfactory/Activator.java
+++
b/examples/karaf-config-example/karaf-config-example-managed-factory/src/main/java/org/apache/karaf/example/config/managedfactory/Activator.java
@@ -16,6 +16,7 @@
*/
package org.apache.karaf.example.config.managedfactory;
+import org.osgi.annotation.bundle.Header;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -27,6 +28,7 @@ import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Hashtable;
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
private ServiceRegistration<ManagedServiceFactory> registration;
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 0748153..f454271 100644
--- a/examples/karaf-config-example/karaf-config-example-managed/pom.xml
+++ b/examples/karaf-config-example/karaf-config-example-managed/pom.xml
@@ -36,12 +36,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
</dependency>
</dependencies>
@@ -50,11 +55,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Bundle-Activator>org.apache.karaf.example.config.managed.Activator</Bundle-Activator>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-config-example/karaf-config-example-managed/src/main/java/org/apache/karaf/example/config/managed/Activator.java
b/examples/karaf-config-example/karaf-config-example-managed/src/main/java/org/apache/karaf/example/config/managed/Activator.java
index e6801e3..d35ab56 100644
---
a/examples/karaf-config-example/karaf-config-example-managed/src/main/java/org/apache/karaf/example/config/managed/Activator.java
+++
b/examples/karaf-config-example/karaf-config-example-managed/src/main/java/org/apache/karaf/example/config/managed/Activator.java
@@ -16,6 +16,7 @@
*/
package org.apache.karaf.example.config.managed;
+import org.osgi.annotation.bundle.Header;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -25,6 +26,7 @@ import org.osgi.service.cm.ManagedService;
import java.util.Enumeration;
import java.util.Hashtable;
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
private ServiceRegistration<ManagedService> registration;
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 a102aa3..e1deb04 100644
--- a/examples/karaf-config-example/karaf-config-example-static/pom.xml
+++ b/examples/karaf-config-example/karaf-config-example-static/pom.xml
@@ -43,6 +43,11 @@
<artifactId>osgi.cmpn</artifactId>
<version>7.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
+ </dependency>
</dependencies>
<build>
@@ -50,11 +55,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Bundle-Activator>org.apache.karaf.example.config.Activator</Bundle-Activator>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-config-example/karaf-config-example-static/src/main/java/org/apache/karaf/example/config/Activator.java
b/examples/karaf-config-example/karaf-config-example-static/src/main/java/org/apache/karaf/example/config/Activator.java
index 4d18312..b501b1e 100644
---
a/examples/karaf-config-example/karaf-config-example-static/src/main/java/org/apache/karaf/example/config/Activator.java
+++
b/examples/karaf-config-example/karaf-config-example-static/src/main/java/org/apache/karaf/example/config/Activator.java
@@ -16,8 +16,10 @@
*/
package org.apache.karaf.example.config;
+import org.osgi.annotation.bundle.Header;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -25,6 +27,7 @@ import org.osgi.service.cm.ConfigurationAdmin;
import java.util.Dictionary;
import java.util.Enumeration;
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
@Override
diff --git a/examples/karaf-deployer-example/pom.xml
b/examples/karaf-deployer-example/pom.xml
index 7831ebe..47b0d4e 100644
--- a/examples/karaf-deployer-example/pom.xml
+++ b/examples/karaf-deployer-example/pom.xml
@@ -36,13 +36,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -57,14 +57,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package />
- <Private-Package>
- org.apache.karaf.examples.deployer
- </Private-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/examples/karaf-dump-example/pom.xml
b/examples/karaf-dump-example/pom.xml
index 555c085..e969624 100644
--- a/examples/karaf-dump-example/pom.xml
+++ b/examples/karaf-dump-example/pom.xml
@@ -36,7 +36,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.diagnostic</groupId>
@@ -49,17 +54,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.karaf.examples.dump
- </Export-Package>
- <Import-Package>
- org.apache.karaf.diagnostic.core,
- *
- </Import-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-dump-example/src/main/java/org/apache/karaf/examples/dump/package-info.java
b/examples/karaf-dump-example/src/main/java/org/apache/karaf/examples/dump/package-info.java
new file mode 100644
index 0000000..a505459
--- /dev/null
+++
b/examples/karaf-dump-example/src/main/java/org/apache/karaf/examples/dump/package-info.java
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+@org.osgi.annotation.bundle.Export
+package org.apache.karaf.examples.dump;
\ No newline at end of file
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 3f99d5a..aff91ab 100644
--- a/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml
+++ b/examples/karaf-jaas-example/karaf-jaas-example-app/pom.xml
@@ -45,6 +45,11 @@
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
+ </dependency>
</dependencies>
<build>
@@ -56,17 +61,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.karaf.examples.jaas.app
- </Export-Package>
- <Import-Package>
- org.apache.karaf.shell*;version="[4,5)",
- *
- </Import-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-jaas-example/karaf-jaas-example-app/src/main/java/org/apache/karaf/examples/jaas/app/package-info.java
b/examples/karaf-jaas-example/karaf-jaas-example-app/src/main/java/org/apache/karaf/examples/jaas/app/package-info.java
new file mode 100644
index 0000000..09b9f24
--- /dev/null
+++
b/examples/karaf-jaas-example/karaf-jaas-example-app/src/main/java/org/apache/karaf/examples/jaas/app/package-info.java
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+@org.osgi.annotation.bundle.Export
+package org.apache.karaf.examples.jaas.app;
\ No newline at end of file
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 64ca82a..55933a0 100644
--- a/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml
+++ b/examples/karaf-jdbc-example/karaf-jdbc-example-api/pom.xml
@@ -32,16 +32,19 @@
<name>Apache Karaf :: Examples :: JDBC :: API</name>
<packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Export-Package>org.apache.karaf.examples.jdbc.api</Export-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-jdbc-example/karaf-jdbc-example-api/src/main/java/org/apache/karaf/examples/jdbc/api/package-info.java
b/examples/karaf-jdbc-example/karaf-jdbc-example-api/src/main/java/org/apache/karaf/examples/jdbc/api/package-info.java
new file mode 100644
index 0000000..7fce303
--- /dev/null
+++
b/examples/karaf-jdbc-example/karaf-jdbc-example-api/src/main/java/org/apache/karaf/examples/jdbc/api/package-info.java
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+@org.osgi.annotation.bundle.Export
+package org.apache.karaf.examples.jdbc.api;
\ No newline at end of file
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 ee19779..4f90dd7 100644
--- a/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml
+++ b/examples/karaf-jdbc-example/karaf-jdbc-example-provider/pom.xml
@@ -45,12 +45,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
</dependencies>
@@ -59,16 +59,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Private-Package>
- org.apache.karaf.examples.jdbc.provider,
- org.apache.karaf.util.tracker,
- org.apache.karaf.util.tracker.annotation
- </Private-Package>
- <Import-Package>*</Import-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
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 b77a3a6..9416030 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
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
</dependencies>
@@ -49,14 +49,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>
- org.ops4j.pax.logging*;version="[1,3)",
- *
- </Import-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
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 6d958b5..5666c22 100644
--- a/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml
+++ b/examples/karaf-mbean-example/karaf-mbean-example-api/pom.xml
@@ -32,18 +32,19 @@
<name>Apache Karaf :: Examples :: MBean :: API</name>
<packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.karaf.examples.mbean.api
- </Export-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-mbean-example/karaf-mbean-example-api/src/main/java/org/apache/karaf/examples/mbean/api/package-info.java
b/examples/karaf-mbean-example/karaf-mbean-example-api/src/main/java/org/apache/karaf/examples/mbean/api/package-info.java
new file mode 100644
index 0000000..002d1ce
--- /dev/null
+++
b/examples/karaf-mbean-example/karaf-mbean-example-api/src/main/java/org/apache/karaf/examples/mbean/api/package-info.java
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+@org.osgi.annotation.bundle.Export
+package org.apache.karaf.examples.mbean.api;
\ No newline at end of file
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 275a110..bc5bb0c 100644
--- a/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml
+++ b/examples/karaf-mbean-example/karaf-mbean-example-provider/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
</dependencies>
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 77db6c4..1079d31 100644
--- a/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml
+++ b/examples/karaf-mbean-example/karaf-mbean-example-simple/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
</dependencies>
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 5f56bf0..8cdbb27 100644
--- a/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml
+++ b/examples/karaf-scheduler-example/karaf-scheduler-example-runnable/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
</dependencies>
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 9ec4fa0..ab00fd8 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml
@@ -41,12 +41,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
</dependency>
</dependencies>
@@ -55,14 +60,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Bundle-Activator>org.apache.karaf.examples.servlet.registration.Activator</Bundle-Activator>
- <Private-Package>
- org.apache.karaf.examples.servlet.registration
- </Private-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-servlet-example/karaf-servlet-example-registration/src/main/java/org/apache/karaf/examples/servlet/registration/Activator.java
b/examples/karaf-servlet-example/karaf-servlet-example-registration/src/main/java/org/apache/karaf/examples/servlet/registration/Activator.java
index b3b1372..3705d46 100644
---
a/examples/karaf-servlet-example/karaf-servlet-example-registration/src/main/java/org/apache/karaf/examples/servlet/registration/Activator.java
+++
b/examples/karaf-servlet-example/karaf-servlet-example-registration/src/main/java/org/apache/karaf/examples/servlet/registration/Activator.java
@@ -16,12 +16,15 @@
*/
package org.apache.karaf.examples.servlet.registration;
+import org.osgi.annotation.bundle.Header;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.http.HttpService;
import org.osgi.util.tracker.ServiceTracker;
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
private ServiceTracker httpServiceTracker;
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 aac057d..67653cb 100644
--- a/examples/karaf-soap-example/karaf-soap-example-api/pom.xml
+++ b/examples/karaf-soap-example/karaf-soap-example-api/pom.xml
@@ -32,16 +32,19 @@
<name>Apache Karaf :: Examples :: SOAP :: API</name>
<packaging>bundle</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>7.0.0</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Export-Package>org.apache.karaf.examples.soap.api</Export-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/examples/karaf-soap-example/karaf-soap-example-api/src/main/java/org/apache/karaf/examples/soap/api/package-info.java
b/examples/karaf-soap-example/karaf-soap-example-api/src/main/java/org/apache/karaf/examples/soap/api/package-info.java
new file mode 100644
index 0000000..db375bb
--- /dev/null
+++
b/examples/karaf-soap-example/karaf-soap-example-api/src/main/java/org/apache/karaf/examples/soap/api/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+@org.osgi.annotation.bundle.Export
+package org.apache.karaf.examples.soap.api;
\ No newline at end of file
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 f9dcc23..ccb2161 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
@@ -36,13 +36,22 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
