Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

KARAF-1977 Upgrade trunk to osgi 4.3.1 to fix jdk 7 issues

git-svn-id: https://svn.apache.org/repos/asf/karaf/trunk@1411688 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 24f92d9b287a5154478a1e611cd87780fe88968c 1 parent 25a4b68
@cschneider cschneider authored
Showing with 179 additions and 178 deletions.
  1. +1 −1  assemblies/features/framework/pom.xml
  2. +1 −1  bundle/command/pom.xml
  3. +2 −2 bundle/core/pom.xml
  4. +1 −1  bundle/springstate/pom.xml
  5. +2 −2 config/command/pom.xml
  6. +2 −2 config/core/pom.xml
  7. +1 −1  demos/command/pom.xml
  8. +1 −1  demos/web/pom.xml
  9. +1 −1  deployer/blueprint/pom.xml
  10. +1 −1  deployer/features/pom.xml
  11. +1 −1  deployer/kar/pom.xml
  12. +1 −1  deployer/spring/pom.xml
  13. +1 −1  deployer/wrap/pom.xml
  14. +2 −2 diagnostic/command/pom.xml
  15. +2 −2 diagnostic/core/pom.xml
  16. +2 −2 features/command/pom.xml
  17. +2 −2 features/core/pom.xml
  18. +1 −1  features/obr/pom.xml
  19. +1 −1  http/command/pom.xml
  20. +1 −1  http/core/pom.xml
  21. +2 −2 instance/command/pom.xml
  22. +1 −1  instance/core/pom.xml
  23. +1 −1  jaas/boot/pom.xml
  24. +1 −1  jaas/command/pom.xml
  25. +1 −1  jaas/config/pom.xml
  26. +2 −2 jaas/modules/pom.xml
  27. +1 −1  kar/command/pom.xml
  28. +2 −2 kar/core/pom.xml
  29. +2 −2 log/command/pom.xml
  30. +2 −2 log/core/pom.xml
  31. +1 −1  main/pom.xml
  32. +2 −2 management/server/pom.xml
  33. +1 −1  obr/command/pom.xml
  34. +1 −1  obr/core/pom.xml
  35. +1 −1  package/command/pom.xml
  36. +1 −1  package/core/pom.xml
  37. +1 −1  region/command/pom.xml
  38. +1 −1  region/core/pom.xml
  39. +2 −2 region/persist/pom.xml
  40. +1 −1  region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd
  41. +1 −1  scheduler/core/pom.xml
  42. +2 −2 scr/examples/pom.xml
  43. +1 −1  scr/management/pom.xml
  44. +41 −41 scr/pom.xml
  45. +2 −2 service/command/pom.xml
  46. +1 −1  service/core/pom.xml
  47. +2 −2 shell/commands/pom.xml
  48. +2 −2 shell/console/pom.xml
  49. +2 −2 shell/help/pom.xml
  50. +2 −2 shell/ssh/pom.xml
  51. +1 −1  system/command/pom.xml
  52. +1 −1  system/core/pom.xml
  53. +2 −2 tooling/exam/container/pom.xml
  54. +48 −48 tooling/karaf-maven-plugin/NOTICE
  55. +2 −1  tooling/karaf-maven-plugin/pom.xml
  56. +1 −1  util/pom.xml
  57. +2 −2 web/command/pom.xml
  58. +1 −1  web/core/pom.xml
  59. +2 −2 webconsole/console/pom.xml
  60. +2 −2 webconsole/features/pom.xml
  61. +2 −2 webconsole/gogo/pom.xml
  62. +2 −2 webconsole/http/pom.xml
  63. +2 −2 webconsole/instance/pom.xml
  64. +1 −1  wrapper/core/pom.xml
