geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r637546 - in /geronimo/gshell/trunk: gshell-core/pom.xml gshell-model/pom.xml pom.xml
Date Sun, 16 Mar 2008 06:10:37 GMT
Author: jdillon
Date: Sat Mar 15 23:10:36 2008
New Revision: 637546

URL: http://svn.apache.org/viewvc?rev=637546&view=rev
Log:
Hook up gshell-model to gshell-core, fix indent

Modified:
    geronimo/gshell/trunk/gshell-core/pom.xml
    geronimo/gshell/trunk/gshell-model/pom.xml
    geronimo/gshell/trunk/pom.xml

Modified: geronimo/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/pom.xml?rev=637546&r1=637545&r2=637546&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-core/pom.xml Sat Mar 15 23:10:36 2008
@@ -21,40 +21,43 @@
 <!-- $Rev$ $Date$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.gshell</groupId>
         <artifactId>gshell</artifactId>
         <version>1.0-alpha-2-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>gshell-core</artifactId>
     <name>GShell Core</name>
-    
+
     <description>
         Provides the core of what is GShell ;-)
     </description>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-command-api</artifactId>
-            <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-parser</artifactId>
-            <version>${version}</version>
+        </dependency>
+		
+        <dependency>
+            <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-model</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-container-default</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>

Modified: geronimo/gshell/trunk/gshell-model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/pom.xml?rev=637546&r1=637545&r2=637546&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-model/pom.xml Sat Mar 15 23:10:36 2008
@@ -21,22 +21,22 @@
 <!-- $Rev$ $Date$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.gshell</groupId>
         <artifactId>gshell</artifactId>
         <version>1.0-alpha-2-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>gshell-model</artifactId>
     <name>GShell Model</name>
-    
+
     <description>
 		GShell XML models.
     </description>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.gshell.support</groupId>

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=637546&r1=637545&r2=637546&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Sat Mar 15 23:10:36 2008
@@ -21,9 +21,9 @@
 <!-- $Rev$ $Date$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
@@ -34,27 +34,51 @@
     <artifactId>gshell</artifactId>
     <name>GShell</name>
     <packaging>pom</packaging>
-    
+
     <version>1.0-alpha-2-SNAPSHOT</version>
-    
+
     <description>
         GShell is a framework for building rich command-line applications.
     </description>
-    
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/gshell/trunk/</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/gshell/trunk/</developerConnection>
         <url>https://svn.apache.org/viewvc/geronimo/gshell/trunk/</url>
     </scm>
-    
+
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <groupId>org.apache.geronimo.gshell.support</groupId>
+                <artifactId>gshell-common</artifactId>
+                <version>1.0-alpha-2-SNAPSHOT</version>
+            </dependency>
+			
+            <dependency>
+                <groupId>org.apache.geronimo.gshell</groupId>
+                <artifactId>gshell-command-api</artifactId>
+                <version>1.0-alpha-2-SNAPSHOT</version>
+            </dependency>
+	
+            <dependency>
+                <groupId>org.apache.geronimo.gshell</groupId>
+                <artifactId>gshell-parser</artifactId>
+                <version>1.0-alpha-2-SNAPSHOT</version>
+            </dependency>
+			
+            <dependency>
+                <groupId>org.apache.geronimo.gshell</groupId>
+                <artifactId>gshell-model</artifactId>
+                <version>1.0-alpha-2-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
                 <version>1.5.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
@@ -81,7 +105,7 @@
                 <artifactId>jcl104-over-slf4j</artifactId>
                 <version>1.5.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
@@ -93,7 +117,7 @@
                 <artifactId>commons-vfs</artifactId>
                 <version>1.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-component-annotations</artifactId>
@@ -105,13 +129,13 @@
                 <artifactId>plexus-classworlds</artifactId>
                 <version>1.2-alpha-10</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-component-api</artifactId>
                 <version>1.0-alpha-32</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-container-default</artifactId>
@@ -123,7 +147,7 @@
                 <artifactId>plexus-utils</artifactId>
                 <version>1.4.5</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-jexl</groupId>
                 <artifactId>commons-jexl</artifactId>
