[[[
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.
]]]
--
Stephen Duncan Jr
www.stephenduncanjr.com
Index: java/trunk/build/build.xml
===================================================================
--- java/trunk/build/build.xml (revision 422811)
+++ java/trunk/build/build.xml (working copy)
@@ -53,9 +53,10 @@
<property name="dependencies.work" value="${dependencies}/work" />
<property name="json.src" value="${dependencies}/json/src" />
<property name="json.src.java"
- value="${json.src}/main/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" />
Index: java/trunk/extensions/pom.xml
===================================================================
--- java/trunk/extensions/pom.xml (revision 422269)
+++ java/trunk/extensions/pom.xml (working copy)
@@ -27,6 +27,12 @@
<artifactId>abdera-parser</artifactId>
<version>0.1.0-incubating-SNAPSHOT</version>
<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>
Property changes on: java\trunk\dependencies\json
___________________________________________________________________
Name: svn:ignore
+
target
.classpath
.project
.settings
Index: java/trunk/dependencies/json/pom.xml
===================================================================
--- java/trunk/dependencies/json/pom.xml (revision 0)
+++ java/trunk/dependencies/json/pom.xml (revision 0)
@@ -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>
Index: java/trunk/pom.xml
===================================================================
--- java/trunk/pom.xml (revision 422269)
+++ java/trunk/pom.xml (working copy)
@@ -134,7 +134,8 @@
</dependencies>
</dependencyManagement>
- <modules>
+ <modules>
+ <module>dependencies/json</module>
<module>core</module>
<module>parser</module>
<module>security</module>
