Added jdk7 to travis. Removed html in javadoc. Added custom Maven plugin tags to javadoc

Ekryd · Ekryd · commit ee76c2a44713 · 2015-04-06T11:41:04.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ install: mvn install -Ddev
 
 jdk:
   - openjdk6
+  - oraclejdk7
   - oraclejdk8
 
 addons:
diff --git a/pom.xml b/pom.xml
@@ -293,6 +293,18 @@
                 <!-- JSE -->
                 <link>http://docs.oracle.com/javase/6/docs/api/</link>
               </links>
+              <tags>
+                <tag>
+                  <name>goal</name>
+                  <placement>a</placement>
+                  <head>Maven plugin goal:</head>
+                </tag>
+                <tag>
+                  <name>threadSafe</name>
+                  <placement>a</placement>
+                  <head>Is plugin thread safe:</head>
+                </tag>
+              </tags>
             </configuration>
             <executions>
               <execution>
@@ -304,6 +316,7 @@
               </execution>
             </executions>
           </plugin>
+
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
diff --git a/sorter/src/main/java/sortpom/exception/FailureException.java b/sorter/src/main/java/sortpom/exception/FailureException.java
@@ -2,7 +2,6 @@
 
 /**
  * An exception occurring during the execution of the sort (such as a compilation failure).
- * <br/>
  * Throwing this exception should cause a "BUILD FAILURE" message to be displayed.
  * @author bjorn
  * @since 2012-12-21
diff --git a/sorter/src/main/java/sortpom/jdomcontent/NewlineText.java b/sorter/src/main/java/sortpom/jdomcontent/NewlineText.java
@@ -3,12 +3,12 @@
 import org.jdom.Comment;
 
 /**
+ * The NewlineText is not really a special case of comment. Its just that comments
+ * are not subjected to trimming by jdom. The special handling of NewlineText is done
+ * in XmlProcessor.PatchedXMLOutputter
+ *
  * @author bjorn
  * @since 2012-05-17
- *        <p/>
- *        The NewlineText is not really a special case of comment. Its just that comments
- *        are not subjected to trimming by jdom. The special handling of NewlineText is done
- *        in XmlProcessor.PatchedXMLOutputter
  */
 public class NewlineText extends Comment {
     private static final long serialVersionUID = -7552189498553321263L;
@@ -21,7 +21,7 @@ public class NewlineText extends Comment {
      * should be used.
      *
      * @return <code>String</code> - information about the
-     *         <code>Attribute</code>
+     * <code>Attribute</code>
      */
     public String toString() {
         return "[NewLine]";
diff --git a/sorter/src/main/java/sortpom/processinstruction/IgnoredSectionsStore.java b/sorter/src/main/java/sortpom/processinstruction/IgnoredSectionsStore.java
@@ -7,10 +7,10 @@
 /**
  * Replaces ignored sections with a token. The ignored sections look like this:
  * <?sortpom ignore?>... whatever ... <?sortpom resume?>
- * <p/>
+ *
  * The tokens look like this:
  * <?sortpom token='0'?>
- * <p/>
+ *
  * The number in the token identifies the ignored section so that it can find it in a stored list.
  *
  * @author bjorn
diff --git a/sorter/src/main/java/sortpom/wrapper/WrapperFactoryImpl.java b/sorter/src/main/java/sortpom/wrapper/WrapperFactoryImpl.java
@@ -20,7 +20,7 @@
 /**
  * Concrete implementation of a wrapper factory that sorts xml according to
  * sort order from fileUtil.
- * <p/>
+ * 
  * Thank you Christian Haelg for your sortProperties patch.
  *
  * @author Bjorn Ekryd

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`/**`
`21`	`21`	`* Concrete implementation of a wrapper factory that sorts xml according to`
`22`	`22`	`* sort order from fileUtil.`
`23`		`- * <p/>`
	`23`	`+ *`
`24`	`24`	`* Thank you Christian Haelg for your sortProperties patch.`
`25`	`25`	`*`
`26`	`26`	`* @author Bjorn Ekryd`