You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/04 23:08:42 UTC
svn commit: r428882 - in /geronimo/sandbox/svkmerge/trunk: bootstrap
modules/pom.xml pom.xml
Author: jdillon
Date: Fri Aug 4 14:08:41 2006
New Revision: 428882
URL: http://svn.apache.org/viewvc?rev=428882&view=rev
Log:
(GERONIMO-2219) Changes to get Rick's JavaMail changes (#421872) working
Modified:
geronimo/sandbox/svkmerge/trunk/bootstrap
geronimo/sandbox/svkmerge/trunk/modules/pom.xml
geronimo/sandbox/svkmerge/trunk/pom.xml
Modified: geronimo/sandbox/svkmerge/trunk/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/bootstrap?rev=428882&r1=428881&r2=428882&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/bootstrap (original)
+++ geronimo/sandbox/svkmerge/trunk/bootstrap Fri Aug 4 14:08:41 2006
@@ -58,8 +58,25 @@
fi
}
+specs() {
+ echo "Building Specs..."
+
+ (
+ cd "$DIRNAME/thirdparty"
+
+ svn co http://svn.apache.org/repos/asf/geronimo/specs/trunk specs
+ (
+ cd specs
+ mvn install
+
+ if [ "$?" != "0" ]; then
+ die "Bootstrap failed building Specs"
+ fi
+ )
+ )
+}
+
openejb2() {
- # Build thirdparty components
echo "Building OpenEJB2..."
(
@@ -87,6 +104,7 @@
else
begin && (
clean
+ specs && \
stage "bootstrap" && \
openejb2 && \
stage "assemble"
Modified: geronimo/sandbox/svkmerge/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/pom.xml?rev=428882&r1=428881&r2=428882&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/pom.xml Fri Aug 4 14:08:41 2006
@@ -65,7 +65,6 @@
<module>j2ee</module>
<module>j2ee-builder</module>
<module>j2ee-schema</module>
- <module>javamail-transport</module>
<module>jetty</module>
<module>jetty-builder</module>
<module>jmx-remoting</module>
Modified: geronimo/sandbox/svkmerge/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/pom.xml?rev=428882&r1=428881&r2=428882&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/pom.xml Fri Aug 4 14:08:41 2006
@@ -151,7 +151,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.3.1_provider</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>