geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r570606 [5/5] - in /geronimo/sandbox/gshell/trunk: ./ gshell-api/ gshell-api/src/main/java/org/apache/geronimo/gshell/command/ gshell-api/src/main/java/org/apache/geronimo/gshell/console/ gshell-api/src/main/java/org/apache/geronimo/gshell/...
Date Wed, 29 Aug 2007 02:17:20 GMT
Propchange: geronimo/sandbox/gshell/trunk/gshell-prefs/src/test/java/org/apache/geronimo/gshell/prefs/PreferencesProcessorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-prefs/src/test/java/org/apache/geronimo/gshell/prefs/PreferencesProcessorTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-prefs/src/test/java/org/apache/geronimo/gshell/prefs/PreferencesProcessorTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml?rev=570606&r1=570605&r2=570606&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml Tue Aug 28 19:17:11 2007
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.codehaus.mojo.groovy</groupId>
             <artifactId>groovy-mojo-support</artifactId>
-            <version>1.0-beta-1</version>
+            <version>1.0-beta-2</version>
         </dependency>
         
         <dependency>
@@ -132,7 +132,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo.groovy</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
-                <version>1.0-beta-1</version>
+                <version>1.0-beta-2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -149,7 +149,7 @@
                     <dependency>
                         <groupId>org.codehaus.mojo.groovy</groupId>
                         <artifactId>groovy-mojo-tools</artifactId>
-                        <version>1.0-beta-1</version>
+                        <version>1.0-beta-2</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?rev=570606&r1=570605&r2=570606&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Tue Aug 28 19:17:11 2007
@@ -58,55 +58,50 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.13</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.4.3</version>
             </dependency>
-
+            
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>3.8.1</version>
-                <scope>test</scope>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.4.3</version>
             </dependency>
 
             <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging-api</artifactId>
-                <version>1.1</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jcl104-over-slf4j</artifactId>
+                <version>1.4.3</version>
             </dependency>
 
             <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging-adapters</artifactId>
-                <version>1.1</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.4.3</version>
             </dependency>
-
+            
             <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.1</version>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.14</version>
             </dependency>
 
             <dependency>
-                <groupId>commons-cli</groupId>
-                <artifactId>commons-cli</artifactId>
-                <version>1.0</version>
-                <exclusions>
-                    <!-- Includes commons-logging-1.0 -->
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.2</version>
+                <scope>test</scope>
             </dependency>
 
+            <!--
             <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.1</version>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.1</version>
             </dependency>
-
+            -->
+            
             <dependency>
                 <groupId>commons-jexl</groupId>
                 <artifactId>commons-jexl</artifactId>
@@ -142,27 +137,12 @@
                 <artifactId>picocontainer</artifactId>
                 <version>1.2</version>
                 <exclusions>
-                    <!-- Includes commons-logging-1.0.4 -->
                     <exclusion>
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
-
-            <!--
-            <dependency>
-                <groupId>picocontainer</groupId>
-                <artifactId>picocontainer-gems</artifactId>
-                <version>1.2</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>picocontainer</groupId>
-                        <artifactId>picocontainer-tck</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            -->
         </dependencies>
     </dependencyManagement>
     
@@ -177,9 +157,16 @@
                 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.3</version>
+                </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>2.3</version>
                     <configuration>
+                        <argLine>-enableassertions:org.apache.geronimo.gshell</argLine>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     </configuration>
                 </plugin>
@@ -194,12 +181,6 @@
                         <linkModules>true</linkModules>
                     </configuration>
                 </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>retrotranslator-maven-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
-                </plugin>
             </plugins>
         </pluginManagement>
         
@@ -245,29 +226,16 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <!--
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>retrotranslator-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>translate-project</goal>
-                        </goals>
-                        <configuration>
-                            <failonwarning>true</failonwarning>
-                            <lazy>true</lazy>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
                 <configuration>
+                    <optimize>true</optimize>
+                    <debug>true</debug>
+                    <showDeprecation>true</showDeprecation>
+                    <showWarnings>true</showWarnings>
                     <source>1.5</source>
                     <target>1.5</target>
                 </configuration>
@@ -294,13 +262,17 @@
     </build>
     
     <modules>
+        <module>gshell-clp</module>
+        <module>gshell-prefs</module>
         <module>gshell-bootstrap</module>
         <module>javacc-maven-plugin</module>
         <module>gshell-api</module>
         <module>gshell-core</module>
         <module>gshell-cli</module>
+        <!--
         <module>gshell-commands</module>
         <module>gshell-testsuite</module>
+        -->
         <module>gshell-assembly</module>
     </modules>
     
@@ -333,15 +305,12 @@
         </site>
     </distributionManagement>
     
-    <!--
-    NOTE: Overridding some reports to configure for JDK 1.5
-    -->
     <reporting>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.0</version>
+                <version>2.3</version>
                 <configuration>
                     <minmemory>128m</minmemory>
                     <maxmemory>512</maxmemory>
@@ -349,29 +318,9 @@
                     <quiet>true</quiet>
                     <verbose>false</verbose>
                     <source>1.5</source>
-                    <!--
-                    FIXME: This worked in m1, but m2 complains about it being an invalid
flag
-                    
-                    <additionalparam>-J-Djava.awt.headless=true</additionalparam>
-                    -->
                     <linksource>true</linksource>
                     <links>
-                        <!-- JSE -->
                         <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                        <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
-                        <link>http://java.sun.com/j2se/1.3/docs/api/</link>
-                        
-                        <!-- JEE -->
-                        <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
-                        <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api/</link>
-                        
-                        <!-- Libraries -->
-                        <link>http://jakarta.apache.org/commons/collections/apidocs</link>
-                        <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
-                        <link>http://www.junit.org/junit/javadoc/</link>
-                        <link>http://logging.apache.org/log4j/docs/api/</link>
-                        <link>http://jakarta.apache.org/regexp/apidocs/</link>
-                        <link>http://jakarta.apache.org/velocity/api/</link>
                     </links>
                 </configuration>
             </plugin>
@@ -379,7 +328,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.2</version>
                 <configuration>
                     <targetJdk>1.5</targetJdk>
                 </configuration>



Mime
View raw message