View
2  assemblies/features/framework/pom.xml
@@ -289,7 +289,7 @@
<destFileName>karaf.jar</destFileName>
</artifactItem>
<artifactItem>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<outputDirectory>target/classes/resources/lib</outputDirectory>
<destFileName>karaf-org.osgi.core.jar</destFileName>
View
2  bundle/command/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 bundle/core/pom.xml
@@ -46,12 +46,12 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
2  bundle/springstate/pom.xml
@@ -47,7 +47,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 config/command/pom.xml
@@ -54,13 +54,13 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
4 config/core/pom.xml
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
2  demos/command/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  demos/web/pom.xml
@@ -45,7 +45,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
View
2  deployer/blueprint/pom.xml
@@ -55,7 +55,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  deployer/features/pom.xml
@@ -49,7 +49,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  deployer/kar/pom.xml
@@ -49,7 +49,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  deployer/spring/pom.xml
@@ -54,7 +54,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  deployer/wrap/pom.xml
@@ -44,7 +44,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 diagnostic/command/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -51,7 +51,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
4 diagnostic/core/pom.xml
@@ -39,13 +39,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
4 features/command/pom.xml
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
4 features/core/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -49,7 +49,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
<optional>true</optional>
View
2  features/obr/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  http/command/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  http/core/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 instance/command/pom.xml
@@ -44,7 +44,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -56,7 +56,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
2  instance/core/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  jaas/boot/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  jaas/command/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  jaas/config/pom.xml
@@ -54,7 +54,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 jaas/modules/pom.xml
@@ -61,13 +61,13 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
2  kar/command/pom.xml
@@ -57,7 +57,7 @@
<artifactId>org.apache.karaf.shell.table</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
</dependencies>
View
4 kar/core/pom.xml
@@ -43,12 +43,12 @@
<artifactId>org.apache.felix.utils</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
4 log/command/pom.xml
@@ -54,13 +54,13 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
4 log/core/pom.xml
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
2  main/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 management/server/pom.xml
@@ -40,12 +40,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
2  obr/command/pom.xml
@@ -56,7 +56,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  obr/core/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  package/command/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  package/core/pom.xml
@@ -46,7 +46,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  region/command/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  region/core/pom.xml
@@ -60,7 +60,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 region/persist/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -56,7 +56,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
2  region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd
@@ -18,7 +18,7 @@
under the License.
-->
-<!-- $Rev: 699828 $ $Date: 2008-09-28 16:35:27 +0200 (Sun, 28 Sep 2008) $ -->
+<!-- $Rev$ $Date$ -->
<xsd:schema xmlns="http://karaf.apache.org/xmlns/region/v1.0.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
View
2  scheduler/core/pom.xml
@@ -68,7 +68,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 scr/examples/pom.xml
@@ -47,11 +47,11 @@
<artifactId>bndlib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
</dependencies>
View
2  scr/management/pom.xml
@@ -44,7 +44,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
82 scr/pom.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.karaf.scr</groupId>
- <artifactId>scr</artifactId>
- <packaging>pom</packaging>
- <name>Apache Karaf :: Declarative Services (DS)</name>
-
- <modules>
- <module>command</module>
- <module>management</module>
- <module>examples</module>
- </modules>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.karaf.scr</groupId>
+ <artifactId>scr</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: Declarative Services (DS)</name>
+
+ <modules>
+ <module>command</module>
+ <module>management</module>
+ <module>examples</module>
+ </modules>
+
</project>
View
4 service/command/pom.xml
@@ -56,12 +56,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
2  service/core/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 shell/commands/pom.xml
@@ -59,12 +59,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 shell/console/pom.xml
@@ -48,12 +48,12 @@
<artifactId>jline</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
4 shell/help/pom.xml
@@ -62,12 +62,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 shell/ssh/pom.xml
@@ -50,13 +50,13 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
2  system/command/pom.xml
@@ -56,7 +56,7 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
2  system/core/pom.xml
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 tooling/exam/container/pom.xml
@@ -37,11 +37,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
96 tooling/karaf-maven-plugin/NOTICE
@@ -1,48 +1,48 @@
-Apache Karaf
-Copyright 2010-2012 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software written by
-Antony Lesuisse.
-Licensed under Public Domain.
-
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
-Licensed under the Apache License 2.0.
-
-This product 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
-Tanuki Software (http://www.tanukisoftware.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-JLine (http://jline.sourceforge.net).
-Licensed under the BSD License.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-This product includes software from http://www.json.org.
-Copyright (c) 2002 JSON.org
-
-
-III. License Summary
-- Apache License 2.0
+Apache Karaf
+Copyright 2010-2012 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product 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
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0
View
3  tooling/karaf-maven-plugin/pom.xml
@@ -146,8 +146,9 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
View
2  util/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 web/command/pom.xml
@@ -58,12 +58,12 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
2  web/core/pom.xml
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
View
4 webconsole/console/pom.xml
@@ -43,11 +43,11 @@
<artifactId>${servlet.spec.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
View
4 webconsole/features/pom.xml
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
4 webconsole/gogo/pom.xml
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
4 webconsole/http/pom.xml
@@ -39,12 +39,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
4 webconsole/instance/pom.xml
@@ -44,12 +44,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
View
2  wrapper/core/pom.xml
@@ -42,7 +42,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
Please sign in to comment.
Something went wrong with that request. Please try again.