Merge branch 'hboutemy-APIdoc'

fusesource · Mar 13, 2017 · 87da527 · 87da527
2 parents eeda18c + 0acd7e5
commit 87da527
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 54 deletions.
diff --git a/example/pom.xml b/example/pom.xml
@@ -19,14 +19,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>

diff --git a/jansi-website/pom.xml b/jansi-website/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.fusesource.jansi</groupId>
     <artifactId>jansi-project</artifactId>
-    <version>1.12</version>
+    <version>1.14-SNAPSHOT</version>
   </parent>
 
   <artifactId>jansi-website</artifactId>
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi</artifactId>
-      <version>1.12-SNAPSHOT</version>
+      <version>${project.version}</version>
       <classifier>javadoc</classifier>
       <scope>test</scope>
     </dependency>

diff --git a/jansi/pom.xml b/jansi/pom.xml
@@ -121,14 +121,6 @@
             </includes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
 
       <plugin>
         <groupId>org.apache.felix</groupId>
@@ -168,11 +160,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-
-        <configuration>
-          <encoding>${project.build.sourceEncoding}</encoding>
-        </configuration>
-
         <executions>
           <execution>
             <id>attach-javadocs</id>

diff --git a/pom.xml b/pom.xml
@@ -51,7 +51,7 @@
 
   <issueManagement>
     <system>jira</system>
-    <url>http://fusesource.com/issues/browse/${forge-project-id-uc}</url>
+    <url>https://github.com/fusesource/${forge-project-id}/issues</url>
   </issueManagement>
 
   <mailingLists>
@@ -80,11 +80,10 @@
   </licenses>
 
   <scm>
-    <connection>scm:git:git://github.com/fusesource/${forge-project-id}.git</connection>
-    <!-- Work around for issue: http://jira.codehaus.org/browse/SCM-444 -->
-    <developerConnection>scm:git:ssh://git@github.com:fusesources/jansi.git</developerConnection>
-    <url>http://github.com/fusesource/{forge-project-id}.git</url>
-    <tag>HEAD</tag>
+    <connection>scm:git:https://github.com/fusesource/${forge-project-id}.git</connection>
+    <developerConnection>scm:git:https://github.com/fusesource/${forge-project-id}.git</developerConnection>
+    <url>https://github.com/fusesource/${forge-project-id}/tree/${project.scm.tag}</url>
+    <tag>master</tag>
   </scm>
 
   <distributionManagement>
@@ -118,11 +117,41 @@
         <version>1.9</version>
       </extension>
     </extensions>
+
+    <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>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.7</version>
+          <configuration>
+            <doctitle>${project.name} API Reference (${project.version})</doctitle>
+            <windowtitle>${project.name} API Reference (${project.version})</windowtitle>
+            <links>
+              <link>http://download.oracle.com/javase/6/docs/api</link>
+            </links>
+            <encoding>UTF-8</encoding>
+            <locale>en_US</locale>
+            <linksource>true</linksource>
+            <excludePackageNames>*.internal</excludePackageNames>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.3</version>
         <executions>
          <execution>
            <id>attach-descriptor</id>
@@ -159,7 +188,6 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-javadoc-plugin</artifactId>
-              <version>2.7</version>
               <configuration>
                 <charset>UTF-8</charset>
                 <docencoding>UTF-8</docencoding>
@@ -177,16 +205,6 @@
                   </resourcesArtifact>
                 </resourcesArtifacts>
                 -->
-
-                <doctitle>${project.name} API Reference (${project.version})</doctitle>
-                <windowtitle>${project.name} API Reference (${project.version})</windowtitle>
-                <links>
-                  <link>http://download.oracle.com/javase/6/docs/api</link>
-                </links>
-                <encoding>UTF-8</encoding>
-                <locale>en_US</locale>
-                <linksource>true</linksource>
-                <excludePackageNames>*.internal</excludePackageNames>
               </configuration>
 
             </plugin> 
@@ -256,8 +274,6 @@
           <releases><enabled>true</enabled></releases>
         </repository>
       </repositories>
-
-
     </profile>
 
     <profile>
@@ -267,7 +283,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.7</version>
 
             <executions>
               <execution>
@@ -295,16 +310,6 @@
                 </resourcesArtifact>
               </resourcesArtifacts>
               -->
-
-              <doctitle>${project.name} API Reference (${project.version})</doctitle>
-              <windowtitle>${project.name} API Reference (${project.version})</windowtitle>
-              <links>
-                <link>http://download.oracle.com/javase/6/docs/api</link>
-              </links>
-              <encoding>UTF-8</encoding>
-              <locale>en_US</locale>
-              <linksource>true</linksource>
-              <excludePackageNames>*.internal</excludePackageNames>
             </configuration>
           </plugin>