You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2016/06/27 18:22:53 UTC
[1/3] nutch git commit: NUTCH-2243 REST API documentation for Nutch
2.X
Repository: nutch
Updated Branches:
refs/heads/2.x 8438b0658 -> 7fc92a247
NUTCH-2243 REST API documentation for Nutch 2.X
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo
Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/728d0de8
Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/728d0de8
Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/728d0de8
Branch: refs/heads/2.x
Commit: 728d0de8bac399ac8dff5d0a0eee89f5c53428b9
Parents: 72a99cf
Author: Furkan KAMACI <fu...@gmail.com>
Authored: Sun Jun 19 18:16:30 2016 +0300
Committer: Furkan KAMACI <fu...@gmail.com>
Committed: Tue Jun 21 23:19:42 2016 +0300
----------------------------------------------------------------------
build.xml | 25 +++++++++++++++++
ivy/mvn.template | 75 ++++++++++++++++++++++++++++++++++-----------------
2 files changed, 76 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nutch/blob/728d0de8/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4ae31eb..4e4b415 100644
--- a/build.xml
+++ b/build.xml
@@ -285,6 +285,31 @@
</artifact:mvn>
</target>
+ <!-- ================================================================== -->
+ <!-- Generate REST API Documentation with Miredot -->
+ <!-- ================================================================== -->
+ <target name="restdocs" description="--> generate REST API Documentation with Miredot">
+
+ <!-- generate a pom file -->
+ <ivy:makepom ivyfile="${ivy.file}" pomfile="${basedir}/pom.xml" templatefile="ivy/mvn.template">
+ <mapping conf="default" scope="compile"/>
+ <mapping conf="runtime" scope="runtime"/>
+ </ivy:makepom>
+
+ <!--artifact:dependencies pathId="dependency.classpath">
+ <dependency groupId="log4j" artifactId="log4j" version="1.2.15" >
+ <exclusion groupId="javax.jms" artifactId="jms" />
+ <exclusion groupId="com.sun.jdmk" artifactId="jmxtools" />
+ <exclusion groupId="com.sun.jmx" artifactId="jmxri" />
+ </dependency>
+ </artifact:dependencies-->
+
+ <artifact:mvn>
+ <arg value="test"/>
+ <arg value="-e"/>
+ </artifact:mvn>
+ </target>
+
<!-- ================================================================== -->
<!-- Make job jar -->
<!-- ================================================================== -->
http://git-wip-us.apache.org/repos/asf/nutch/blob/728d0de8/ivy/mvn.template
----------------------------------------------------------------------
diff --git a/ivy/mvn.template b/ivy/mvn.template
index 4f65fc8..c86a923 100644
--- a/ivy/mvn.template
+++ b/ivy/mvn.template
@@ -37,6 +37,15 @@
<url>http://svn.apache.org/viewvc/nutch</url>
<connection>http://svn.apache.org/viewvc/nutch</connection>
</scm>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>miredot</id>
+ <name>MireDot Releases</name>
+ <url>http://nexus.qmino.com/content/repositories/miredot</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<developers>
<developer>
<id>mattmann</id>
@@ -84,29 +93,47 @@
<email>snagel@apache.org</email>
</developer>
</developers>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>src/testresources</directory>
- </testResource>
- <testResource>
- <directory>src/testprocess</directory>
- </testResource>
- </testResources>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>src/testresources</directory>
+ </testResource>
+ </testResources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.qmino</groupId>
+ <artifactId>miredot-maven-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>restdoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <licence>
+ <!-- Miredot license key valid until Oct 30th 2017. The key is valid for two years, after which we are free to request a new key. -->
+ cHJvamVjdHxvcmcuYXBhY2hlLm51dGNoLm51dGNofDIwMTctMTAtMzB8dHJ1ZXwtMSNNQ3dDRkh2N1BsSXZvbWMzTGYxTXBHd3RYcVhEUnZsR0FoUjh3UWVhbG44TkdMUWhzVnJjVnNvNlJEZFBHQT09
+ </licence>
+ <!-- insert other configuration here (optional) -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
[2/3] nutch git commit: NUTCH-2243 Miredot plugin version and licence
configuration are updated.
Posted by le...@apache.org.
NUTCH-2243 Miredot plugin version and licence configuration are updated.
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo
Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/6f7ca5bc
Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/6f7ca5bc
Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/6f7ca5bc
Branch: refs/heads/2.x
Commit: 6f7ca5bc0b08c3e3f8f4aa23e4924ad159d7222f
Parents: 728d0de
Author: Furkan KAMACI <fu...@gmail.com>
Authored: Sat Jun 25 15:14:16 2016 +0300
Committer: Furkan KAMACI <fu...@gmail.com>
Committed: Sat Jun 25 15:14:16 2016 +0300
----------------------------------------------------------------------
ivy/mvn.template | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nutch/blob/6f7ca5bc/ivy/mvn.template
----------------------------------------------------------------------
diff --git a/ivy/mvn.template b/ivy/mvn.template
index c86a923..5f7f379 100644
--- a/ivy/mvn.template
+++ b/ivy/mvn.template
@@ -116,8 +116,8 @@
<plugins>
<plugin>
<groupId>com.qmino</groupId>
- <artifactId>miredot-maven-plugin</artifactId>
- <version>1.4</version>
+ <artifactId>miredot-plugin</artifactId>
+ <version>2.0-RC2</version>
<executions>
<execution>
<goals>
@@ -126,10 +126,15 @@
</execution>
</executions>
<configuration>
- <licence>
- <!-- Miredot license key valid until Oct 30th 2017. The key is valid for two years, after which we are free to request a new key. -->
- cHJvamVjdHxvcmcuYXBhY2hlLm51dGNoLm51dGNofDIwMTctMTAtMzB8dHJ1ZXwtMSNNQ3dDRkh2N1BsSXZvbWMzTGYxTXBHd3RYcVhEUnZsR0FoUjh3UWVhbG44TkdMUWhzVnJjVnNvNlJEZFBHQT09
- </licence>
+ <organizationId>c579ca2e-c194-4a14-a7f0-f39ef4ec3c2d</organizationId>
+ <restModel>
+ <restFramework>
+ <name>jax-rs</name>
+ </restFramework>
+ </restModel>
+ <output>
+ <html></html>
+ </output>
<!-- insert other configuration here (optional) -->
</configuration>
</plugin>
[3/3] nutch git commit: Merge branch 'NUTCH-2243' of
https://github.com/kamaci/nutch into 2.x this closes #123
Posted by le...@apache.org.
Merge branch 'NUTCH-2243' of https://github.com/kamaci/nutch into 2.x this closes #123
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo
Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/7fc92a24
Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/7fc92a24
Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/7fc92a24
Branch: refs/heads/2.x
Commit: 7fc92a247fcd1521e0debe72febf8944cbead3e5
Parents: 8438b06 6f7ca5b
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Mon Jun 27 11:27:36 2016 -0700
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Mon Jun 27 11:27:36 2016 -0700
----------------------------------------------------------------------
build.xml | 25 ++++++++++++++++
ivy/mvn.template | 80 +++++++++++++++++++++++++++++++++++----------------
2 files changed, 81 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nutch/blob/7fc92a24/build.xml
----------------------------------------------------------------------