Author: gk
Date: Tue Jun 27 07:06:47 2017
New Revision: 1800024
URL: http://svn.apache.org/viewvc?rev=1800024&view=rev
Log:
- update pom and changes
Modified:
turbine/fulcrum/trunk/json/ (props changed)
turbine/fulcrum/trunk/json/pom.xml
turbine/fulcrum/trunk/json/src/changes/changes.xml
Propchange: turbine/fulcrum/trunk/json/
------------------------------------------------------------------------------
--- svn:global-ignores (added)
+++ svn:global-ignores Tue Jun 27 07:06:47 2017
@@ -0,0 +1 @@
+*.iml
Modified: turbine/fulcrum/trunk/json/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1800024&r1=1800023&r2=1800024&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Tue Jun 27 07:06:47 2017
@@ -131,7 +131,7 @@
<artifactId>maven-site-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
+ <phase>package</phase>
<goals>
<goal>site</goal>
</goals>
@@ -147,8 +147,7 @@
<turbine.site.path>fulcrum/fulcrum-json</turbine.site.path>
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/json</turbine.scmPubCheckoutDirectory>
<turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache>
-
<siteContent.path>${project.build.directory}/staging</siteContent.path><!--
default stagingSiteURL -->
- <gpg.useagent>false</gpg.useagent> <!-- windows problem -->
+
<siteContent.path>${project.build.directory}/staging</siteContent.path><!--
default stagingSiteURL -->
</properties>
</project>
Modified: turbine/fulcrum/trunk/json/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/src/changes/changes.xml?rev=1800024&r1=1800023&r2=1800024&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/json/src/changes/changes.xml Tue Jun 27 07:06:47 2017
@@ -26,10 +26,10 @@
<body>
<release version="1.1.1" date="in SVN">
<action type="update" dev="gk">
- Gson: Update to version 2.6.1, add support for JsonPath, Bugfix in
date formatting and array serial/deserial test
+ Gson: Update to version 2.6.1, add support for JsonPath, Bugfix in
date formatting and array serial/deserial test, use JUnit 4
</action>
<action type="update" dev="gk">
- Jackson 2: Update to version 2.7.7, add support for JsonPath
+ Jackson 2: Update to version 2.7.9, add support for JsonPath, Datatype
json-org version 2.6.6, which is Java 6 compatible
</action>
</release>
<release version="1.1.0" date="2015-06-22">
