You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/05/20 15:11:13 UTC
git commit: Adding a 'javadocs' profile for Javadocs generation
Repository: olingo-odata4
Updated Branches:
refs/heads/master 24ce9af64 -> 31550fd3b
Adding a 'javadocs' profile for Javadocs generation
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/31550fd3
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/31550fd3
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/31550fd3
Branch: refs/heads/master
Commit: 31550fd3bc834e650a5b3f267251a52735d0c68e
Parents: 24ce9af
Author: Francesco Chicchiriccò <--global>
Authored: Tue May 20 15:11:06 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Tue May 20 15:11:06 2014 +0200
----------------------------------------------------------------------
ext/client-proxy-android/pom.xml | 2 +-
ext/client-proxy/pom.xml | 2 +-
pom.xml | 43 +++++++++++++++++++++++++++++++++--
3 files changed, 43 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/31550fd3/ext/client-proxy-android/pom.xml
----------------------------------------------------------------------
diff --git a/ext/client-proxy-android/pom.xml b/ext/client-proxy-android/pom.xml
index dc484ae..b8c8027 100644
--- a/ext/client-proxy-android/pom.xml
+++ b/ext/client-proxy-android/pom.xml
@@ -66,7 +66,7 @@
<include>org.apache.commons:commons-lang3</include>
<include>org.slf4j:slf4j-api</include>
<include>commons-io:commons-io</include>
- <include>commons-beanutils:commons-beanutils-core</include>
+ <include>commons-beanutils:commons-beanutils</include>
<include>org.apache.httpcomponents:httpclient</include>
<include>org.apache.httpcomponents:httpcore</include>
<include>commons-logging:commons-logging</include>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/31550fd3/ext/client-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/ext/client-proxy/pom.xml b/ext/client-proxy/pom.xml
index 827e7e9..bda3379 100644
--- a/ext/client-proxy/pom.xml
+++ b/ext/client-proxy/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
+ <artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/31550fd3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0047b4d..0f4af7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
<commons.codec.version>1.9</commons.codec.version>
<commons.io.version>2.4</commons.io.version>
<commons.lang3.version>3.3.2</commons.lang3.version>
- <commons.beanutils.version>1.8.3</commons.beanutils.version>
+ <commons.beanutils.version>1.9.1</commons.beanutils.version>
<commons.logging.version>1.1.3</commons.logging.version>
<commons.vfs.version>2.0</commons.vfs.version>
@@ -124,7 +124,7 @@
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
+ <artifactId>commons-beanutils</artifactId>
<version>${commons.beanutils.version}</version>
</dependency>
@@ -363,6 +363,12 @@
<artifactId>maven-invoker-plugin</artifactId>
<version>1.8</version>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -457,4 +463,37 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>javadocs</id>
+
+ <build>
+ <defaultGoal>javadoc:aggregate</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <destDir>javadocs</destDir>
+ <detectLinks>true</detectLinks>
+ <detectJavaApiLink>true</detectJavaApiLink>
+ <links>
+ <link>http://docs.oracle.com/javaee/6/api/</link>
+ <link>http://www.slf4j.org/api/</link>
+ <link>http://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
+ <link>http://commons.apache.org/proper/commons-io/javadocs/api-release/</link>
+ <link>http://commons.apache.org/proper/commons-beanutils/javadocs/v1.9.1/apidocs/</link>
+ <link>http://commons.apache.org/proper/commons-codec/archives/1.9/apidocs/</link>
+ <link>http://www.viste.com/Java/Language/http-client/httpcomponents-client-4.2.3-bin/httpcomponents-client-4.2.3/javadoc/</link>
+ <link>http://fasterxml.github.io/jackson-databind/javadoc/2.3.0/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>