You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/02/26 16:06:24 UTC
[4/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Updated Branches:
refs/heads/master b9e9b03a1 -> f3fbf540e
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f3fbf540
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f3fbf540
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f3fbf540
Branch: refs/heads/master
Commit: f3fbf540e2d5f90ccd984f773625a917646173bc
Parents: e718df5 b9e9b03
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Feb 26 16:05:47 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Feb 26 16:05:47 2013 +0100
----------------------------------------------------------------------
build/plugins/buildinfo-maven-plugin/pom.xml | 4 +-
.../plugins/buildinfo/AbstractInfoProvider.java | 65 ---
.../maven/plugins/buildinfo/BuildInfoMojo.java | 124 -----
.../maven/plugins/buildinfo/GitInfoProvider.java | 87 ----
.../maven/plugins/buildinfo/InfoProvider.java | 34 --
.../plugins/buildinfo/MercurialInfoProvider.java | 103 ----
.../plugins/buildinfo/ProjectInfoProvider.java | 47 --
.../plugins/buildinfo/AbstractInfoProvider.java | 65 +++
.../maven/plugins/buildinfo/BuildInfoMojo.java | 124 +++++
.../maven/plugins/buildinfo/GitInfoProvider.java | 86 ++++
.../maven/plugins/buildinfo/InfoProvider.java | 34 ++
.../plugins/buildinfo/MercurialInfoProvider.java | 103 ++++
.../plugins/buildinfo/ProjectInfoProvider.java | 47 ++
build/plugins/marmotta-maven-plugin/pom.xml | 47 +-
.../maven/plugins/marmotta/MarmottaMojo.java | 16 +
build/plugins/pom.xml | 81 +++-
build/plugins/refpack-maven-plugin/pom.xml | 8 +-
.../maven/plugins/refpack/RefPackMojo.java | 379 ---------------
.../maven/plugins/refpack/RefPackMojo.java | 379 +++++++++++++++
build/plugins/repocheck-maven-plugin/pom.xml | 61 +++
.../plugins/repochecker/LogMatrixPrinter.java | 70 +++
.../maven/plugins/repochecker/MatrixPrinter.java | 17 +
.../plugins/repochecker/RepositoryCheckerMojo.java | 304 ++++++++++++
.../plugins/repochecker/SilentMatrixPrinter.java | 23 +
parent/pom.xml | 87 +++-
.../services/org.openrdf.rio.RDFWriterFactory | 2 +-
26 files changed, 1494 insertions(+), 903 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3fbf540/parent/pom.xml
----------------------------------------------------------------------
diff --cc parent/pom.xml
index a359221,681a358..7471cdb
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -432,12 -467,11 +478,13 @@@
<version>0.10.0</version>
</docletArtifact>
<additionalparam>
- -jaxrscontext {BASE} -charset UTF-8
+ -jaxrscontext {BASE}
+ -charset UTF-8
</additionalparam>
- <!-- <stylesheetfile>${project.parent.basedir}/config/doc/doclet.css</stylesheetfile> -->
+ <!--
+ <stylesheetfile>${project.parent.basedir}/config/doc/doclet.css</stylesheetfile>
+ -->
<header><![CDATA[<!--###BEGIN_CONTENT###--><div class="javadoc">]]></header>
<footer><![CDATA[</div><!--###END_CONTENT###-->]]></footer>