geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r564060 - in /geronimo/plugins/directory/trunk: geronimo-directory/pom.xml pom.xml
Date Thu, 09 Aug 2007 00:48:08 GMT
Author: djencks
Date: Wed Aug  8 17:48:08 2007
New Revision: 564060

URL: http://svn.apache.org/viewvc?view=rev&rev=564060
Log:
GERONIMO-3340 a bit of cleanup inspired by the apacheds 1.5.0 version

Modified:
    geronimo/plugins/directory/trunk/geronimo-directory/pom.xml
    geronimo/plugins/directory/trunk/pom.xml

Modified: geronimo/plugins/directory/trunk/geronimo-directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/geronimo-directory/pom.xml?view=diff&rev=564060&r1=564059&r2=564060
==============================================================================
--- geronimo/plugins/directory/trunk/geronimo-directory/pom.xml (original)
+++ geronimo/plugins/directory/trunk/geronimo-directory/pom.xml Wed Aug  8 17:48:08 2007
@@ -43,9 +43,11 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+
+        <!-- use of real logging may result in test failures -->
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-nop</artifactId>
         </dependency>
 
         <dependency>
@@ -56,7 +58,6 @@
         <dependency>
           <groupId>org.apache.directory.daemon</groupId>
           <artifactId>daemon-bootstrappers</artifactId>
-          <!--<version>1.1.1-SNAPSHOT</version>-->
         </dependency>
 
         <dependency>
@@ -91,30 +92,5 @@
 
     </dependencies>
     
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <tstamp/>
-                                <mkdir dir="${project.build.directory}/var"/>
-                                <copy file="${pom.basedir}/src/test/resources/server.xml"
-                                    todir="${project.build.directory}/var"/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
 

Modified: geronimo/plugins/directory/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/pom.xml?view=diff&rev=564060&r1=564059&r2=564060
==============================================================================
--- geronimo/plugins/directory/trunk/pom.xml (original)
+++ geronimo/plugins/directory/trunk/pom.xml Wed Aug  8 17:48:08 2007
@@ -113,33 +113,19 @@
                 <artifactId>slf4j-log4j12</artifactId>
                 <version>1.4.0</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-nop</artifactId>
+                <version>1.4.0</version>
+            </dependency>
+
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>3.8.1</version>
             </dependency>
-            <!--<dependency>-->
-                <!--<groupId>jdbm</groupId>-->
-                <!--<artifactId>jdbm</artifactId>-->
-                <!--<version>0.20-dev</version>-->
-            <!--</dependency>-->
-            <!--<dependency>-->
-              <!--<groupId>org.apache.directory.server</groupId>-->
-              <!--<artifactId>apacheds-server-jndi</artifactId>-->
-                <!--<version>1.5.1-SNAPSHOT</version>-->
-            <!--</dependency>-->
-            <!--<dependency>-->
-              <!--<groupId>org.apache.directory.server</groupId>-->
-              <!--<artifactId>apacheds-core</artifactId>-->
-                <!--<version>1.5.1-SNAPSHOT</version>-->
-            <!--</dependency>-->
-<!---->
-            <!--<dependency>-->
-              <!--<groupId>org.apache.directory.daemon</groupId>-->
-              <!--<artifactId>daemon-bootstrappers</artifactId>-->
-              <!--<version>1.1.1-SNAPSHOT</version>-->
-            <!--</dependency>-->
-<!---->
+
             <dependency>
               <groupId>org.apache.xbean</groupId>
               <artifactId>xbean-spring</artifactId>
@@ -151,6 +137,7 @@
                 <artifactId>spring</artifactId>
                 <version>2.0.5</version>
             </dependency>
+
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
@@ -230,11 +217,6 @@
                 <artifactId>apacheds-protocol-changepw</artifactId>
                 <version>1.5.1-SNAPSHOT</version>
             </dependency>
-            <!--<dependency>-->
-            <!--<groupId>org.apache.directory.server</groupId>-->
-            <!--<artifactId>apacheds-protocol-dhcp</artifactId>-->
-            <!--<version>1.5.1-SNAPSHOT</version>-->
-            <!--</dependency>-->
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-dns</artifactId>
@@ -349,31 +331,6 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>selenium-maven-plugin</artifactId>
-                    <version>1.0-beta-2-SNAPSHOT</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>xmlbeans-maven-plugin</artifactId>
-                    <version>2.3.1</version>
-
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>xmlbeans</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-
-                    <configuration>
-                        <download>true</download>
-                        <quiet>false</quiet>
-                    </configuration>
-                </plugin>
-
-                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
                     <configuration>
@@ -471,7 +428,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
                 <configuration>
-                    <tagBase>https://svn.apache.org/repos/asf/geronimo/server/tags</tagBase>
+                    <tagBase>https://svn.apache.org/repos/asf/geronimo/plugins/directory/tags</tagBase>
                 </configuration>
             </plugin>
         </plugins>



Mime
View raw message