From 2d249c3463266c6523f8871303a8bcc482cb2718 Mon Sep 17 00:00:00 2001
From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Sat, 25 Jul 2009 00:20:36 +0000
Subject: [PATCH] NOJIRA requires JDK 1.6 for build. @Override behavior is
 different between 1.5  and 1.6.

---
 services/authentication/pom.xml           |  5 +++--
 services/client/pom.xml                   |  5 +++--
 services/collectionobject/client/pom.xml  |  5 +++--
 services/collectionobject/jaxb/pom.xml    |  5 +++--
 services/collectionobject/service/pom.xml |  5 +++--
 services/common/pom.xml                   |  5 +++--
 services/id/jaxb/pom.xml                  |  9 +++++----
 services/id/service/pom.xml               |  7 ++++---
 services/intake/client/pom.xml            |  5 +++--
 services/intake/jaxb/pom.xml              |  5 +++--
 services/intake/service/pom.xml           |  6 ++++--
 services/pom.xml                          | 13 ++++++++++++-
 services/relation/pom.xml                 | 12 ++++++++++++
 13 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml
index 6d82475f6..4c0f9a475 100644
--- a/services/authentication/pom.xml
+++ b/services/authentication/pom.xml
@@ -57,10 +57,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 </project>
+
diff --git a/services/client/pom.xml b/services/client/pom.xml
index 69686f3f5..59f730978 100644
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -70,10 +70,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 </project>
+
diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index 29bb3c079..0e946af98 100644
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -90,10 +90,11 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.0.2</version>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 </project>
+
diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index 71979f68b..15d479b37 100644
--- a/services/collectionobject/jaxb/pom.xml
+++ b/services/collectionobject/jaxb/pom.xml
@@ -95,10 +95,11 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.0.2</version>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 </project>
+
diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml
index a040d515c..4be97215e 100644
--- a/services/collectionobject/service/pom.xml
+++ b/services/collectionobject/service/pom.xml
@@ -145,10 +145,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 </project>
+
diff --git a/services/common/pom.xml b/services/common/pom.xml
index ec0232a6c..addbb8400 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -239,10 +239,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 </project>
+
diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml
index ef504fbee..c8b1a545a 100644
--- a/services/id/jaxb/pom.xml
+++ b/services/id/jaxb/pom.xml
@@ -118,12 +118,13 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.0.2</version>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.6</source>
+          <target>1.6</target>
         </configuration>
       </plugin>
-      
+
     </plugins>
   </build>
-  
+
 </project>
+
diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml
index 726aff8f0..5c4467197 100644
--- a/services/id/service/pom.xml
+++ b/services/id/service/pom.xml
@@ -195,11 +195,12 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.6</source>
+          <target>1.6</target>
         </configuration>
       </plugin>
     </plugins>
   </build>
-  
+
 </project>
+
diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml
index 3a5b3072d..ddbbeec36 100644
--- a/services/intake/client/pom.xml
+++ b/services/intake/client/pom.xml
@@ -78,10 +78,11 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.0.2</version>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 </project>
+
diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml
index 59a61d8fa..d2528a044 100644
--- a/services/intake/jaxb/pom.xml
+++ b/services/intake/jaxb/pom.xml
@@ -95,10 +95,11 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.0.2</version>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 </project>
+
diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml
index d9778ad46..a95c0f37f 100644
--- a/services/intake/service/pom.xml
+++ b/services/intake/service/pom.xml
@@ -126,10 +126,12 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                    <showDeprecation>true</showDeprecation>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 </project>
+
diff --git a/services/pom.xml b/services/pom.xml
index a960c051d..388287501 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -133,6 +133,17 @@
 
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
     <dependencyManagement>
         <dependencies>
@@ -201,4 +212,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/services/relation/pom.xml b/services/relation/pom.xml
index b7f154db5..2efad1e23 100644
--- a/services/relation/pom.xml
+++ b/services/relation/pom.xml
@@ -55,5 +55,17 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
+
-- 
2.47.3