You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2017/07/03 06:18:52 UTC
svn commit: r1800591 - in /turbine/fulcrum/trunk/json: api/pom.xml
dist/pom.xml gson/pom.xml jackson/pom.xml jackson2/pom.xml
jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentTest.java
pom.xml
Author: gk
Date: Mon Jul 3 06:18:52 2017
New Revision: 1800591
URL: http://svn.apache.org/viewvc?rev=1800591&view=rev
Log:
- reverted release prepare and included missing Apache Licence in test
Modified:
turbine/fulcrum/trunk/json/api/pom.xml
turbine/fulcrum/trunk/json/dist/pom.xml
turbine/fulcrum/trunk/json/gson/pom.xml
turbine/fulcrum/trunk/json/jackson/pom.xml
turbine/fulcrum/trunk/json/jackson2/pom.xml
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentTest.java
turbine/fulcrum/trunk/json/pom.xml
Modified: turbine/fulcrum/trunk/json/api/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/api/pom.xml?rev=1800591&r1=1800590&r2=1800591&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/api/pom.xml (original)
+++ turbine/fulcrum/trunk/json/api/pom.xml Mon Jul 3 06:18:52 2017
@@ -19,7 +19,7 @@
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/json/dist/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/dist/pom.xml?rev=1800591&r1=1800590&r2=1800591&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/dist/pom.xml (original)
+++ turbine/fulcrum/trunk/json/dist/pom.xml Mon Jul 3 06:18:52 2017
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-parent</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-dist</artifactId>
Modified: turbine/fulcrum/trunk/json/gson/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/pom.xml?rev=1800591&r1=1800590&r2=1800591&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/gson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/gson/pom.xml Mon Jul 3 06:18:52 2017
@@ -19,7 +19,7 @@
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/json/jackson/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/pom.xml?rev=1800591&r1=1800590&r2=1800591&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson/pom.xml Mon Jul 3 06:18:52 2017
@@ -19,7 +19,7 @@
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1800591&r1=1800590&r2=1800591&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson2/pom.xml Mon Jul 3 06:18:52 2017
@@ -19,7 +19,7 @@
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentTest.java?rev=1800591&r1=1800590&r2=1800591&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentTest.java (original)
+++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentTest.java Mon Jul 3 06:18:52 2017
@@ -1,5 +1,24 @@
package org.apache.fulcrum.json.jackson.concurrent;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsNot.not;
import static org.junit.Assert.assertNotNull;
Modified: turbine/fulcrum/trunk/json/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1800591&r1=1800590&r2=1800591&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Mon Jul 3 06:18:52 2017
@@ -22,12 +22,12 @@
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
<version>4</version>
- <relativePath />
+ <relativePath></relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-parent</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Fulcrum JSON Master Build</name>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/</url>