remove json-2.0.jar from dependencies

Signed-off-by: Ryosuke Okada <[email protected]>
eclipse-ee4j · Dec 19, 2024 · 2e10ed7 · 2e10ed7
1 parent 6f90816
commit 2e10ed7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/appserver/admingui/war/pom.xml b/appserver/admingui/war/pom.xml
@@ -77,11 +77,6 @@
             <artifactId>dojo-ajax-nodemo</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.sun.woodstock.dependlibs</groupId>
-            <artifactId>json</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.sun.woodstock.dependlibs</groupId>
             <artifactId>prototype</artifactId>
@@ -131,7 +126,7 @@
                             <outputDirectory>${dependencies.extra.directory}</outputDirectory>
                             <includeArtifactIds>
                                 commons-io,
-                                dojo-ajax-nodemo,json,prototype,
+                                dojo-ajax-nodemo,prototype,
                                 woodstock-webui-jsf,woodstock-webui-jsf-suntheme
                             </includeArtifactIds>
                             <includeScope>provided</includeScope>

diff --git a/appserver/admingui/war/src/main/webapp/WEB-INF/sun-web.xml b/appserver/admingui/war/src/main/webapp/WEB-INF/sun-web.xml
@@ -37,5 +37,5 @@
     </locale-charset-info>
     <class-loader
         delegate="true"
-        extra-class-path="WEB-INF/extra/woodstock-webui-jsf-suntheme-${woodstock.version}.jar:WEB-INF/extra/dojo-ajax-nodemo-${woodstock-dojo-ajax-nodemo.version}.jar:WEB-INF/extra/woodstock-webui-jsf-${woodstock.version}.jar:WEB-INF/extra/json-${woodstock-json.version}.jar:WEB-INF/extra/prototype-${woodstock-prototype.version}.jar:WEB-INF/extra/commons-io-${commons-io.version}.jar" />
+        extra-class-path="WEB-INF/extra/woodstock-webui-jsf-suntheme-${woodstock.version}.jar:WEB-INF/extra/dojo-ajax-nodemo-${woodstock-dojo-ajax-nodemo.version}.jar:WEB-INF/extra/woodstock-webui-jsf-${woodstock.version}.jar:WEB-INF/extra/prototype-${woodstock-prototype.version}.jar:WEB-INF/extra/commons-io-${commons-io.version}.jar" />
 </sun-web-app>
diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -168,7 +168,6 @@
         <woodstock.version>6.0.1</woodstock.version>
         <woodstock-dataprovider.version>1.0</woodstock-dataprovider.version>
         <woodstock-dojo-ajax-nodemo.version>1.12.4</woodstock-dojo-ajax-nodemo.version>
-        <woodstock-json.version>2.0</woodstock-json.version>
         <woodstock-prototype.version>1.7.3</woodstock-prototype.version>
 
         <!-- Other -->