Author: gk
Date: Fri Mar 21 10:01:50 2014
New Revision: 1579908
URL: http://svn.apache.org/r1579908
Log:
Merged revision(s) 1577532 from turbine/fulcrum/trunk/json/pom.xml:
Removed apache-release profile with maven-assembly goals.
........
Reverse merged revision(s) 1577574-1577573 from turbine/fulcrum/trunk/json
Added license headers to some more files.
Corrected Typing errors
Added ant task for removing asc.md5 files (may be not possible)
Added:
turbine/fulcrum/trunk/json/.tasks.properties (with props)
turbine/fulcrum/trunk/json/README (with props)
turbine/fulcrum/trunk/json/tasks-build-clean-asc.xml (with props)
Modified:
turbine/fulcrum/trunk/json/api/pom.xml
turbine/fulcrum/trunk/json/gson/pom.xml
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TestJsonSerializer.java
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForCollection.java
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForRectangle.java
turbine/fulcrum/trunk/json/jackson/pom.xml
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/Mixin.java
turbine/fulcrum/trunk/json/jackson2/pom.xml
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/CustomModuleWrapper.java
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/FilterContext.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestDeserializer.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestJsonSerializer.java
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestSerializer.java
turbine/fulcrum/trunk/json/pom.xml
turbine/fulcrum/trunk/json/xdocs/index.xml
Added: turbine/fulcrum/trunk/json/.tasks.properties
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/.tasks.properties?rev=1579908&view=auto
==============================================================================
--- turbine/fulcrum/trunk/json/.tasks.properties (added)
+++ turbine/fulcrum/trunk/json/.tasks.properties Fri Mar 21 10:01:50 2014
@@ -0,0 +1 @@
+target.dir=${basedir}/target
Propchange: turbine/fulcrum/trunk/json/.tasks.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/fulcrum/trunk/json/README
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/README?rev=1579908&view=auto
==============================================================================
--- turbine/fulcrum/trunk/json/README (added)
+++ turbine/fulcrum/trunk/json/README Fri Mar 21 10:01:50 2014
@@ -0,0 +1,50 @@
+Publishing Workflow:
+
+Prerequisites
+ // jars
+ mvn deploy -Papache-release
+ // Stage the latest documentation
+ mvn site site:stage scm-publish:publish-scm -Dscmpublish.dryRun=true
+ mvn clean site site:stage scm-publish:publish-scm -Dusername=<username>
-Dpassword=<pw>
+
+More Information
+ https://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms
+
http://maven.apache.org/developers/website/deploy-component-reference-documentation.html
+
+Steps
+1) Local Testing
+ // Verify gpg.homedir, gpg.useagent
+ mvn clean install -Papache-release -Dgpg.useagent=false
-Dgpg.passphrase=<xx>
+ mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true
-Papache-release
+
+2) Remote Testing
+ mvn release:clean
+ mvn release:prepare -DautoVersionSubmodules=true -P apache-release
-Dusername=<username> -Dpassword=<pw>
+ // Helpful hint from Apache Website: If you're located in Europe then
release:prepare may fail with 'Unable to tag SCM' and ' svn: No such revision X
'. Wait 10 seconds and run mvn release:prepare again.
+
+4) Release Preparing
+ // performs an upload to
repository.apache.org/service/local/staging/depoly/maven2/org/apache/fulcrum
+ mvn release:perform
+
+More Information
+ http://www.sonatype.com/books/nexus-book/reference/staging.html
+
+5) Close the staging
+ Login to and close
+ https://repository.apache.org/index.html#stagingRepositories
+
+More Information
+ https://www.apache.org/dev/publishing-maven-artifacts.html#close-stage
+ https://docs.sonatype.org/display/Repository/Closing+a+Staging+Repository
+
+3) Prepare Voting Information and Voting
+ ....
+
+5) a)
+ //Promote / Publish
+ https://docs.sonatype.org/display/Repository/Releasing+a+Staging+Repository
+ b)
+ //Drop and Restage
+ https://docs.sonatype.org/display/Repository/Dropping+a+Staging+Repository
+
+
\ No newline at end of file
Propchange: turbine/fulcrum/trunk/json/README
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/fulcrum/trunk/json/api/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/api/pom.xml?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/api/pom.xml (original)
+++ turbine/fulcrum/trunk/json/api/pom.xml Fri Mar 21 10:01:50 2014
@@ -15,18 +15,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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/xsd/maven-4.0.0.xsd";>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-api</artifactId>
<name>Fulcrum JSON API</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>Fulcrum JSON Basic API</description>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-api</url>
Modified: turbine/fulcrum/trunk/json/gson/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/pom.xml?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/gson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/gson/pom.xml Fri Mar 21 10:01:50 2014
@@ -15,18 +15,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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/xsd/maven-4.0.0.xsd";>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-gson</artifactId>
<name>Fulcrum JSON GSON Impl</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-gson</url>
<scm>
Modified:
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TestJsonSerializer.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TestJsonSerializer.java?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TestJsonSerializer.java
(original)
+++
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TestJsonSerializer.java
Fri Mar 21 10:01:50 2014
@@ -1,5 +1,24 @@
package org.apache.fulcrum.json.gson;
+/*
+ * 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 java.lang.reflect.Type;
import org.apache.fulcrum.json.TestClass;
Modified:
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForCollection.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForCollection.java?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForCollection.java
(original)
+++
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForCollection.java
Fri Mar 21 10:01:50 2014
@@ -1,5 +1,24 @@
package org.apache.fulcrum.json.gson;
+/*
+ * 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 java.io.IOException;
import java.util.ArrayList;
import java.util.List;
Modified:
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForRectangle.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForRectangle.java?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForRectangle.java
(original)
+++
turbine/fulcrum/trunk/json/gson/src/test/org/apache/fulcrum/json/gson/TypeAdapterForRectangle.java
Fri Mar 21 10:01:50 2014
@@ -1,5 +1,24 @@
package org.apache.fulcrum.json.gson;
+/*
+ * 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 java.lang.reflect.Type;
import org.apache.fulcrum.json.Rectangle;
Modified: turbine/fulcrum/trunk/json/jackson/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/pom.xml?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson/pom.xml Fri Mar 21 10:01:50 2014
@@ -15,18 +15,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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/xsd/maven-4.0.0.xsd";>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-jackson</artifactId>
<name>Fulcrum JSON Jackson Impl</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-jackson</url>
<scm>
Modified:
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/Mixin.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/Mixin.java?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/Mixin.java
(original)
+++
turbine/fulcrum/trunk/json/jackson/src/test/org/apache/fulcrum/json/jackson/Mixin.java
Fri Mar 21 10:01:50 2014
@@ -1,5 +1,24 @@
package org.apache.fulcrum.json.jackson;
+/*
+ * 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 org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson2/pom.xml Fri Mar 21 10:01:50 2014
@@ -15,18 +15,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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/xsd/maven-4.0.0.xsd";>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<parent>
<artifactId>fulcrum-json-parent</artifactId>
<groupId>org.apache.fulcrum</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-jackson2</artifactId>
<name>Fulcrum JSON Jackson 2.x Impl</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-jackson2</url>
<scm>
Modified:
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/CustomModuleWrapper.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/CustomModuleWrapper.java?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/CustomModuleWrapper.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/CustomModuleWrapper.java
Fri Mar 21 10:01:50 2014
@@ -1,5 +1,24 @@
package org.apache.fulcrum.json.jackson.filters;
+/*
+ * 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 org.apache.fulcrum.json.jackson.Jackson2MapperService;
import org.apache.fulcrum.json.jackson.Jackson2MapperService.CustomModule;
Modified:
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/FilterContext.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/FilterContext.java?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/FilterContext.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/filters/FilterContext.java
Fri Mar 21 10:01:50 2014
@@ -1,5 +1,24 @@
package org.apache.fulcrum.json.jackson.filters;
+/*
+ * 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 com.fasterxml.jackson.databind.ser.BeanPropertyFilter;
public class FilterContext {
Modified:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestDeserializer.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestDeserializer.java?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestDeserializer.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestDeserializer.java
Fri Mar 21 10:01:50 2014
@@ -1,5 +1,24 @@
package org.apache.fulcrum.json.jackson;
+/*
+ * 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 java.io.IOException;
import java.util.ArrayList;
import java.util.List;
Modified:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestJsonSerializer.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestJsonSerializer.java?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestJsonSerializer.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestJsonSerializer.java
Fri Mar 21 10:01:50 2014
@@ -1,5 +1,24 @@
package org.apache.fulcrum.json.jackson;
+/*
+ * 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 java.io.IOException;
import org.apache.fulcrum.json.TestClass;
Modified:
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestSerializer.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestSerializer.java?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestSerializer.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/TestSerializer.java
Fri Mar 21 10:01:50 2014
@@ -1,5 +1,24 @@
package org.apache.fulcrum.json.jackson;
+/*
+ * 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 java.io.IOException;
import java.util.List;
Modified: turbine/fulcrum/trunk/json/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Fri Mar 21 10:01:50 2014
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<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/xsd/maven-4.0.0.xsd";>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
+ xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
@@ -26,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-json-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Fulcrum JSON Master Build</name>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/</url>
@@ -89,9 +91,69 @@
<tryUpdate>false</tryUpdate>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <preparationGoals>antrun:run</preparationGoals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-asc-hashes</id>
+ <!--phase>verify</phase--><!-- a lifecycle phase -->
+ <inherited>false</inherited>
+ <configuration>
+ <target>
+ <ant antfile="${basedir}/tasks-build-clean-asc.xml"
target="tasks">
+ <property name="build.path"
value="${basedir}"/>
+ </ant>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- build the source and binary distribution packages
-->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>fulcrum-source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>bin</descriptorRef>
+ <descriptorRef>project</descriptorRef>
+ <descriptorRef>src</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileFormat>gnu</tarLongFileFormat>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<properties>
<turbine.site.path>fulcrum/fulcrum-json</turbine.site.path>
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/json</turbine.scmPubCheckoutDirectory>
Added: turbine/fulcrum/trunk/json/tasks-build-clean-asc.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/tasks-build-clean-asc.xml?rev=1579908&view=auto
==============================================================================
--- turbine/fulcrum/trunk/json/tasks-build-clean-asc.xml (added)
+++ turbine/fulcrum/trunk/json/tasks-build-clean-asc.xml Fri Mar 21 10:01:50
2014
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project basedir="." default="tasks" name="tasks">
+
+ <property environment="env"/>
+ <property file="${build.path}/.tasks.properties"/>
+
+ <target name="delete-asc-sha1-asc-md5">
+ <echo message="delete in ${project.build.directory}:: .*.asc.md5,
*.asc.sha1"/>
+ <delete>
+ <fileset dir="${project.build.directory}" includes="*.asc.md5" />
+ <fileset dir="${project.build.directory}" includes="*.asc.sha1" />
+ </delete>
+</target>
+
+
+ <target name="tasks" depends="delete-asc-sha1-asc-md5">
+ </target>
+
+</project>
Propchange: turbine/fulcrum/trunk/json/tasks-build-clean-asc.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/fulcrum/trunk/json/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/xdocs/index.xml?rev=1579908&r1=1579907&r2=1579908&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/json/xdocs/index.xml Fri Mar 21 10:01:50 2014
@@ -28,7 +28,7 @@
<body>
<section name="Overview">
- <p>The intent of this component is to provide a configurable and
customized integration of JSON De-/Seriallizers ousing GSON, Jackson 1 and
Jackson 2 APIs into Avalon/Turbine.
+ <p>The intent of this component is to provide a configurable and
customized integration of JSON De-/Serializers using GSON, Jackson 1 and
Jackson 2 APIs into Avalon/Turbine.
It is written for use in Turbine but it can be used in any container
compatible
with Avalon's ECM container. There are three implementations
@@ -45,7 +45,7 @@
<subsection name="Overview">
<p>
This Service serves as a JSON serializer or deserializer using <a
href="https://github.com/FasterXML/jackson";>Jackson</a> Version 2 or Version 1.
- The JSON Jackson 2 submodule is the most elaborated of the three sub
modules. It provides attribute and class filtering and cache cleaning mechanism.
+ The JSON Jackson 2 sub module is the most elaborated of the three sub
modules. It provides attribute and class filtering and cache cleaning mechanism.
</p>
<p>
