#6241 disabling doclint in javadoc-plugin

[taxeditor.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index b373edb74158d282e1e2da097e544eff2a894ccb..32baa07e10e90f071f68b770cf8b02b6b753dab3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>
+    <javadoc.opts>-Xdoclint:none</javadoc.opts>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>
@@ -151,7 +152,7 @@
     <!-- the cdm internal repository -->
     <repository>
       <id>EditRepository</id>
-      <url>http://wp5.e-taxonomy.eu/mavenrepo/</url>
+      <url>http://cybertaxonomy.eu/mavenrepo/</url>
     </repository>
     <repository>
       <id>eclipse-indigo</id>
@@ -239,6 +240,24 @@
           <source>${java.codelevel}</source>
           <target>${java.codelevel}</target>
         </configuration>
+      </plugin>
+         <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>wagon-maven-plugin</artifactId>
+        <version>1.0</version>
+               <configuration>
+          <url>scpexe://cybertaxonomy.eu</url>
+          <serverId>cybertaxonomy.eu</serverId>
+        </configuration>
+        <executions>
+          <execution>
+            <id>upload-reference-documentation</id>
+            <phase>site-deploy</phase>
+            <goals>
+              <goal>upload</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -274,6 +293,10 @@
         <version>3.3</version>
         <configuration>
           <locales>en</locales>
+          <outputEncoding>UTF-8</outputEncoding>
+          <!-- chmod: not not use chmod, rather adapt the umask of the user 
+            at the server to which the site is deployed -->
+          <chmod>false</chmod>
         </configuration>
       </plugin>
       <plugin>
@@ -299,6 +322,7 @@
           <quiet>true</quiet>
           <detectLinks>true</detectLinks>
           <failOnError>false</failOnError>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
         <executions>
           <execution>
@@ -363,12 +387,12 @@
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-scm</artifactId>
-        <version>1.0-alpha-5</version>
+        <version>1.0-beta-6</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh</artifactId>
-        <version>1.0-beta-7</version>
+        <version>1.0-beta-6</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
@@ -411,6 +435,7 @@
         <version>2.7</version>
         <configuration>
           <detectLinks>true</detectLinks>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
       </plugin>
       <plugin>
@@ -442,16 +467,16 @@
   <!-- DISTRIBUTION MANAGEMENT -->
   <distributionManagement>
     <site>
-      <id>wp5.e-taxonomy.eu</id>
+      <id>cybertaxonomy.eu</id>
       <name>EDIT Taxonomic Editor</name>
-      <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/taxeditor/
+      <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/taxeditor/
       </url>
     </site>
     <repository>
       <uniqueVersion>false</uniqueVersion>
-      <id>wp5.e-taxonomy.eu</id>
+      <id>cybertaxonomy.eu</id>
       <name>Edit Maven Repository</name>
-      <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/
+      <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/
       </url>
     </repository>
   </distributionManagement>