#31 fixed API doc generation and misc other Maven-related conf

fusesource · Mar 5, 2017 · cd20329 · cd20329
1 parent 401ce1c
commit cd20329
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 60 deletions.
diff --git a/hawtjni-example/pom.xml b/hawtjni-example/pom.xml
@@ -24,16 +24,14 @@
     <version>1.15-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.fusesource.hawtjni</groupId>
   <artifactId>hawtjni-example</artifactId>
-  <version>1.15-SNAPSHOT</version>
   <name>HawtJNI Example</name>
 
   <dependencies>
     <dependency>
       <groupId>org.fusesource.hawtjni</groupId>
       <artifactId>hawtjni-runtime</artifactId>
-      <version>1.15-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/hawtjni-generator/pom.xml b/hawtjni-generator/pom.xml
@@ -24,9 +24,7 @@
     <version>1.15-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.fusesource.hawtjni</groupId>
   <artifactId>hawtjni-generator</artifactId>
-  <version>1.15-SNAPSHOT</version>
 
   <name>HawtJNI Generator</name>
   <description>This module contains the JNI code generation tools.</description>
@@ -35,7 +33,7 @@
     <dependency>
       <groupId>org.fusesource.hawtjni</groupId>
       <artifactId>hawtjni-runtime</artifactId>
-      <version>1.15-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <artifactId>xbean-finder</artifactId>    

diff --git a/hawtjni-runtime/pom.xml b/hawtjni-runtime/pom.xml
@@ -24,10 +24,7 @@
     <version>1.15-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.fusesource.hawtjni</groupId>
   <artifactId>hawtjni-runtime</artifactId>
-  <version>1.15-SNAPSHOT</version>
-
   <name>HawtJNI Runtime</name>
   <description>The API that projects using HawtJNI should build against.</description>
 
@@ -36,11 +33,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/hawtjni-website/pom.xml b/hawtjni-website/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.fusesource.hawtjni</groupId>
     <artifactId>hawtjni-project</artifactId>
-    <version>1.12-SNAPSHOT</version>
+    <version>1.15-SNAPSHOT</version>
   </parent>
 
   <artifactId>hawtjni-website</artifactId>
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>org.fusesource.hawtjni</groupId>
       <artifactId>hawtjni-runtime</artifactId>
-      <version>1.12-SNAPSHOT</version>
+      <version>${project.version}</version>
       <classifier>javadoc</classifier>
       <scope>test</scope>
     </dependency>

diff --git a/maven-hawtjni-plugin/pom.xml b/maven-hawtjni-plugin/pom.xml
@@ -24,9 +24,7 @@
     <version>1.15-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.fusesource.hawtjni</groupId>
   <artifactId>maven-hawtjni-plugin</artifactId>
-  <version>1.15-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>HawtJNI Maven Plugin</name>
@@ -45,7 +43,7 @@
     <dependency>
       <groupId>org.fusesource.hawtjni</groupId>
       <artifactId>hawtjni-generator</artifactId>
-      <version>1.15-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
 
     <!-- Maven -->
@@ -123,13 +121,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-maven-plugin</artifactId>
@@ -146,9 +137,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.6</version>        
         <configuration>
-          <encoding>${project.build.sourceEncoding}</encoding>
           <tagletArtifacts>
             <tagletArtifact>
               <groupId>org.apache.maven.plugin-tools</groupId>
@@ -162,5 +151,4 @@
     </plugins>
   </build>
 
-
 </project>
diff --git a/pom.xml b/pom.xml
@@ -44,7 +44,7 @@
     <scala-version>2.9.0-1</scala-version>
   </properties>
 
-  <url>http://${forge-project-id}.fusesource.org</url>
+  <url>http://fusesource.github.io/${forge-project-id}</url>
   <inceptionYear>2009</inceptionYear>
 
   <issueManagement>
@@ -84,10 +84,10 @@
   </licenses>
 
   <scm>
-    <connection>scm:git:git://forge.fusesource.com/${forge-project-id}.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com:fusesources/hawtjni.git</developerConnection>
-    <url>http://fusesource.com/forge/gitweb?p=${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>
@@ -116,15 +116,40 @@
   <build>
     <defaultGoal>install</defaultGoal>
 
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <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-surefire-plugin</artifactId>
+          <version>2.4.3</version>
+          <configuration>
+            <failIfNoTests>false</failIfNoTests>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.6.1</version>
+          <configuration>
+            <encoding>${project.build.sourceEncoding}</encoding>
+            <excludePackageNames>*.internal</excludePackageNames>
+            <linksource>true</linksource>
+            <links>
+              <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+            </links>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -145,16 +170,6 @@
           <downloadJavadocs>true</downloadJavadocs>
         </configuration>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-        </configuration>
-      </plugin>
-
     </plugins>
   </build>
 
@@ -171,14 +186,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.6.1</version>
-        <configuration>
-          <excludePackageNames>*.internal</excludePackageNames>
-          <linksource>true</linksource>
-          <links>
-            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-          </links>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>