Author: jbonofre
Date: Wed May 29 13:42:53 2013
New Revision: 1487483
URL: http://svn.apache.org/r1487483
Log:
[KARAF-2297] WebConsole exports org.json and plugins use it
Modified:
karaf/branches/karaf-2.2.x/pom.xml
karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml
karaf/branches/karaf-2.2.x/webconsole/console/pom.xml
karaf/branches/karaf-2.2.x/webconsole/features/pom.xml
karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1487483&r1=1487482&r2=1487483&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Wed May 29 13:42:53 2013
@@ -156,6 +156,7 @@
<maven.version>2.0.9</maven.version>
<mina.version>2.0.5</mina.version>
<osgi.version>4.2.0</osgi.version>
+ <org.json.version>20070829</org.json.version>
<pax.exam.version>1.2.4</pax.exam.version>
<pax.logging.version>1.6.10</pax.logging.version>
<pax.runner.version>1.6.2</pax.runner.version>
@@ -597,6 +598,11 @@
<version>${maven.version}</version>
</dependency>
<dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${org.json.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
Modified: karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml?rev=1487483&r1=1487482&r2=1487483&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml Wed May 29 13:42:53 2013
@@ -77,8 +77,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20070829</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -115,13 +114,9 @@
<instructions>
<Import-Package>
org.apache.karaf.admin;resolution:=optional,
+ org.json,
*
</Import-Package>
- <Embed-Dependency>
- <!-- Required for JSON data transfer -->
- <!-- TODO: this needs to be put in a common place
for reuse. -->
- json
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.2.x/webconsole/console/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/console/pom.xml?rev=1487483&r1=1487482&r2=1487483&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/console/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/console/pom.xml Wed May 29 13:42:53
2013
@@ -35,6 +35,7 @@
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+
<org.json.version.osgi>0.0.0.${org.json.version}</org.json.version.osgi>
</properties>
<dependencies>
@@ -77,7 +78,6 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20070829</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -120,7 +120,8 @@
org.apache.felix.webconsole.internal.KarafOsgiManagerActivator
</Bundle-Activator>
<Export-Package>
- org.apache.felix.webconsole
+ org.apache.felix.webconsole,
+ org.json;version="${org.json.version.osgi}"
</Export-Package>
<Private-Package>
!org.apache.felix.webconsole,
@@ -151,9 +152,6 @@
org.osgi.compendium;
inline=org/osgi/util/tracker/*,
- <!-- Required for JSON data transfer -->
- json,
-
<!-- File Upload functionality -->
commons-fileupload,
Modified: karaf/branches/karaf-2.2.x/webconsole/features/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/features/pom.xml?rev=1487483&r1=1487482&r2=1487483&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/features/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/features/pom.xml Wed May 29 13:42:53
2013
@@ -70,8 +70,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20070829</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
@@ -99,13 +98,9 @@
<configuration>
<instructions>
<Import-Package>
+ org.json,
*
</Import-Package>
- <Embed-Dependency>
- <!-- Required for JSON data transfer -->
- <!-- TODO: this needs to be put in a common place
for reuse. -->
- json
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml?rev=1487483&r1=1487482&r2=1487483&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml Wed May 29 13:42:53 2013
@@ -75,8 +75,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20070829</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
@@ -105,13 +104,9 @@
<instructions>
<Import-Package>
jline;version="[${jline.version},
${jline.version}]",
+ org.json,
*
</Import-Package>
- <Embed-Dependency>
- <!-- Required for JSON data transfer -->
- <!-- TODO: this needs to be put in a common place
for reuse. -->
- json
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
