geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r535400 - in /geronimo/sandbox/gshell/trunk: ./ gshell-api/ gshell-api/src/main/resources/org/apache/geronimo/gshell/util/ gshell-assemblies/gshell-complete-assembly/ gshell-assemblies/gshell-retro-assembly/ gshell-assemblies/gshell-squeeze...
Date Fri, 04 May 2007 22:48:52 GMT
Author: jdillon
Date: Fri May  4 15:48:50 2007
New Revision: 535400

URL: http://svn.apache.org/viewvc?view=rev&rev=535400
Log:
Commit some long pending build updates

Modified:
    geronimo/sandbox/gshell/trunk/gshell-api/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-api/src/main/resources/org/apache/geronimo/gshell/util/version.properties
    geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-retro-assembly/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-squeezed-assembly/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-gbean/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-ssh/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml
    geronimo/sandbox/gshell/trunk/pom.xml

Modified: geronimo/sandbox/gshell/trunk/gshell-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-api/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-api/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-api/pom.xml Fri May  4 15:48:50 2007
@@ -35,66 +35,13 @@
     <name>GShell API</name>
     
     <dependencies>
-        
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
         </dependency>
-        
     </dependencies>
     
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>retrotranslator-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>translate</goal>
-                        </goals>
-                        <configuration>
-                            <verify>false</verify>
-                            <failonwarning>true</failonwarning>
-                            <lazy>true</lazy>
-                            <verbose>false</verbose>
-                            <destjar>${pom.basedir}/target/${pom.artifactId}-${pom.version}-retro.jar</destjar>
-                            <includes>
-                                <include>
-                                    <directory>${pom.basedir}/target</directory>
-                                    <pattern>${pom.artifactId}-${pom.version}.jar</pattern>
-                                </include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${pom.basedir}/target/${pom.artifactId}-${pom.version}-retro.jar</file>
-                                    <type>jar</type>
-                                    <classifier>retro</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        
         <resources>
             <resource>
                 <directory>${pom.basedir}/src/main/resources</directory>

Modified: geronimo/sandbox/gshell/trunk/gshell-api/src/main/resources/org/apache/geronimo/gshell/util/version.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-api/src/main/resources/org/apache/geronimo/gshell/util/version.properties?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-api/src/main/resources/org/apache/geronimo/gshell/util/version.properties
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-api/src/main/resources/org/apache/geronimo/gshell/util/version.properties
Fri May  4 15:48:50 2007
@@ -21,4 +21,4 @@
 ## $Rev$ $Date$
 ##
 
-version=${pom.version}
+version=${version}

Modified: geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/pom.xml Fri May
 4 15:48:50 2007
@@ -36,47 +36,46 @@
     <packaging>application-assembly</packaging>
     
     <dependencies>
-        
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
         
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-cli</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-server-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-server-telnet</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-standard-commands</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-scripting-commands</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-vfs-commands</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <!-- Thridparty Dependencies -->
@@ -93,12 +92,10 @@
             <version>2.0b4</version>
             <type>jar</type>
         </dependency>
-        
     </dependencies>
     
     <build>
         <plugins>
-            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -116,10 +113,10 @@
                     <descriptors>
                         <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
                     </descriptors>
-                    <finalName>gshell-${pom.version}</finalName>
+                    <finalName>gshell-${version}</finalName>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
+
 </project>

Modified: geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-retro-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-retro-assembly/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-retro-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-retro-assembly/pom.xml Fri May
 4 15:48:50 2007
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-assembly</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>pom</type>
         </dependency>
         
@@ -70,7 +70,7 @@
                                 <artifactItem>
                                     <groupId>${pom.groupId}</groupId>
                                     <artifactId>gshell-assembly</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                     <type>zip</type>
                                     <classifier>bin</classifier>
                                 </artifactItem>
@@ -94,7 +94,7 @@
                         <configuration>
                             <tasks>
                                 <copy todir="${pom.basedir}/target/scratch/gshell">
