You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ra...@apache.org on 2015/11/24 20:32:21 UTC
[3/3] ignite git commit: Javadoc adjustments and cleanup.
Javadoc adjustments and cleanup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5852b7d3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5852b7d3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5852b7d3
Branch: refs/heads/ignite-1270
Commit: 5852b7d37c347d3ec2e64aecae3f912658c0262f
Parents: 3642f99
Author: Raul Kripalani <ra...@apache.org>
Authored: Tue Nov 24 19:32:09 2015 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Tue Nov 24 19:32:09 2015 +0000
----------------------------------------------------------------------
.../ignite/osgi/IgniteOsgiContextActivator.java | 2 +-
.../org/apache/ignite/osgi/IgniteOsgiUtils.java | 4 +--
.../BundleDelegatingClassLoader.java | 2 +-
parent/pom.xml | 26 ++++++++++----------
4 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5852b7d3/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiContextActivator.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiContextActivator.java b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiContextActivator.java
index f8dd57a..c5ab7f3 100644
--- a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiContextActivator.java
+++ b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiContextActivator.java
@@ -57,7 +57,7 @@ import org.osgi.framework.BundleContext;
* Currently, Ignite only allows a single instance per container. We may remove this limitation if enough demand
* builds up in the community.
*
- * @see <a href="http://wiki.osgi.org/wiki/Bundle-Activator">Bundle-Activator OSGi Manifest header</a>.
+ * @see <a href="http://wiki.osgi.org/wiki/Bundle-Activator">Bundle-Activator OSGi Manifest header</a>
*
*/
public abstract class IgniteOsgiContextActivator implements BundleActivator {
http://git-wip-us.apache.org/repos/asf/ignite/blob/5852b7d3/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java
index c49ec86..bebaf45 100644
--- a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java
+++ b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java
@@ -27,7 +27,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
/**
- * Helper for OSGi.
+ * Helper class for OSGi.
*/
public class IgniteOsgiUtils {
@@ -45,7 +45,7 @@ public class IgniteOsgiUtils {
/**
* Returns whether we are running in an OSGi environment.
*
- * @return
+ * @return {@core true/false}.
*/
public static boolean isOsgi() {
return osgi;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5852b7d3/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/BundleDelegatingClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/BundleDelegatingClassLoader.java b/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/BundleDelegatingClassLoader.java
index f3cd873..3a71819 100644
--- a/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/BundleDelegatingClassLoader.java
+++ b/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/BundleDelegatingClassLoader.java
@@ -134,7 +134,7 @@ public class BundleDelegatingClassLoader extends ClassLoader {
}
/**
- * @return
+ * {@inheritDoc}
*/
@Override
public String toString() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/5852b7d3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0697cfe..77dc4c9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -48,59 +48,59 @@
<activemq.version>5.12.0</activemq.version>
<aopalliance.bundle.version>1.0_6</aopalliance.bundle.version>
<asm.version>4.2</asm.version>
- <aspectj.version>1.7.2</aspectj.version>
<aspectj.bundle.version>1.7.2_1</aspectj.bundle.version>
- <aws.sdk.version>1.10.29</aws.sdk.version>
+ <aspectj.version>1.7.2</aspectj.version>
<aws.sdk.bundle.version>1.10.12_1</aws.sdk.bundle.version>
+ <aws.sdk.version>1.10.29</aws.sdk.version>
<camel.version>2.16.0</camel.version>
- <commons.beanutils.version>1.8.3</commons.beanutils.version>
<commons.beanutils.bundle.version>1.8.3_1</commons.beanutils.bundle.version>
+ <commons.beanutils.version>1.8.3</commons.beanutils.version>
<commons.codec.version>1.6</commons.codec.version>
<commons.collections.version>3.2.1</commons.collections.version>
<commons.lang.version>2.6</commons.lang.version>
<cron4j.version>2.2.5</cron4j.version>
<curator.version>2.9.1</curator.version>
- <ezmorph.version>1.0.6</ezmorph.version>
<ezmorph.bundle.version>1.0.6_1</ezmorph.bundle.version>
+ <ezmorph.version>1.0.6</ezmorph.version>
<flume.ng.version>1.6.0</flume.ng.version>
<guava.retrying.version>2.0.0</guava.retrying.version>
<guava.version>18.0</guava.version>
- <guava16.version>16.0.1</guava16.version>
<guava14.version>14.0.1</guava14.version>
+ <guava16.version>16.0.1</guava16.version>
<h2.version>1.3.175</h2.version>
<hadoop.version>2.4.1</hadoop.version>
<httpclient.version>4.5.1</httpclient.version>
<httpcore.version>4.4.3</httpcore.version>
<jackson.version>1.9.13</jackson.version>
- <javax.cache.version>1.0.0</javax.cache.version>
<javax.cache.bundle.version>1.0.0_1</javax.cache.bundle.version>
+ <javax.cache.version>1.0.0</javax.cache.version>
<jetty.version>9.2.11.v20150529</jetty.version>
<jms.spec.version>1.1.1</jms.spec.version>
- <jsch.version>0.1.53</jsch.version>
<jsch.bundle.version>0.1.53_1</jsch.bundle.version>
- <jsonlib.version>2.4</jsonlib.version>
+ <jsch.version>0.1.53</jsch.version>
<jsonlib.bundle.version>2.4_1</jsonlib.bundle.version>
+ <jsonlib.version>2.4</jsonlib.version>
<jtidy.version>r938</jtidy.version>
- <kafka.version>0.8.2.1</kafka.version>
<kafka.bundle.version>0.8.2.1_1</kafka.bundle.version>
<kafka.clients.bundle.version>0.8.2.0_1</kafka.clients.bundle.version>
<kafka.clients.version>0.8.2.0</kafka.clients.version>
<kafka.version>0.8.2.1</kafka.version>
+ <kafka.version>0.8.2.1</kafka.version>
<karaf.version>4.0.2</karaf.version>
- <lucene.version>3.5.0</lucene.version>
<lucene.bundle.version>3.5.0_1</lucene.bundle.version>
+ <lucene.version>3.5.0</lucene.version>
<oro.bundle.version>2.0.8_6</oro.bundle.version>
<osgi.core.version>5.0.0</osgi.core.version>
<osgi.enterprise.version>5.0.0</osgi.enterprise.version>
<paho.version>1.0.2</paho.version>
- <scala210.library.version>2.10.4</scala210.library.version>
<scala210.jline.version>2.10.4</scala210.jline.version>
+ <scala210.library.version>2.10.4</scala210.library.version>
<scala211.library.version>2.11.2</scala211.library.version>
- <slf4j16.version>1.6.4</slf4j16.version>
<slf4j.version>1.7.7</slf4j.version>
+ <slf4j16.version>1.6.4</slf4j16.version>
<spark.version>1.5.1</spark.version>
- <spring41.osgi.feature.version>4.1.7.RELEASE_1</spring41.osgi.feature.version>
<spring.version>4.1.0.RELEASE</spring.version>
+ <spring41.osgi.feature.version>4.1.7.RELEASE_1</spring41.osgi.feature.version>
<tomcat.version>8.0.23</tomcat.version>
<twitter.hbc.version>2.2.0</twitter.hbc.version>
<yammer.metrics.annotation.version>2.2.0</yammer.metrics.annotation.version>