commit 3485be63b4281abb06085998a901ad359eb32342
author Ethan Jewett <esjewett@apache.org> Sun Mar 04 13:58:31 2012 +0000
committer Ethan Jewett <esjewett@apache.org> Sun Mar 04 13:58:31 2012 +0000
tree 323b073a7e7289edcf19b5b5d3efad8e6df9b780
parent 9a27774386a378bab41550b75f0cb7f5a79f9854

Fixes the build, but now we have test failures.

git-svn-id: https://svn.apache.org/repos/asf/esme/trunk@1296807 13f79535-47bb-0310-9956-ffa450edef68

server/pom.xml

diff --git a/server/pom.xml b/server/pom.xml
index 964d370..9178490 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -79,7 +79,8 @@
         <compass.version>2.1.1</compass.version>

         <lucene.version>2.4.0</lucene.version>

         <netbeans.hint.deploy.server>gfv3</netbeans.hint.deploy.server>

-        <scala.stats.version>1.3</scala.stats.version>

+        <scala.stats.version>1.3</scala.stats.version>    

+        <mortbay.jetty.version>6.1.22</mortbay.jetty.version>

     </properties>

 

     <repositories>

@@ -118,7 +119,6 @@
              <id>Apache Repo</id> 

               <name>Apache repository for Derby 10.5.1.1</name> 

               <url>http://people.apache.org/repo/m1-ibiblio-rsync-repository</url> 

-              <layout>legacy</layout> 

             </repository>           

     </repositories>

 

@@ -232,13 +232,7 @@
             <groupId>org.apache.derby</groupId>

             <artifactId>derby</artifactId>

             <version>10.5.3.0_1</version>

-        </dependency>       

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>3.8.1</version>

-            <scope>test</scope>

-        </dependency>     

+        </dependency>          

         <dependency>

           <groupId>org.eclipse.jetty</groupId>

             <artifactId>jetty-server</artifactId>

@@ -252,7 +246,7 @@
         <dependency>

           <groupId>org.mortbay.jetty</groupId>

             <artifactId>jetty</artifactId>

-            <version>[6.1.6,)</version>

+            <version>${mortbay.jetty.version}</version>

             <scope>test</scope>

         </dependency>

         <dependency>

@@ -321,6 +315,7 @@
             <plugin>

                 <groupId>org.apache.rat</groupId>

                 <artifactId>apache-rat-plugin</artifactId>

+                <version>0.8</version>

             </plugin>

             <plugin>

                 <groupId>org.scala-tools</groupId>

@@ -344,6 +339,7 @@
             <plugin>

                 <groupId>org.mortbay.jetty</groupId>

                 <artifactId>maven-jetty-plugin</artifactId>

+                <version>${mortbay.jetty.version}</version>

                 <configuration>

                     <contextPath>/</contextPath>

                     <scanIntervalSeconds>0</scanIntervalSeconds>

@@ -351,7 +347,8 @@
             </plugin>

             <plugin>

                 <groupId>net.sf.alchim</groupId>

-                <artifactId>yuicompressor-maven-plugin</artifactId>

+                <artifactId>yuicompressor-maven-plugin</artifactId>  

+                <version>0.7.1</version>

                 <executions>

                     <execution>

                         <goals>

@@ -367,7 +364,8 @@
             </plugin>

             <plugin>

                 <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-eclipse-plugin</artifactId>

+                <artifactId>maven-eclipse-plugin</artifactId> 

+                <version>2.9</version>

                 <configuration>

                     <downloadSources>true</downloadSources>

                     <excludes>

@@ -405,13 +403,13 @@
                 <dependency>

                   <groupId>org.mortbay.jetty</groupId>

                     <artifactId>jetty-plus</artifactId>

-                    <version>[6.1.6,)</version>

+                    <version>${mortbay.jetty.version}</version>

                     <scope>compile</scope>

                 </dependency>

                 <dependency>

                   <groupId>org.mortbay.jetty</groupId>

                     <artifactId>jetty-ldap-jaas</artifactId>

-                    <version>[6.1.6,)</version>

+                    <version>${mortbay.jetty.version}</version>

                     <scope>compile</scope>

                 </dependency>

             </dependencies>

@@ -467,7 +465,8 @@
         <plugins>

             <plugin>

                 <groupId>org.scala-tools</groupId>

-                <artifactId>maven-scala-plugin</artifactId>

+                <artifactId>maven-scala-plugin</artifactId> 

+                <version>2.14.1</version>

                 <configuration>

                     <jvmArgs>

                         <jvmArg>-Xmx1024m</jvmArg>