summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-base/archiva-common/src
diff options
context:
space:
mode:
authorskygo <skygo@unknown>2014-02-25 02:01:14 +0000
committerskygo <skygo@unknown>2014-02-25 02:01:14 +0000
commit764c9d64245b90cddef47289467a623ec0dac9e4 (patch)
tree2dfadf5fb667d57542a184593f34f946f5cc7d4d /archiva-modules/archiva-base/archiva-common/src
parent0b3773952c9ea2edda2d90fab37392068500a0b9 (diff)
downloadarchiva-764c9d64245b90cddef47289467a623ec0dac9e4.tar.gz
archiva-764c9d64245b90cddef47289467a623ec0dac9e4.zip
fix javadoc. Generation possible on jdk8
(fix html content + replace @todo with TODO ) git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1571532 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-common/src')
-rw-r--r--archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java14
-rw-r--r--archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java10
2 files changed, 13 insertions, 11 deletions
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
index 6558b2f6c..e39a2e9a6 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
@@ -29,24 +29,26 @@ import java.util.List;
/**
* VersionComparator - compare the parts of two version strings.
- * <p/>
+ * <p>
* Technique.
- * <p/>
+ * </p>
+ * <p>
* * Split the version strings into parts by splitting on <code>"-._"</code> first, then breaking apart words from numbers.
- * <p/>
+ * </p>
* <code>
* "1.0" = "1", "0"
* "1.0-alpha-1" = "1", "0", "alpha", "1"
* "2.0-rc2" = "2", "0", "rc", "2"
* "1.3-m2" = "1", "3", "m", "3"
* </code>
- * <p/>
+ * <p>
* compare each part individually, and when they do not match, perform the following test.
- * <p/>
+ * </p>
+ * <p>
* Numbers are calculated per normal comparison rules.
* Words that are part of the "special word list" will be treated as their index within that heirarchy.
* Words that cannot be identified as special, are treated using normal case-insensitive comparison rules.
- *
+ * </p>
*
*/
public class VersionComparator
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java
index 36f9137a6..ab3322027 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java
@@ -55,7 +55,7 @@ public class VersionUtil
* <p>
* Tests if the unknown string contains elements that identify it as a version string (or not).
* </p>
- * <p/>
+ *
* <p>
* The algorithm tests each part of the string that is delimited by a '-' (dash) character.
* If 75% or more of the sections are identified as 'version' strings, the result is
@@ -100,7 +100,7 @@ public class VersionUtil
* <p>
* Tests if the identifier is a known simple version keyword.
* </p>
- * <p/>
+ *
* <p>
* This method is different from {@link #isVersion(String)} in that it tests the whole input string in
* one go as a simple identifier. (eg "alpha", "1.0", "beta", "debug", "latest", "rc#", etc...)
@@ -146,14 +146,14 @@ public class VersionUtil
* <p>
* Get the release version of the snapshot version.
* </p>
- * <p/>
+ *
* <p>
* If snapshot version is 1.0-SNAPSHOT, then release version would be 1.0
* And if snapshot version is 1.0-20070113.163208-1.jar, then release version would still be 1.0
* </p>
*
- * @param snapshotVersion
- * @return
+ * @param snapshotVersion snapshot version
+ * @return release version
*/
public static String getReleaseVersion( String snapshotVersion )
{