Author: jdillon
Date: Sun Jul 16 15:39:48 2006
New Revision: 422558
URL: http://svn.apache.org/viewvc?rev=422558&view=rev
Log:
Adding distro bits to deploy here for now, will eventually move to genesis
Don't need to bootstrap genesis anymore, there is a snap out
Modified:
geronimo/sandbox/svkmerge/m2migration/bootstrap
geronimo/sandbox/svkmerge/m2migration/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/bootstrap?rev=422558&r1=422557&r2=422558&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/bootstrap (original)
+++ geronimo/sandbox/svkmerge/m2migration/bootstrap Sun Jul 16 15:39:48 2006
@@ -58,26 +58,6 @@
fi
}
-##
-## NOTE: Genesis add here until a release can be made to the offcial location
-##
-genesis() {
- echo "Building Genesis..."
-
- (
- cd "$DIRNAME/thirdparty"
-
- svn co https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/genesis
-
- cd genesis
- ./bootstrap
-
- if [ "$?" != "0" ]; then
- die "Bootstrap failed building Genesis"
- fi
- )
-}
-
openejb2() {
# Build thirdparty components
echo "Building OpenEJB2..."
@@ -104,7 +84,6 @@
begin && (
clean
- genesis && \
stage "bootstrap" && \
openejb2 && \
stage "assemble"
Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=422558&r1=422557&r2=422558&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Sun Jul 16 15:39:48 2006
@@ -45,7 +45,7 @@
<scm>
<connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk</connection>
<developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/trunk</url>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk</url>
</scm>
-->
<scm>
@@ -709,11 +709,13 @@
</plugins>
</build>
+ <!--
+
+ TODO: We will pick up the default repos from Genesis, so only need to list the
+ repo's where genesis is, as well as any custom repos here...
+
+ -->
<repositories>
- <!--
-
- FIXME: Do we need to enable this?
-
<repository>
<id>apache</id>
<name>Apache Repository</name>
@@ -726,35 +728,39 @@
<enabled>true</enabled>
</releases>
</repository>
- -->
<repository>
- <id>apache-m1</id>
- <name>Apache Maven 1 Repository</name>
- <url>http://people.apache.org/repository</url>
- <layout>legacy</layout>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>http://people.apache.org/maven-snapshot-repository</url>
+ <layout>default</layout>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</snapshots>
<releases>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</releases>
</repository>
+ <!--
+
+ FIXME: Should remove this guy...
+
+ -->
<repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots Repository</name>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <layout>default</layout>
+ <id>apache-m1</id>
+ <name>Apache Maven 1 Repository</name>
+ <url>http://people.apache.org/repository</url>
+ <layout>legacy</layout>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</snapshots>
<releases>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</releases>
</repository>
@@ -786,6 +792,11 @@
</releases>
</repository>
+ <!--
+
+ FIXME: Should remove this guy...
+
+ -->
<repository>
<id>codehaus-m1</id>
<name>Codehaus Maven 1 Repository</name>
@@ -800,39 +811,8 @@
<enabled>true</enabled>
</releases>
</repository>
- </repositories>
-
- <pluginRepositories>
- <!-- TODO: Add Apache repos -->
-
- <pluginRepository>
- <id>codehaus</id>
- <name>Codehaus Repository</name>
- <url>http://repository.codehaus.org</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>codehaus-snapshots</id>
- <name>Codehaus Snapshots Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
+ </repositories>
<profiles>
<profile>
@@ -908,27 +888,32 @@
</property>
</activation>
+ <modules>
+ <module>modules</module>
+ <module>m2-plugins</module>
+ <module>applications</module>
+ <module>configs</module>
+ <module>m2-assemblies</module>
+ </modules>
+
<!--
- | TODO: Verfiy that these are the correct URL's
- -->
+
+ TODO: See if we can inherit a profile to enable these, or just make them default
+ and pick up from Genesis
+
+ -->
<distributionManagement>
- <!--
-
- TODO: See if these get picked up; these should not change project to project
-
<repository>
- <id>apache-repo</id>
- <name>Apache CVS Repository</name>
- <url>scp://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+ <id>apache-releases</id>
+ <name>Apache Release Distribution Repository</name>
+ <url>scp://people.apache.org/www/www.apache.org/dist/maven-repository</url>
</repository>
<snapshotRepository>
<id>apache-snapshots</id>
- <name>Apache CVS Development Repository</name>
- <url>scp://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+ <name>Apache Development Snapshot Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/maven-snapshot-repository</url>
</snapshotRepository>
-
- -->
<site>
<id>geronimo-website</id>
|