NOJIRA: Updating misc Maven plugin versions.

diff --git a/pom.xml b/pom.xml
index 771890267e14e727f652c82be8165caa2bc0b1ad..bd2b80ee7a55bec0082063c0b6f5c8d7cb64c87b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
-               <repository>
+               <!-- <repository>
                        <id>maven2-repository.dev.java.net</id>
                        <name>Java.net Maven 2 Repository</name>
                        <url>http://download.java.net/maven/2</url>
@@ -90,7 +90,7 @@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
-               <!-- <repository> <id>maven1-repository.dev.java.net</id> <name>Java.net 
+               <repository> <id>maven1-repository.dev.java.net</id> <name>Java.net 
                        Maven 1 Repository</name> <url>http://download.java.net/maven/1</url> <layout>legacy</layout> 
                        <snapshots> <enabled>false</enabled> </snapshots> </repository> -->
 
@@ -194,6 +194,19 @@
                        <name>External release repository of the Apache projects</name>
                        <url>https://repository.apache.org/content/groups/public/</url>
                </repository>
+           
+           <!-- Global Biodiversity Information Facility - http://www.gbif.org/ -->
+           <repository>
+               <snapshots>
+                   <enabled>false</enabled>
+               </snapshots>
+               <releases>
+                   <enabled>true</enabled>
+               </releases>             
+               <id>gbif-all</id>
+               <name>gbif-all</name>
+               <url>http://repository.gbif.org/content/groups/gbif</url>
+           </repository>           
 
        </repositories>
 
@@ -249,7 +262,7 @@
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.6.1</version>
+                                       <version>2.10.4</version>
                                        <configuration>
                                                <show>public</show>
                                        </configuration>
@@ -478,7 +491,7 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-project-info-reports-plugin</artifactId>
-                               <version>2.6</version>
+                               <version>2.9</version>
                                <configuration>
                                </configuration>
                                <reportSets>

diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml
index 7f74f3909426664eabbebef24a34ae49de768b77..5378056cd335d11d0f886e2fe699100a265e3921 100644 (file)
--- a/services/collectionobject/service/pom.xml
+++ b/services/collectionobject/service/pom.xml
@@ -126,21 +126,30 @@
         <finalName>collectionspace-services-collectionobject</finalName>
         <plugins>
                <plugin>
-            <groupId>com.qmino</groupId>
-            <artifactId>miredot-maven-plugin</artifactId>
-            <version>1.3.1</version>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>restdoc</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-                               <licence>
-                                       UHJvamVjdHxvcmcuY29sbGVjdGlvbnNwYWNlLnNlcnZpY2VzLm9yZy5jb2xsZWN0aW9uc3BhY2Uuc2VydmljZXMuY29sbGVjdGlvbm9iamVjdC5zZXJ2aWNlfDIwMTktMDItMjh8dHJ1ZSNNQ3dDRkdHK29EM2hWTVRyckIveDVaWExNcWRBNWhyL0FoUXo2bkVKV1k1NjdabnFBelh6UFdiOW1iRnVIdz09
-                               </licence>                <!-- insert other configuration here (optional) -->
-            </configuration>
+                   <groupId>com.qmino</groupId>
+                   <artifactId>miredot-plugin</artifactId>
+                   <version>2.0.3</version>
+                   <executions>
+                       <execution>
+                           <goals>
+                               <goal>restdoc</goal>
+                           </goals>
+                       </execution>
+                   </executions>
+                   <configuration>
+                       <organizationId>5427820b-5465-4a49-98fb-cb39ff772f23</organizationId>
+                       <restModel>
+                           <restFramework>
+                               <name>jax-rs</name>
+                           </restFramework>
+                       </restModel>
+                       <output>
+                           <html>
+                               <jsonDoc>Hidden</jsonDoc>
+                           </html>
+                       </output>
+                       <!-- insert other configuration here (optional) -->
+                   </configuration>
          </plugin>
         </plugins>
         <pluginManagement>
@@ -156,12 +165,8 @@
                                                        <pluginExecution>
                                                                <pluginExecutionFilter>
                                                                        <groupId>com.qmino</groupId>
-                                                                       <artifactId>
-                                                                               miredot-maven-plugin
-                                                                       </artifactId>
-                                                                       <versionRange>
-                                                                               [1.3.1,)
-                                                                       </versionRange>
+                                                                   <artifactId>miredot-plugin</artifactId>
+                                                                   <versionRange>[2.0.3,)</versionRange>
                                                                        <goals>
                                                                                <goal>restdoc</goal>
                                                                        </goals>

diff --git a/services/common-api/pom.xml b/services/common-api/pom.xml
index 00dc26c02da4c58541b319e001b6503f860330c3..54ad7f59bedf1b8880cfbda6281c448839abbfdd 100644 (file)
--- a/services/common-api/pom.xml
+++ b/services/common-api/pom.xml
@@ -47,15 +47,5 @@
             <version>1.1.6</version>
         </dependency>
     </dependencies>
-    
-    <!-- Global Biodiversity Information Facility - http://www.gbif.org/ -->
-    <repositories>
-        <repository>
-            <id>gbif-all</id>
-            <name>gbif-all</name>
-            <url>http://repository.gbif.org/content/groups/gbif</url>
-        </repository>
-    </repositories>
-
 </project>
 

diff --git a/services/pom.xml b/services/pom.xml
index 18db60a1ef591a2acc54e7dee5d7e927caf5453e..cf32a136ff510b427e9c1f117a37486e91d78eec 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -135,7 +135,7 @@
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-site-plugin</artifactId>
-                                       <version>2.2</version>
+                                       <version>3.3</version>
                                </plugin>                               
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -248,7 +248,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.6.1</version>
                 <configuration>
                     <!--show>public</show-->
                 </configuration>
@@ -271,17 +270,16 @@
                      <onlyAnalyze>org.collectionspace.*</onlyAnalyze>
                 </configuration>
             </plugin-->
-            <plugin>
+            <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.0.1</version>
+                <version>3.0.1</version>
                 <configuration>
                     <onlyAnalyze>org.collectionspace.*</onlyAnalyze>
                     <findbugsXmlOutput>true</findbugsXmlOutput>
-                    <!-- Optional directory to put findbugs xml report -->
                     <findbugsXmlOutputDirectory>target/site</findbugsXmlOutputDirectory>
                 </configuration>
-            </plugin>
+            </plugin>-->
 
         </plugins>
     </reporting>

diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml
index 68087464f7cac07e7fb6ce474fdaa2e3ad0a635d..3bb97d1ce1787ed88c48ea75dfb9a7e0d338e35c 100644 (file)
--- a/services/security/client/pom.xml
+++ b/services/security/client/pom.xml
@@ -110,10 +110,10 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <property name="runtime-classpath" refid="maven.runtime.classpath"/>
                                 <ant target="setup_hibernate.cfg" inheritRefs="true"/>
-                            </tasks>
+                            </target>
                         </configuration>
                     </execution>
                 </executions>