Permalink
Browse files

Release 2.4

  • Loading branch information...
1 parent e4c1a52 commit a45916508dcfe4fe048e2eac10573a4a20ed6a9a @aalmiray committed Dec 14, 2010
Showing with 12 additions and 40 deletions.
  1. +1 −1 deploy.sh
  2. +4 −4 pom.xml
  3. +3 −5 src/changes/changes.xml
  4. +0 −1 src/site/site.xml
  5. +4 −4 src/site/xdoc/index.xml
  6. +0 −25 src/site/xdoc/jruby.xml
View
@@ -1,5 +1,5 @@
#!/bin/sh
-VERSION="2.3"
+VERSION="2.4"
GROUPID="net.sf.json-lib"
ARTIFACTID="json-lib"
REPO_URL="scp://ssh.sf.net/home/groups/j/js/json-lib/htdocs/m2/repo/release"
View
@@ -36,11 +36,11 @@
<scm>
<connection>
- scm:cvs:pserver:anonymous@json-lib.cvs.sourceforge.net:/cvsroot/json-lib:json-lib
+ git://github.com/aalmiray/Json-lib.git
</connection>
- <url>http://json-lib.cvs.sourceforge.net/json-lib</url>
+ <url>git://github.com/aalmiray/Json-lib.git</url>
<developerConnection>
- scm:cvs:ext:${maven.username}@json-lib.cvs.sourceforge.net:/cvsroot/json-lib:json-lib
+ git@github.com:aalmiray/Json-lib.git
</developerConnection>
</scm>
<issueManagement>
@@ -247,7 +247,7 @@
</dependencies>
<prerequisites>
- <maven>2.1.0</maven>
+ <maven>3.0.1</maven>
</prerequisites>
<build>
View
@@ -10,8 +10,8 @@
<release
version="2.4"
- date="N/A"
- desc="In development">
+ date="2010-12-14"
+ desc="Service release">
<action
dev="Andres Almiray"
type="fix"
@@ -1261,9 +1261,7 @@
<action
dev="Andres Almiray"
type="update">
- Updated the XML generated by XMLSerializer
- <br />
- JSONArray uses &lt;a&gt; for root element, JSONObject uses
+ Updated the XML generated by XMLSerializer. JSONArray uses &lt;a&gt; for root element, JSONObject uses
&lt;o&gt; for root element
</action>
<action
View
@@ -28,7 +28,6 @@
<item name="Advanced features" href="advanced.html" />
<item name="Snippets" href="snippets.html" />
<item name="Groovy integration" href="groovy.html" />
- <item name="JRuby integration" href="jruby.html" />
<item name="Build instructions" href="package.html" />
<item name="Who is using it?" href="users.html" />
<item name="FAQ" href="faq.html" />
View
@@ -57,13 +57,13 @@
</p>
<p>Json-lib requires (at least) the following dependencies in your classpath:
<ul>
- <li>jakarta commons-lang 2.4</li>
- <li>jakarta commons-beanutils 1.7.0</li>
- <li>jakarta commons-collections 3.2</li>
+ <li>jakarta commons-lang 2.5</li>
+ <li>jakarta commons-beanutils 1.8.0</li>
+ <li>jakarta commons-collections 3.2.1</li>
<li>jakarta commons-logging 1.1.1</li>
<li>ezmorph 1.0.6</li>
</ul>
- Other dependencies are needed if working with XML, Groovy and JRuby. Please review the
+ Other dependencies are needed if working with XML andGroovy. Please review the
<a href="http://json-lib.sourceforge.net/dependencies.html">Dependencies report</a> to know more about
those extra dependencies.
</p>
View
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-
- <properties>
- <title>Json-lib::JRuby integration</title>
- </properties>
-
- <body>
- <section name="Using Json-lib with JRuby">
- <p><center><a href="http://jruby.codehaus.org"><img src="images/logos/jruby-logo.png"/></a></center></p>
- <p>Since version 2.0 Json-lib has integrated <a href="http://jruby.codehaus.org">JRuby</a> support, meaning that you can take advantge of the library's Java and XML support. There are other features as well:<ul>
-<li>JSONObject supports the leftShift (&lt;&lt;) operator to append values, the following rules apply:<ul>
-<li>If the shifted arg is a Map, it will call putAll() on the object.</li>
-<li>If the shifted arg is a List and its size == 2, the first element will be the key, and the second will be the value.</li>
-<li>If the shifted arg is a List and its size > 2, the first element will be the key, the arg will be shifted by 1 and passed as the value (will create a JSONArray because it is a List).</li>
-<li>Any other type will be discarded, the object will not be affected nor an exception will be thrown.</li>
-</ul></li>
-<li>JSONObject and JSONarray implement java.util.Comparable, which enables the use of the comparison operators with them.</li>
-<li>JSONObject implements java.util.Map and JSONArray implements java.util.List, anything you can do with Maps and List can be done with JSONObject and JSONArray.</li>
-<li>JSONObject.empty? and JSONArray.empty? provide rubylicious shortcuts to isEmpty().</li>
- </ul>
- </p>
- </section>
- </body>
-</document>

0 comments on commit a459165

Please sign in to comment.