@@ -141,31 +165,31 @@
                 <artifactId>jline</artifactId>
                 <version>0.9.94</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>com.thoughtworks.xstream</groupId>
                 <artifactId>xstream</artifactId>
                 <version>1.3</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-core</artifactId>
                 <version>1.1.6</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-filter-ssl</artifactId>
                 <version>1.1.6</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>3.8.2</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-cdc-anno</artifactId>
@@ -173,21 +197,21 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <pluginManagement>
             <plugins>
@@ -196,25 +220,25 @@
                     <artifactId>maven-plugin-plugin</artifactId>
                     <version>2.3</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-remote-resources-plugin</artifactId>
                     <version>1.0-beta-2</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>2.0.2</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
                     <version>2.0-beta-6</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
@@ -284,25 +308,25 @@
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     </configuration>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>2.0</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-idea-plugin</artifactId>
                     <version>2.1</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
                     <version>1.0</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
@@ -316,19 +340,19 @@
                     <version>1.0-SNAPSHOT</version>
                 </plugin>
                 -->
-                
+
                 <plugin>
                     <groupId>org.codehaus.plexus</groupId>
                     <artifactId>plexus-maven-plugin</artifactId>
                     <version>1.3.6</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.codehaus.mojo.groovy</groupId>
                     <artifactId>groovy-maven-plugin</artifactId>
                     <version>1.0-beta-3</version>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>shitty-maven-plugin</artifactId>
@@ -336,7 +360,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -363,7 +387,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-remote-resources-plugin</artifactId>
@@ -393,7 +417,7 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-idea-plugin</artifactId>
@@ -403,7 +427,7 @@
                     <linkModules>true</linkModules>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-maven-plugin</artifactId>
@@ -422,7 +446,7 @@
                         </configuration>
                     </execution>
                 </executions>
-                
+
                 <dependencies>
                     <dependency>
                         <groupId>org.codehaus.plexus</groupId>
@@ -433,11 +457,12 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <modules>
         <module>gshell-diet</module>
         <module>gshell-support</module>
         <module>gshell-bootstrap</module>
+        <module>gshell-model</module>
         <module>gshell-command-api</module>
         <module>javacc-maven-plugin</module>
         <module>gshell-parser</module>
@@ -450,7 +475,7 @@
         <module>gshell-embeddable</module>
         <module>gshell-assembly</module>
     </modules>
-    
+
     <repositories>
         <repository>
             <id>apache-snapshots</id>
@@ -467,14 +492,14 @@
             </releases>
         </repository>
     </repositories>
-    
+
     <distributionManagement>
         <site>
             <id>geronimo-website</id>
             <url>scp://people.apache.org/www/geronimo.apache.org/maven/gshell</url>
         </site>
     </distributionManagement>
-    
+
     <reporting>
         <plugins>
             <plugin>
@@ -493,7 +518,7 @@
                     </links>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
@@ -502,7 +527,7 @@
                     <targetJdk>1.5</targetJdk>
                 </configuration>
             </plugin>
-                
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
@@ -513,14 +538,14 @@
             </plugin>
         </plugins>
     </reporting>
-    
+
     <profiles>
         <profile>
             <id>idea</id>
-            
+
             <build>
                 <defaultGoal>validate</defaultGoal>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -543,17 +568,17 @@
                 </plugins>
             </build>
         </profile>
-        
+
         <profile>
             <id>super-helpful-integration-tests</id>
-            
+
             <activation>
                 <property>
                     <name>shit</name>
                     <value>true</value>
                 </property>
             </activation>
-            
+
             <build>
                 <plugins>
                     <plugin>
@@ -572,16 +597,16 @@
                 </plugins>
             </build>
         </profile>
-        
+
         <profile>
             <id>stage-distribution</id>
-            
+
             <activation>
                 <property>
                     <name>stage.distributionUrl</name>
                 </property>
             </activation>
-            
+
             <distributionManagement>
                 <repository>
                     <id>stage-repository</id>



Mime
View raw message