Author: jbonofre
Date: Wed May 29 12:22:47 2013
New Revision: 1487450
URL: http://svn.apache.org/r1487450
Log:
[KARAF-2297] WebConsole exports org.json and plugins use it
Modified:
karaf/trunk/pom.xml
karaf/trunk/webconsole/console/pom.xml
karaf/trunk/webconsole/features/pom.xml
karaf/trunk/webconsole/gogo/pom.xml
karaf/trunk/webconsole/http/pom.xml
karaf/trunk/webconsole/instance/pom.xml
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1487450&r1=1487449&r2=1487450&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed May 29 12:22:47 2013
@@ -202,6 +202,7 @@
<mina.version>2.0.7</mina.version>
<osgi.version>5.0.0</osgi.version>
<osgi.compendium.version>4.3.1</osgi.compendium.version>
+ <org.json.version>20070829</org.json.version>
<pax.exam.version>2.6.0</pax.exam.version>
<pax.logging.version>1.7.0</pax.logging.version>
<pax.runner.version>1.7.6</pax.runner.version>
@@ -741,6 +742,12 @@
</dependency>
<dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${org.json.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
Modified: karaf/trunk/webconsole/console/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/webconsole/console/pom.xml?rev=1487450&r1=1487449&r2=1487450&view=diff
==============================================================================
--- karaf/trunk/webconsole/console/pom.xml (original)
+++ karaf/trunk/webconsole/console/pom.xml Wed May 29 12:22:47 2013
@@ -35,6 +35,7 @@
<properties>
<appendedResourcesDirectory>${project.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,
@@ -155,9 +156,6 @@
org.osgi.compendium;
inline=org/osgi/util/tracker/*,
- <!-- Required for JSON data transfer -->
- json,
-
<!-- File Upload -->
commons-fileupload,
Modified: karaf/trunk/webconsole/features/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/pom.xml?rev=1487450&r1=1487449&r2=1487450&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Wed May 29 12:22:47 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,16 +104,12 @@
<instructions>
<Import-Package>
org.apache.aries.blueprint,
- org.apache.felix.webconsole*;version="[3,5)",
+
org.apache.felix.webconsole*;version="[3,5)",
+ org.json,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
*
</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/trunk/webconsole/gogo/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=1487450&r1=1487449&r2=1487450&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Wed May 29 12:22:47 2013
@@ -90,8 +90,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20070829</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
@@ -121,16 +120,12 @@
<Import-Package>
jline;version="[${jline.version},
${jline.version}]",
org.apache.aries.blueprint,
- org.apache.felix.webconsole*;version="[3,5)",
+
org.apache.felix.webconsole*;version="[3,5)",
+ org.json,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
*
</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/trunk/webconsole/http/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/webconsole/http/pom.xml?rev=1487450&r1=1487449&r2=1487450&view=diff
==============================================================================
--- karaf/trunk/webconsole/http/pom.xml (original)
+++ karaf/trunk/webconsole/http/pom.xml Wed May 29 12:22:47 2013
@@ -80,8 +80,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20070829</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
@@ -110,16 +109,12 @@
<instructions>
<Import-Package>
org.apache.aries.blueprint,
- org.apache.felix.webconsole*;version="[3,5)",
+
org.apache.felix.webconsole*;version="[3,5)",
+ org.json,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
*
</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/trunk/webconsole/instance/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/pom.xml?rev=1487450&r1=1487449&r2=1487450&view=diff
==============================================================================
--- karaf/trunk/webconsole/instance/pom.xml (original)
+++ karaf/trunk/webconsole/instance/pom.xml Wed May 29 12:22:47 2013
@@ -71,8 +71,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20070829</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -110,15 +109,11 @@
<Import-Package>
org.apache.aries.blueprint,
org.apache.felix.webconsole*;version="[3,5)",
+ org.json,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
*
</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>
