Permalink
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...
1 parent 25a4b68 commit 24f92d9b287a5154478a1e611cd87780fe88968c @cschneider cschneider committed Nov 20, 2012
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
@@ -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
@@ -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
@@ -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>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -45,7 +45,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.osgi</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
@@ -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>
@@ -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
@@ -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
@@ -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
@@ -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>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
@@ -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
@@ -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
@@ -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>
Oops, something went wrong.

0 comments on commit 24f92d9

Please sign in to comment.