geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r632688 - in /geronimo/plugins/directory/trunk: directory/pom.xml geronimo-directory-server/ geronimo-directory/pom.xml pom.xml
Date Sun, 02 Mar 2008 01:19:05 GMT
Author: djencks
Date: Sat Mar  1 17:19:04 2008
New Revision: 632688

URL: http://svn.apache.org/viewvc?rev=632688&view=rev
Log:
closer to updated.... DirectoryGBean not compiling against current apacheds

Added:
    geronimo/plugins/directory/trunk/geronimo-directory-server/
      - copied from r632682, geronimo/plugins/directory/branches/2.0/geronimo-directory-server/
Modified:
    geronimo/plugins/directory/trunk/directory/pom.xml
    geronimo/plugins/directory/trunk/geronimo-directory/pom.xml
    geronimo/plugins/directory/trunk/pom.xml

Modified: geronimo/plugins/directory/trunk/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/directory/pom.xml?rev=632688&r1=632687&r2=632688&view=diff
==============================================================================
--- geronimo/plugins/directory/trunk/directory/pom.xml (original)
+++ geronimo/plugins/directory/trunk/directory/pom.xml Sat Mar  1 17:19:04 2008
@@ -222,12 +222,15 @@
             <groupId>jdbm</groupId>
             <artifactId>jdbm</artifactId>
         </dependency>
-    </dependencies>
 
-    <properties>
-        <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>${version}</geronimoVersion>
-    </properties>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
 
     <build>
         <!--

Modified: geronimo/plugins/directory/trunk/geronimo-directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/geronimo-directory/pom.xml?rev=632688&r1=632687&r2=632688&view=diff
==============================================================================
--- geronimo/plugins/directory/trunk/geronimo-directory/pom.xml (original)
+++ geronimo/plugins/directory/trunk/geronimo-directory/pom.xml Sat Mar  1 17:19:04 2008
@@ -36,7 +36,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
         </dependency>
 

Modified: geronimo/plugins/directory/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/pom.xml?rev=632688&r1=632687&r2=632688&view=diff
==============================================================================
--- geronimo/plugins/directory/trunk/pom.xml (original)
+++ geronimo/plugins/directory/trunk/pom.xml Sat Mar  1 17:19:04 2008
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
-        <version>1.2</version>
+        <version>1.4</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
@@ -58,6 +58,9 @@
         -->
         <version>2.1-SNAPSHOT</version>
 
+        <!-- This property is required by the car:package mojo -->
+        <geronimoVersion>2.1</geronimoVersion>
+
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
     </properties>
 
@@ -70,19 +73,19 @@
             <dependency>
                 <groupId>org.apache.geronimo.javamail</groupId>
                 <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                <version>1.2</version>
+                <version>1.3</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-system</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>j2ee-server</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
                 <type>car</type>
             </dependency>
 
@@ -103,25 +106,23 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>1.4.0</version>
             </dependency>
-
+            
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jcl</artifactId>
                 <version>1.4.0</version>
             </dependency>
-
+            
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <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>
@@ -129,33 +130,32 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-spring</artifactId>
-                <version>3.1-SNAPSHOT</version>
+              <groupId>org.apache.xbean</groupId>
+              <artifactId>xbean-spring</artifactId>
+                <version>3.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6</version>
             </dependency>
-
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6</version>
             </dependency>
 
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6</version>
             </dependency>
 
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6</version>
             </dependency>
 
             <dependency>
@@ -304,7 +304,7 @@
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
-                <version>3.1</version>
+                <version>3.2</version>
             </dependency>
 
             <dependency>
@@ -318,6 +318,13 @@
                 <artifactId>jdbm</artifactId>
                 <version>1.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -325,9 +332,9 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.geronimo.plugins</groupId>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>car-maven-plugin</artifactId>
-                    <version>${version}</version>
+                    <version>${geronimoVersion}</version>
                     <extensions>true</extensions>
                 </plugin>
 
@@ -379,7 +386,7 @@
                                 <requireJavaVersion>
                                     <version>[1.5,1.6)</version>
                                 </requireJavaVersion>
-
+                                
                                 <!-- Allow any Maven >= 2.0.5 -->
                                 <requireMavenVersion>
                                     <version>[2.0.5,)</version>
@@ -389,7 +396,7 @@
                     </execution>
                 </executions>
             </plugin>
-
+            
             <plugin>
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>
                 <artifactId>tools-maven-plugin</artifactId>
@@ -474,6 +481,7 @@
             </releases>
         </repository>
 
+<!--
         <repository>
             <id>java.net</id>
             <url>http://download.java.net/maven/1/</url>
@@ -485,6 +493,7 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
+-->
 
     </repositories>
 
@@ -499,56 +508,16 @@
         </site>
     </distributionManagement>
 
-    <profiles>
-        <profile>
-            <id>default</id>
-
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <modules>
-                <module>geronimo-directory</module>
-                <module>directory</module>
-            </modules>
-        </profile>
-
-        <!--
-        NOTE: This profile is used to enable plugin prefixes for easy command-line usage,
as in:
-
-              mvn -Ptools geronimo:start
-        -->
-        <profile>
-            <id>tools</id>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                        <artifactId>tools-maven-plugin</artifactId>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                        <artifactId>maven-maven-plugin</artifactId>
-                    </plugin>
+    <modules>
+        <module>geronimo-directory</module>
+        <module>directory</module>
+    </modules>
 
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>selenium-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
+    <profiles>
 
         <profile>
             <id>makeeclipse</id>
-
+            
             <build>
                 <plugins>
                     <plugin>
@@ -563,7 +532,7 @@
                             </execution>
                         </executions>
                     </plugin>
-
+                    
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>groovy-maven-plugin</artifactId>
@@ -592,6 +561,29 @@
                     </plugin>
                 </plugins>
             </build>
+        </profile>
+
+        <profile>
+            <id>release</id>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-release-plugin</artifactId>
+                        <configuration>
+                          <tagBase>https://svn.apache.org/repos/asf/geronimo/plugins/directory/tags</tagBase>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>with-assembly</id>
+            <modules>
+                <module>geronimo-directory-server</module>
+            </modules>
         </profile>
     </profiles>
 



Mime
View raw message