geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r570656 - in /geronimo/sandbox/gshell/trunk: ./ gshell-api/ gshell-api/src/main/resources/org/apache/geronimo/gshell/util/ gshell-assembly/ gshell-bootstrap/ gshell-cli/ gshell-commands/ gshell-commands/gshell-scripting-commands/ gshell-com...
Date Wed, 29 Aug 2007 06:28:54 GMT
Author: jdillon
Date: Tue Aug 28 23:28:53 2007
New Revision: 570656

URL: http://svn.apache.org/viewvc?rev=570656&view=rev
Log:
Pin down more plugin versions, revert back to using ${pom.version} for now so the release
plugin will work

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-assembly/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-bootstrap/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-vfs-commands/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-common/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-diet/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml
    geronimo/sandbox/gshell/trunk/javacc-maven-plugin/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?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-api/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-api/pom.xml Tue Aug 28 23:28:53 2007
@@ -41,19 +41,19 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-common</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-clp</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-prefs</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>

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?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- 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
Tue Aug 28 23:28:53 2007
@@ -21,4 +21,4 @@
 ## $Rev$ $Date$
 ##
 
-version=${version}
+version=${pom.version}

Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml Tue Aug 28 23:28:53 2007
@@ -38,38 +38,38 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-bootstrap</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-core</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-cli</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-standard-commands</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <!--
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-scripting-commands</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-vfs-commands</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
         -->
 
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-diet-log4j</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 
@@ -107,7 +107,7 @@
                     <descriptors>
                         <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
                     </descriptors>
-                    <finalName>gshell-${version}</finalName>
+                    <finalName>gshell-${pom.version}</finalName>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-bootstrap/pom.xml Tue Aug 28 23:28:53 2007
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-diet-classworlds</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
     

Modified: geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/pom.xml Tue Aug 28 23:28:53 2007
@@ -37,13 +37,13 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-core</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-diet-classworlds</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 

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?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-scripting-commands/pom.xml Tue Aug
28 23:28:53 2007
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-core</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

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?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-vfs-commands/pom.xml Tue Aug 28 23:28:53
2007
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-api</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>

Modified: geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/pom.xml Tue Aug 28 23:28:53 2007
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-api</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
     

Modified: geronimo/sandbox/gshell/trunk/gshell-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-common/pom.xml?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-common/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-common/pom.xml Tue Aug 28 23:28:53 2007
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-diet-commons-lang</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>

Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Tue Aug 28 23:28:53 2007
@@ -37,13 +37,13 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-api</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-diet-classworlds</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-diet-plexus-utils</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>

Modified: geronimo/sandbox/gshell/trunk/gshell-diet/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-diet/pom.xml?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-diet/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-diet/pom.xml Tue Aug 28 23:28:53 2007
@@ -47,10 +47,12 @@
     
     <build>
         <plugins>
+            <!--
+            NOTE: Ignore warnings from dieting dependencies.
+            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
                 <configuration>
                     <optimize>true</optimize>
                     <debug>true</debug>

Modified: geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-testsuite/pom.xml Tue Aug 28 23:28:53 2007
@@ -37,25 +37,25 @@
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-core</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-cli</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-standard-commands</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-scripting-commands</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>

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=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/javacc-maven-plugin/pom.xml Tue Aug 28 23:28:53 2007
@@ -104,7 +104,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>2.2-SNAPSHOT</version>
+                    <version>2.2</version>
                 </plugin>
             </plugins>
         </pluginManagement>

Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?rev=570656&r1=570655&r2=570656&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Tue Aug 28 23:28:53 2007
@@ -43,18 +43,6 @@
         <url>https://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/</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-alpha-1-SNAPSHOT</version>
-    </properties>
-    
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -97,13 +85,6 @@
             </dependency>
 
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>3.8.2</version>
-                <scope>test</scope>
-            </dependency>
-            
-            <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-classworlds</artifactId>
                 <version>1.2-alpha-10</version>
@@ -137,7 +118,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-utils</artifactId>
@@ -185,6 +166,13 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.2</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     
@@ -193,16 +181,64 @@
             <plugins>
                 <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-enforcer-plugin</artifactId>
                     <version>1.0-alpha-3</version>
                 </plugin>
-                
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+
                 <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-antrun-plugin</artifactId>
+                    <version>1.1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.2-beta-1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.0-beta-4</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.3</version>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -223,11 +259,6 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-idea-plugin</artifactId>
                     <version>2.1</version>
-                    <configuration>
-                        <jdkName>1.5</jdkName>
-                        <jdkLevel>5.0</jdkLevel>
-                        <linkModules>true</linkModules>
-                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -262,8 +293,6 @@
             <plugin>
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>
                 <artifactId>tools-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                
                 <executions>
                     <execution>
                         <id>install-legal-files</id>
@@ -278,7 +307,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
                 <configuration>
                     <optimize>true</optimize>
                     <debug>true</debug>
@@ -298,14 +326,6 @@
                     <linkModules>true</linkModules>
                 </configuration>
             </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <tagBase>https://svn.apache.org/repos/asf/geronimo/sandbox/gshell/tags</tagBase>
-                </configuration>
-            </plugin>
          </plugins>
     </build>
     
@@ -325,11 +345,6 @@
     </modules>
     
     <repositories>
-        <!--
-        NOTE: The default repositories are picked up by Genesis, but need to
-              specify where Genesis lives to pick it up + any additional repositories.
-        -->
-        
         <repository>
             <id>apache-snapshots</id>
             <name>Apache Snapshots Repository</name>



Mime
View raw message