You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2019/01/16 02:12:09 UTC
[brooklyn-server] 29/49: remove json-simple;
our yaml code will do what it did
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit ba31401f9b6eb89f8d57fb150fd3f4d93f5db0f8
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Jan 9 10:08:45 2019 +0000
remove json-simple; our yaml code will do what it did
---
karaf/features/src/main/feature/feature.xml | 1 -
launcher/pom.xml | 12 ------------
pom.xml | 1 -
rest/rest-resources/pom.xml | 6 ------
rest/rest-server/pom.xml | 12 ------------
5 files changed, 32 deletions(-)
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 4dd6469..42cf4e4 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -213,7 +213,6 @@
<!-- should be deps of jax-rs-2.0 rest-api project -->
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/${javax-servlet.version}</bundle>
<bundle dependency="true">mvn:javax.ws.rs/javax.ws.rs-api/${jax-rs-api.version}</bundle>
- <bundle dependency="true">wrap:mvn:com.googlecode.json-simple/json-simple/${json-simple.version}</bundle>
<config name="org.apache.cxf.osgi">
org.apache.cxf.servlet.context = /v1
diff --git a/launcher/pom.xml b/launcher/pom.xml
index 23d6d76..a18827e 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -213,18 +213,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 1fe3436..0aa847f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,6 @@
<winrm4j.version>0.5.0</winrm4j.version>
<felix-osgi-compendium.version>1.4.0</felix-osgi-compendium.version>
<kubernetes-client.version>1.4.27</kubernetes-client.version>
- <json-simple.version>1.1</json-simple.version>
<!-- Dependencies shipped with vanilla karaf; update these when we update the karaf version -->
<karaf.version>4.2.1</karaf.version>
diff --git a/rest/rest-resources/pom.xml b/rest/rest-resources/pom.xml
index 09cf4f9..17effa1 100644
--- a/rest/rest-resources/pom.xml
+++ b/rest/rest-resources/pom.xml
@@ -199,12 +199,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>${json-simple.version}</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
diff --git a/rest/rest-server/pom.xml b/rest/rest-server/pom.xml
index aa97e00..fca9be4 100644
--- a/rest/rest-server/pom.xml
+++ b/rest/rest-server/pom.xml
@@ -209,18 +209,6 @@
<artifactId>cxf-rt-rs-client</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>