-                                    <fileset dir="${pom.basedir}/target/scratch/gshell-${pom.version}">
+                                    <fileset dir="${pom.basedir}/target/scratch/gshell-${version}">
                                         <include name="**"/>
                                     </fileset>
                                 </copy>
@@ -120,7 +120,7 @@
                             <verbose>false</verbose>
                             <includes>
                                 <include>
-                                    <directory>${pom.basedir}/target/scratch/gshell-${pom.version}</directory>
+                                    <directory>${pom.basedir}/target/scratch/gshell-${version}</directory>
                                     <pattern>**/*.jar</pattern>
                                 </include>
                             </includes>
@@ -144,7 +144,7 @@
                     <descriptors>
                         <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
                     </descriptors>
-                    <finalName>gshell-${pom.version}-retro</finalName>
+                    <finalName>gshell-${version}-retro</finalName>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-squeezed-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-squeezed-assembly/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-squeezed-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-squeezed-assembly/pom.xml Fri May
 4 15:48:50 2007
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-assembly</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>pom</type>
         </dependency>
     </dependencies>
@@ -65,7 +65,7 @@
                                 <artifactItem>
                                     <groupId>${pom.groupId}</groupId>
                                     <artifactId>gshell-assembly</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                     <type>zip</type>
                                     <classifier>bin</classifier>
                                 </artifactItem>
@@ -92,7 +92,7 @@
                 <configuration>
                     <includes>
                         <include>
-                            <directory>${pom.basedir}/target/scratch/gshell-${pom.version}/lib</directory>
+                            <directory>${pom.basedir}/target/scratch/gshell-${version}/lib</directory>
                             <pattern>gshell*.jar</pattern>
                         </include>
                     </includes>
@@ -110,18 +110,18 @@
                         <configuration>
                             <tasks>
                                 <copy todir="${pom.basedir}/target/scratch/gshell">
-                                    <fileset dir="${pom.basedir}/target/scratch/gshell-${pom.version}">
+                                    <fileset dir="${pom.basedir}/target/scratch/gshell-${version}">
                                         <include name="**"/>
                                         <exclude name="lib/*.jar"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="${pom.basedir}/target/scratch/gshell/lib">
-                                    <fileset dir="${pom.basedir}/target/scratch/gshell-${pom.version}/lib">
+                                    <fileset dir="${pom.basedir}/target/scratch/gshell-${version}/lib">
                                         <include name="gshell*.jar"/>
                                     </fileset>
                                 </copy>
                                 <!--
-                                <copy todir="${pom.basedir}/target/scratch/gshell-${pom.version}/lib">
+                                <copy todir="${pom.basedir}/target/scratch/gshell-${version}/lib">
                                     <fileset dir="${pom.basedir}/target/minijar">
                                         <include name="*-minimal.jar"/>
                                         <exclude name="gshell*.jar"/>
@@ -151,7 +151,7 @@
                     <descriptors>
                         <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
                     </descriptors>
-                    <finalName>gshell-${pom.version}-squeezed</finalName>
+                    <finalName>gshell-${version}-squeezed</finalName>
                 </configuration>
             </plugin>
              

Modified: geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml Fri May  4 15:48:50 2007
@@ -33,73 +33,18 @@
     
     <artifactId>gshell-cli</artifactId>
     <name>GShell CLI</name>
-    <packaging>jar</packaging>
     
     <dependencies>
-        
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>classworlds</groupId>
             <artifactId>classworlds</artifactId>
         </dependency>
-        
     </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>retrotranslator-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>translate</goal>
-                        </goals>
-                        <configuration>
-                            <verify>false</verify>
-                            <failonwarning>true</failonwarning>
-                            <lazy>true</lazy>
-                            <verbose>false</verbose>
-                            <destjar>${pom.basedir}/target/${pom.artifactId}-${pom.version}-retro.jar</destjar>
-                            <includes>
-                                <include>
-                                    <directory>${pom.basedir}/target</directory>
-                                    <pattern>${pom.artifactId}-${pom.version}.jar</pattern>
-                                </include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${pom.basedir}/target/${pom.artifactId}-${pom.version}-retro.jar</file>
-                                    <type>jar</type>
-                                    <classifier>retro</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+
 </project>

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml Fri May
 4 15:48:50 2007
@@ -33,15 +33,16 @@
     
     <artifactId>gshell-scripting-commands</artifactId>
     <name>GShell Commands :: Scripting</name>
-    <packaging>jar</packaging>
 
     <dependencies>
-
-        <!-- FIXME: Need to abstract InteractiveConsole and move it to API, until then
depend on core -->
+        <!--
+            FIXME: Need to abstract InteractiveConsole and move it to API, until
+                   then depend on core.
+        -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
@@ -49,7 +50,6 @@
             <artifactId>bsf</artifactId>
             <version>2.3.0</version>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/pom.xml Fri May
 4 15:48:50 2007
@@ -33,6 +33,5 @@
     
     <artifactId>gshell-standard-commands</artifactId>
     <name>GShell Commands :: Standard</name>
-    <packaging>jar</packaging>
     
 </project>

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml Fri May  4 15:48:50
2007
@@ -33,14 +33,12 @@
     
     <artifactId>gshell-vfs-commands</artifactId>
     <name>GShell Commands :: VFS</name>
-    <packaging>jar</packaging>
 
     <dependencies>
-        
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-api</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
         
         <dependency>
@@ -48,7 +46,6 @@
             <artifactId>commons-vfs</artifactId>
             <version>20050307052300</version>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml Fri May  4 15:48:50 2007
@@ -36,13 +36,11 @@
     <packaging>pom</packaging>
     
     <dependencies>
-        
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-api</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
-        
     </dependencies>
     
     <modules>

Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Fri May  4 15:48:50 2007
@@ -33,14 +33,12 @@
     
     <artifactId>gshell-core</artifactId>
     <name>GShell Core</name>
-    <packaging>jar</packaging>
     
     <dependencies>
-        
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-api</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
@@ -62,7 +60,6 @@
             <groupId>commons-jexl</groupId>
             <artifactId>commons-jexl</artifactId>
         </dependency>
-        
     </dependencies>
 
     <build>
@@ -151,9 +148,9 @@
                             <tasks>
                                 <delete>
                                     <fileset dir="${pom.basedir}/target/generated-sources/jjtree">
-                                        <include name="ASTPlainString.java" />
-                                        <include name="ASTQuotedString.java" />
-                                        <include name="ASTOpaqueString.java" />
+                                        <include name="ASTPlainString.java"/>
+                                        <include name="ASTQuotedString.java"/>
+                                        <include name="ASTOpaqueString.java"/>
                                     </fileset>
                                 </delete>
                             </tasks>
@@ -195,55 +192,6 @@
                         <goals>
                             <goal>run</goal>
                         </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>retrotranslator-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>translate</goal>
-                        </goals>
-                        <configuration>
-                            <verify>false</verify>
-                            <failonwarning>true</failonwarning>
-                            <lazy>true</lazy>
-                            <verbose>false</verbose>
-                            <destjar>${pom.basedir}/target/${pom.artifactId}-${pom.version}-retro.jar</destjar>
-                            <includes>
-                                <include>
-                                    <directory>${pom.basedir}/target</directory>
-                                    <pattern>${pom.artifactId}-${pom.version}.jar</pattern>
-                                </include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${pom.basedir}/target/${pom.artifactId}-${pom.version}-retro.jar</file>
-                                    <type>jar</type>
-                                    <classifier>retro</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-core/pom.xml Fri May  4 15:48:50
2007
@@ -33,21 +33,18 @@
     
     <artifactId>gshell-server-core</artifactId>
     <name>GShell Server :: Core</name>
-    <packaging>jar</packaging>
 
     <dependencies>
-        
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-gbean/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-gbean/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-gbean/pom.xml Fri May  4 15:48:50
2007
@@ -33,22 +33,19 @@
     
     <artifactId>gshell-server-gbean</artifactId>
     <name>GShell Server :: GBean</name>
-    <packaging>jar</packaging>
 
     <dependencies>
-        
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-server-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
         
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-server-telnet</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-ssh/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-ssh/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-ssh/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-ssh/pom.xml Fri May  4 15:48:50
2007
@@ -33,13 +33,12 @@
     
     <artifactId>gshell-server-ssh</artifactId>
     <name>GShell Server :: SSH</name>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-server-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-server/gshell-server-telnet/pom.xml Fri May  4 15:48:50
2007
@@ -33,14 +33,12 @@
     
     <artifactId>gshell-server-telnet</artifactId>
     <name>GShell Server :: Telnet</name>
-    <packaging>jar</packaging>
 
     <dependencies>
-        
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-server-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <!--
@@ -57,7 +55,6 @@
             <groupId>nvt4j</groupId>
             <artifactId>nvt4j</artifactId>
         </dependency>
-        
     </dependencies>
     
     <repositories>

Modified: geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml Fri May  4 15:48:50 2007
@@ -33,46 +33,43 @@
     
     <artifactId>gshell-testsuite</artifactId>
     <name>GShell Testsuite</name>
-    <packaging>jar</packaging>
     
     <dependencies>
-        
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
         
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-cli</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-server-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-server-telnet</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-standard-commands</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>gshell-scripting-commands</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?view=diff&rev=535400&r1=535399&r2=535400
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Fri May  4 15:48:50 2007
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.1</version>
     </parent>
 
     <groupId>org.apache.geronimo.gshell</groupId>
@@ -43,6 +43,18 @@
         <url>https://svn.apache.org/viewvc/geronimo/sandbox/gshell/</url>
     </scm>
     
+    <properties>
+        <!--
+        NOTE: Project version, to be used instead of ${version} since that
+              value magically changes when using SNAPSHOT versions.
+
+              This value *must* be kept in sync with the value of the <version>
+              element, and it will need to be changed manually before a release,
+              as the maven-release-plugin will not update this value.
+        -->
+        <version>1.0.0-SNAPSHOT</version>
+    </properties>
+    
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -116,7 +128,7 @@
             <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.91</version>
             </dependency>
 
             <dependency>
@@ -192,38 +204,74 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>1.0-alpha-2</version>
+                </plugin>
+                
+                <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>retrotranslator-maven-plugin</artifactId>
-                    <version>1.0-alpha-1</version>
+                    <version>1.0-alpha-2</version>
                 </plugin>
             </plugins>
         </pluginManagement>
         
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-
-                <!-- Tools includes custom packagings, install as extension to pick them
up -->
-                <extensions>true</extensions>
-                
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>validate</phase>
                         <goals>
-                            <goal>require-java-version</goal>
+                            <goal>enforce</goal>
                         </goals>
                         <configuration>
-                            <version>1.5+</version>
+                            <rules>
+                                <!-- Allow any Java >= 1.5, but not 1.6 or above -->
+                                <requireJavaVersion>
+                                    <version>[1.5,1.6)</version>
+                                </requireJavaVersion>
+                                
+                                <!-- Allow any Maven >= 2.0.5 -->
+                                <requireMavenVersion>
+                                    <version>[2.0.5,)</version>
+                                </requireMavenVersion>
+                            </rules>
                         </configuration>
                     </execution>
-
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                
+                <executions>
                     <execution>
                         <id>install-legal-files</id>
                         <phase>generate-resources</phase>
                         <goals>
                             <goal>copy-legal-files</goal>
                         </goals>
+                    </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>



Mime
View raw message