svn commit: r423136 - in /incubator/abdera/java/trunk: build/build.xml dependencies/json/pom.xml extensions/pom.xml pom.xml

[jm...@apache.org]

Author: jmsnell
Date: Tue Jul 18 10:02:40 2006
New Revision: 423136

URL: http://svn.apache.org/viewvc?rev=423136&view=rev
Log:
>From Stephen Duncan...

Fixed build to provide JSON as a dependency for the Extensions module
to build.  Also added a 1.0 version to the Ant build to match the
Maven build.

* pom.xml: Added JSON as a module to be built.
* build/build.xml: Added JSON version property and added it to JSON jar name.
* extensions/pom.xml: Added JSON dependcncy.
* dependencies/json: Added svn:ignore properties for Eclipse and Maven files.
* dependencies/json/pom.xml: Added POM for Maven build of JSON. 

Added:
    incubator/abdera/java/trunk/dependencies/json/pom.xml
Modified:
    incubator/abdera/java/trunk/build/build.xml
    incubator/abdera/java/trunk/extensions/pom.xml
    incubator/abdera/java/trunk/pom.xml

Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=423136&r1=423135&r2=423136&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Tue Jul 18 10:02:40 2006
@@ -54,8 +54,9 @@
   <property name="json.src" value="${dependencies}/json/src" />
   <property name="json.src.java"
             value="${json.src}/main/java" />
+  <property name="json.version" value="1.0" />
 
-  <property name="json.jar" value="${dependencies}/json.jar" />
+  <property name="json.jar" value="${dependencies}/json-${json.version}.jar" />
 
   <property file="${dependencies}/deps.properties" />
   

Added: incubator/abdera/java/trunk/dependencies/json/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/json/pom.xml?rev=423136&view=auto
==============================================================================
--- incubator/abdera/java/trunk/dependencies/json/pom.xml (added)
+++ incubator/abdera/java/trunk/dependencies/json/pom.xml Tue Jul 18 10:02:40 2006
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project 
+  xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.abdera</groupId>
+  <artifactId>json</artifactId>
+  <packaging>jar</packaging>
+  <name>JSON (From Abdera)</name>
+  <url>http://incubator.apache.org/projects/abdera.html</url>
+  <version>1.0</version>
+  <description>Abdera-Hosted JSON with Apache License.</description>
+  <inceptionYear>2006</inceptionYear>
+</project>

Modified: incubator/abdera/java/trunk/extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/pom.xml?rev=423136&r1=423135&r2=423136&view=diff
==============================================================================
--- incubator/abdera/java/trunk/extensions/pom.xml (original)
+++ incubator/abdera/java/trunk/extensions/pom.xml Tue Jul 18 10:02:40 2006
@@ -29,6 +29,12 @@
       <scope>compile</scope>
     </dependency>   
     <dependency>
+      <groupId>org.apache.abdera</groupId>
+      <artifactId>json</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+    </dependency>   
+    <dependency>
       <groupId>ws-commons</groupId>
       <artifactId>axiom-api</artifactId>
     </dependency>

Modified: incubator/abdera/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/pom.xml?rev=423136&r1=423135&r2=423136&view=diff
==============================================================================
--- incubator/abdera/java/trunk/pom.xml (original)
+++ incubator/abdera/java/trunk/pom.xml Tue Jul 18 10:02:40 2006
@@ -135,6 +135,7 @@
   </dependencyManagement>
   
   <modules>
+    <module>dependencies/json</module>
     <module>core</module>
     <module>parser</module>
     <module>security</module>