You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by sa...@apache.org on 2016/03/27 13:30:09 UTC
[1/2] incubator-johnzon git commit: fix javadoc generation
Repository: incubator-johnzon
Updated Branches:
refs/heads/master dff695a3e -> 90d17f0bb
fix javadoc generation
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/80f6a53b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/80f6a53b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/80f6a53b
Branch: refs/heads/master
Commit: 80f6a53b838ce855607a0b8c26862ed1b4603780
Parents: dff695a
Author: Hendrik Saly <he...@gmail.com>
Authored: Sun Mar 27 13:27:10 2016 +0200
Committer: Hendrik Saly <he...@gmail.com>
Committed: Sun Mar 27 13:27:10 2016 +0200
----------------------------------------------------------------------
pom.xml | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/80f6a53b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b2a304e..14b6e18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,7 +282,7 @@
<goals>
<goal>jar</goal>
</goals>
- <configuration combine.self="override"> <!-- disable parent configuration -->
+ <configuration>
<show>private</show>
<additionalparam>-Xdoclint:none</additionalparam> <!-- maven plugin generated a HelpMojo with malformed javadoc -->
</configuration>
@@ -411,10 +411,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10.3</version>
<configuration>
<notimestamp>true</notimestamp>
<show>private</show>
+ <additionalparam>-Xdoclint:none</additionalparam> <!-- maven plugin generated a HelpMojo with malformed javadoc -->
</configuration>
<reportSets>
<reportSet>
@@ -634,9 +635,13 @@
</developers>
<contributors>
- <contributor>
- <name>Thiago Veronezi</name>
- </contributor>
+ <contributor>
+ <name>Thiago Veronezi</name>
+ </contributor>
+ <contributor>
+ <name>Karl Grosse</name>
+ </contributor>
+
</contributors>
<profiles>
[2/2] incubator-johnzon git commit: add incubating disclamer and
johnzon logo
Posted by sa...@apache.org.
add incubating disclamer and johnzon logo
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/90d17f0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/90d17f0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/90d17f0b
Branch: refs/heads/master
Commit: 90d17f0bb3be4715d1d9e739a0bc1b7d26dcfb1a
Parents: 80f6a53
Author: Hendrik Saly <he...@gmail.com>
Authored: Sun Mar 27 13:29:57 2016 +0200
Committer: Hendrik Saly <he...@gmail.com>
Committed: Sun Mar 27 13:29:57 2016 +0200
----------------------------------------------------------------------
src/site/markdown/index.md.vm | 24 ++++++++++++++++++++++--
src/site/resources/images/johnzon_logo.png | Bin 0 -> 7196 bytes
src/site/site.xml | 2 +-
3 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/90d17f0b/src/site/markdown/index.md.vm
----------------------------------------------------------------------
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
index 8102a0c..fb28874 100644
--- a/src/site/markdown/index.md.vm
+++ b/src/site/markdown/index.md.vm
@@ -16,11 +16,31 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-# Apache Johnzon
+# Apache Johnzon (incubating)
-Apache Johnzon is a project providing an implementation of JsonProcessing (aka jsr-353) and a set of useful extension
+Apache Johnzon (incubating) is a project providing an implementation of JsonProcessing (aka jsr-353) and a set of useful extension
for this specification like an Object mapper, some JAX-RS providers and a WebSocket module provides a basic integration with Java WebSocket API (JSR 356).
+## Status
+<pre>
+Apache Johnzon is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be
+fully endorsed by the ASF.
+
+For more information about the incubation status of the Apache Johnzon project you
+can go to the following page:
+
+http://incubator.apache.org/projects/johnzon.html
+</pre>
+
+
## Get started
Johnzon comes with four main modules.
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/90d17f0b/src/site/resources/images/johnzon_logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/johnzon_logo.png b/src/site/resources/images/johnzon_logo.png
new file mode 100644
index 0000000..ab17b9c
Binary files /dev/null and b/src/site/resources/images/johnzon_logo.png differ
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/90d17f0b/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 54380e0..aa10049 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -27,7 +27,7 @@
</bannerLeft>
<bannerRight>
- <src>http://people.apache.org/~salyh/aj_logo_vote.png</src>
+ <src>/resources/images/johnzon_logo.png</src>
<width>180</width>
</bannerRight>