You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/10/23 15:31:15 UTC
cvs commit: maven-components/maven-mboot2/src/main/java MBoot.java
jvanzyl 2004/10/23 06:31:15
Modified: maven-mboot2/src/main/java MBoot.java
Log:
o update for the api/impl separation in Plexus
o make the runtime setup the same as what the Plexus runtime does which
is to put classworlds in a separate directory as to simplify the
directive to include all the core JARs: one line as opposed to having
to list all the dependencies.
Revision Changes Path
1.36 +45 -49 maven-components/maven-mboot2/src/main/java/MBoot.java
Index: MBoot.java
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot2/src/main/java/MBoot.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- MBoot.java 27 Sep 2004 12:49:54 -0000 1.35
+++ MBoot.java 23 Oct 2004 13:31:15 -0000 1.36
@@ -10,40 +10,23 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import java.util.Date;
public class MBoot
{
- // I need:
- // o pom install (done)
- // o jar install (done)
- // o bean generation - this is not entirely necessary
- // o jelly generation - this is not entirely necessary
- // o plugin descriptor (done)
- // o xpp3/reader and writer (done)
- // o compilation of generated sources in target/generated-sources (done)
- // o need to run modello to generate the sources (done)
- // o make this work over and over again (done)
- // o hide the dependencies for mboot in the JAR (done)
-
- // maven-core
- // maven-plugin
- // maven-plugins
-
// ----------------------------------------------------------------------
- //
+ // These are the bootstrap processes' dependencies
// ----------------------------------------------------------------------
- String[] deps = new String[]
+ String[] bootstrapDeps = new String[]
{
+ "maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar",
"junit/jars/junit-3.8.1.jar",
"modello/jars/modello-core-1.0-SNAPSHOT.jar",
"modello/jars/modello-xdoc-plugin-1.0-SNAPSHOT.jar",
@@ -53,14 +36,33 @@
"surefire/jars/surefire-1.2-SNAPSHOT.jar",
"xpp3/jars/xpp3-1.1.3.3.jar",
"xstream/jars/xstream-1.0-SNAPSHOT.jar",
- "qdox/jars/qdox-1.2.jar",
- "maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar"
+ "qdox/jars/qdox-1.2.jar"
};
+ // ----------------------------------------------------------------------
+ // These are plexus' runtime dependencies
+ // ----------------------------------------------------------------------
+
+ String[] plexusDeps = new String[]
+ {
+ "classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
+ "plexus/jars/plexus-container-api-1.0-alpha-1-SNAPSHOT.jar",
+ "plexus/jars/plexus-container-default-1.0-alpha-1-SNAPSHOT.jar",
+ "plexus/jars/plexus-utils-1.0-alpha-1-SNAPSHOT.jar",
+ "xpp3/jars/xpp3-1.1.3.3.jar",
+ "xstream/jars/xstream-1.0-SNAPSHOT.jar",
+ };
+
+ // ----------------------------------------------------------------------
+ // These are modello's runtime dependencies
+ // ----------------------------------------------------------------------
+
String[] modelloDeps = new String[]
{
"classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
- "plexus/jars/plexus-0.17-SNAPSHOT.jar",
+ "plexus/jars/plexus-container-api-1.0-alpha-1-SNAPSHOT.jar",
+ "plexus/jars/plexus-container-default-1.0-alpha-1-SNAPSHOT.jar",
+ "plexus/jars/plexus-utils-1.0-alpha-1-SNAPSHOT.jar",
"modello/jars/modello-core-1.0-SNAPSHOT.jar",
"modello/jars/modello-xdoc-plugin-1.0-SNAPSHOT.jar",
"modello/jars/modello-xml-plugin-1.0-SNAPSHOT.jar",
@@ -69,26 +71,12 @@
"xstream/jars/xstream-1.0-SNAPSHOT.jar"
};
- String[] plexusDeps = new String[]
- {
- "classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
- //"plexus/jars/plexus-0.17.jar",
- "plexus/jars/plexus-0.17-SNAPSHOT.jar",
- //"plexus/jars/plexus-artifact-container-1.0-alpha-1-SNAPSHOT.jar",
- "xpp3/jars/xpp3-1.1.3.3.jar",
- "xstream/jars/xstream-1.0-SNAPSHOT.jar",
- //"maven/jars/maven-artifact-2.0-SNAPSHOT.jar",
- //"maven/jars/wagon-api-1.0-alpha-1-SNAPSHOT.jar",
- //"maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar"
- };
-
String[] builds = new String[]
{
"maven-model",
"maven-plugin",
"maven-plugin-tools",
"maven-artifact",
- // "maven-1.x-integration",
"maven-core",
"maven-core-it-verifier"
};
@@ -224,7 +212,7 @@
String basedir = System.getProperty( "user.dir" );
- mbootDependencies = Arrays.asList( deps );
+ mbootDependencies = Arrays.asList( bootstrapDeps );
if ( online )
{
@@ -323,9 +311,20 @@
FileUtils.mkdir( new File( core ).getPath() );
+ String boot = new File( dist, "core/boot" ).getAbsolutePath();
+
+ FileUtils.mkdir( new File( boot ).getPath() );
+
for ( int i = 0; i < plexusDeps.length; i++ )
{
- FileUtils.copyFileToDirectory( repoLocal + "/" + plexusDeps[i], core );
+ if ( plexusDeps[i].startsWith( "classworlds") )
+ {
+ FileUtils.copyFileToDirectory( repoLocal + "/" + plexusDeps[i], boot );
+ }
+ else
+ {
+ FileUtils.copyFileToDirectory( repoLocal + "/" + plexusDeps[i], core );
+ }
}
// ----------------------------------------------------------------------
@@ -344,10 +343,7 @@
d.artifactId.equals( "plexus" ) ||
d.artifactId.equals( "xstream" ) ||
d.artifactId.equals( "xpp3" ) ||
- d.artifactId.equals( "junit" ) )// ||
- //d.artifactId.equals( "wagon-api" ) ||
- //d.artifactId.equals( "plexus-artifact-container" ) ||
- //d.artifactId.equals( "maven-artifact" ) )
+ d.artifactId.equals( "junit" ) )
{
continue;
}
@@ -434,7 +430,7 @@
FileUtils.forceDelete( buildDirFile );
// ----------------------------------------------------------------------
- // Download deps
+ // Download bootstrapDeps
// ----------------------------------------------------------------------
if ( online )
@@ -470,19 +466,19 @@
generateSources( model.getAbsolutePath(), "java", generatedSources, "4.0.0", "false" );
- generateSources( model.getAbsolutePath(), "java", generatedSources, "3.0.0", "true" );
+ //generateSources( model.getAbsolutePath(), "java", generatedSources, "3.0.0", "true" );
generateSources( model.getAbsolutePath(), "xpp3-reader", generatedSources, "4.0.0", "false" );
- generateSources( model.getAbsolutePath(), "xpp3-reader", generatedSources, "3.0.0", "true" );
+ //generateSources( model.getAbsolutePath(), "xpp3-reader", generatedSources, "3.0.0", "true" );
generateSources( model.getAbsolutePath(), "xpp3-writer", generatedSources, "4.0.0", "false" );
- generateSources( model.getAbsolutePath(), "xpp3-writer", generatedSources, "3.0.0", "true" );
+ //generateSources( model.getAbsolutePath(), "xpp3-writer", generatedSources, "3.0.0", "true" );
generateSources( model.getAbsolutePath(), "xdoc", generatedDocs, "4.0.0", "false" );
- generateSources( model.getAbsolutePath(), "xdoc", generatedDocs, "3.0.0", "true" );
+ //generateSources( model.getAbsolutePath(), "xdoc", generatedDocs, "3.0.0", "true" );
}
// ----------------------------------------------------------------------
Re: cvs commit: maven-components/maven-mboot2/src/main/java
MBoot.java
Posted by Jason van Zyl <jv...@maven.org>.
On Sat, 2004-10-23 at 09:39, Emmanuel Venisse wrote:
> Jason,
>
> If you update plexus dependencies in m2, it's necessary to deploy them for
> users that don't build themself plexus.
Yup, I'm soon going to teach continuum how to do this.
> Emmanuel
>
> ----- Original Message -----
> From: <jv...@apache.org>
> To: <ma...@apache.org>
> Sent: Saturday, October 23, 2004 3:31 PM
> Subject: cvs commit: maven-components/maven-mboot2/src/main/java MBoot.java
>
>
> > jvanzyl 2004/10/23 06:31:15
> >
> > Modified: maven-mboot2/src/main/java MBoot.java
> > Log:
> > o update for the api/impl separation in Plexus
> > o make the runtime setup the same as what the Plexus runtime does which
> > is to put classworlds in a separate directory as to simplify the
> > directive to include all the core JARs: one line as opposed to having
> > to list all the dependencies.
> >
> > Revision Changes Path
> > 1.36 +45 -49
> maven-components/maven-mboot2/src/main/java/MBoot.java
> >
> > Index: MBoot.java
> > ===================================================================
> > RCS file:
> /home/cvs/maven-components/maven-mboot2/src/main/java/MBoot.java,v
> > retrieving revision 1.35
> > retrieving revision 1.36
> > diff -u -r1.35 -r1.36
> > --- MBoot.java 27 Sep 2004 12:49:54 -0000 1.35
> > +++ MBoot.java 23 Oct 2004 13:31:15 -0000 1.36
> > @@ -10,40 +10,23 @@
> > import java.io.File;
> > import java.io.FileInputStream;
> > import java.io.FileNotFoundException;
> > -import java.io.IOException;
> > -import java.io.InputStream;
> > import java.io.Serializable;
> > import java.lang.reflect.Method;
> > import java.util.ArrayList;
> > import java.util.Arrays;
> > +import java.util.Date;
> > import java.util.Iterator;
> > import java.util.List;
> > -import java.util.Date;
> >
> > public class MBoot
> > {
> > - // I need:
> > - // o pom install (done)
> > - // o jar install (done)
> > - // o bean generation - this is not entirely necessary
> > - // o jelly generation - this is not entirely necessary
> > - // o plugin descriptor (done)
> > - // o xpp3/reader and writer (done)
> > - // o compilation of generated sources in target/generated-sources
> (done)
> > - // o need to run modello to generate the sources (done)
> > - // o make this work over and over again (done)
> > - // o hide the dependencies for mboot in the JAR (done)
> > -
> > - // maven-core
> > - // maven-plugin
> > - // maven-plugins
> > -
> >
>
>
>
>
> // ----------------------------------------------------------------------
> > - //
> > + // These are the bootstrap processes' dependencies
> >
>
>
>
>
> // ----------------------------------------------------------------------
> >
> > - String[] deps = new String[]
> > + String[] bootstrapDeps = new String[]
> > {
> > + "maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar",
> > "junit/jars/junit-3.8.1.jar",
> > "modello/jars/modello-core-1.0-SNAPSHOT.jar",
> > "modello/jars/modello-xdoc-plugin-1.0-SNAPSHOT.jar",
> > @@ -53,14 +36,33 @@
> > "surefire/jars/surefire-1.2-SNAPSHOT.jar",
> > "xpp3/jars/xpp3-1.1.3.3.jar",
> > "xstream/jars/xstream-1.0-SNAPSHOT.jar",
> > - "qdox/jars/qdox-1.2.jar",
> > - "maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar"
> > + "qdox/jars/qdox-1.2.jar"
> > };
> >
> > +
> // ----------------------------------------------------------------------
> > + // These are plexus' runtime dependencies
> > +
> // ----------------------------------------------------------------------
> > +
> > + String[] plexusDeps = new String[]
> > + {
> > + "classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
> > + "plexus/jars/plexus-container-api-1.0-alpha-1-SNAPSHOT.jar",
> > +
> "plexus/jars/plexus-container-default-1.0-alpha-1-SNAPSHOT.jar",
> > + "plexus/jars/plexus-utils-1.0-alpha-1-SNAPSHOT.jar",
> > + "xpp3/jars/xpp3-1.1.3.3.jar",
> > + "xstream/jars/xstream-1.0-SNAPSHOT.jar",
> > + };
> > +
> > +
> // ----------------------------------------------------------------------
> > + // These are modello's runtime dependencies
> > +
> // ----------------------------------------------------------------------
> > +
> > String[] modelloDeps = new String[]
> > {
> > "classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
> > - "plexus/jars/plexus-0.17-SNAPSHOT.jar",
> > + "plexus/jars/plexus-container-api-1.0-alpha-1-SNAPSHOT.jar",
> > +
> "plexus/jars/plexus-container-default-1.0-alpha-1-SNAPSHOT.jar",
> > + "plexus/jars/plexus-utils-1.0-alpha-1-SNAPSHOT.jar",
> > "modello/jars/modello-core-1.0-SNAPSHOT.jar",
> > "modello/jars/modello-xdoc-plugin-1.0-SNAPSHOT.jar",
> > "modello/jars/modello-xml-plugin-1.0-SNAPSHOT.jar",
> > @@ -69,26 +71,12 @@
> > "xstream/jars/xstream-1.0-SNAPSHOT.jar"
> > };
> >
> > - String[] plexusDeps = new String[]
> > - {
> > - "classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
> > - //"plexus/jars/plexus-0.17.jar",
> > - "plexus/jars/plexus-0.17-SNAPSHOT.jar",
> > -
> //"plexus/jars/plexus-artifact-container-1.0-alpha-1-SNAPSHOT.jar",
> > - "xpp3/jars/xpp3-1.1.3.3.jar",
> > - "xstream/jars/xstream-1.0-SNAPSHOT.jar",
> > - //"maven/jars/maven-artifact-2.0-SNAPSHOT.jar",
> > - //"maven/jars/wagon-api-1.0-alpha-1-SNAPSHOT.jar",
> > - //"maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar"
> > - };
> > -
> > String[] builds = new String[]
> > {
> > "maven-model",
> > "maven-plugin",
> > "maven-plugin-tools",
> > "maven-artifact",
> > - // "maven-1.x-integration",
> > "maven-core",
> > "maven-core-it-verifier"
> > };
> > @@ -224,7 +212,7 @@
> >
> > String basedir = System.getProperty( "user.dir" );
> >
> > - mbootDependencies = Arrays.asList( deps );
> > + mbootDependencies = Arrays.asList( bootstrapDeps );
> >
> > if ( online )
> > {
> > @@ -323,9 +311,20 @@
> >
> > FileUtils.mkdir( new File( core ).getPath() );
> >
> > + String boot = new File( dist, "core/boot" ).getAbsolutePath();
> > +
> > + FileUtils.mkdir( new File( boot ).getPath() );
> > +
> > for ( int i = 0; i < plexusDeps.length; i++ )
> > {
> > - FileUtils.copyFileToDirectory( repoLocal + "/" +
> plexusDeps[i], core );
> > + if ( plexusDeps[i].startsWith( "classworlds") )
> > + {
> > + FileUtils.copyFileToDirectory( repoLocal + "/" +
> plexusDeps[i], boot );
> > + }
> > + else
> > + {
> > + FileUtils.copyFileToDirectory( repoLocal + "/" +
> plexusDeps[i], core );
> > + }
> > }
> >
> >
>
>
>
>
>
>
>
>
> // ----------------------------------------------------------------------
> > @@ -344,10 +343,7 @@
> > d.artifactId.equals( "plexus" ) ||
> > d.artifactId.equals( "xstream" ) ||
> > d.artifactId.equals( "xpp3" ) ||
> > - d.artifactId.equals( "junit" ) )// ||
> > - //d.artifactId.equals( "wagon-api" ) ||
> > - //d.artifactId.equals( "plexus-artifact-container" )
> ||
> > - //d.artifactId.equals( "maven-artifact" ) )
> > + d.artifactId.equals( "junit" ) )
> > {
> > continue;
> > }
> > @@ -434,7 +430,7 @@
> > FileUtils.forceDelete( buildDirFile );
> >
> >
>
>
>
>
>
>
>
>
> // ----------------------------------------------------------------------
> > - // Download deps
> > + // Download bootstrapDeps
> >
>
>
>
>
>
>
>
>
> // ----------------------------------------------------------------------
> >
> > if ( online )
> > @@ -470,19 +466,19 @@
> >
> > generateSources( model.getAbsolutePath(), "java",
> generatedSources, "4.0.0", "false" );
> >
> > - generateSources( model.getAbsolutePath(), "java",
> generatedSources, "3.0.0", "true" );
> > + //generateSources( model.getAbsolutePath(), "java",
> generatedSources, "3.0.0", "true" );
> >
> > generateSources( model.getAbsolutePath(), "xpp3-reader",
> generatedSources, "4.0.0", "false" );
> >
> > - generateSources( model.getAbsolutePath(), "xpp3-reader",
> generatedSources, "3.0.0", "true" );
> > + //generateSources( model.getAbsolutePath(), "xpp3-reader",
> generatedSources, "3.0.0", "true" );
> >
> > generateSources( model.getAbsolutePath(), "xpp3-writer",
> generatedSources, "4.0.0", "false" );
> >
> > - generateSources( model.getAbsolutePath(), "xpp3-writer",
> generatedSources, "3.0.0", "true" );
> > + //generateSources( model.getAbsolutePath(), "xpp3-writer",
> generatedSources, "3.0.0", "true" );
> >
> > generateSources( model.getAbsolutePath(), "xdoc",
> generatedDocs, "4.0.0", "false" );
> >
> > - generateSources( model.getAbsolutePath(), "xdoc",
> generatedDocs, "3.0.0", "true" );
> > + //generateSources( model.getAbsolutePath(), "xdoc",
> generatedDocs, "3.0.0", "true" );
> > }
> >
> >
>
>
>
>
>
>
>
>
> // ----------------------------------------------------------------------
> >
> >
> >
> >
--
jvz.
Jason van Zyl
jason@maven.org
http://maven.apache.org
happiness is like a butterfly: the more you chase it, the more it will
elude you, but if you turn your attention to other things, it will come
and sit softly on your shoulder ...
-- Thoreau
Re: cvs commit: maven-components/maven-mboot2/src/main/java MBoot.java
Posted by Emmanuel Venisse <em...@venisse.net>.
Jason,
If you update plexus dependencies in m2, it's necessary to deploy them for
users that don't build themself plexus.
Emmanuel
----- Original Message -----
From: <jv...@apache.org>
To: <ma...@apache.org>
Sent: Saturday, October 23, 2004 3:31 PM
Subject: cvs commit: maven-components/maven-mboot2/src/main/java MBoot.java
> jvanzyl 2004/10/23 06:31:15
>
> Modified: maven-mboot2/src/main/java MBoot.java
> Log:
> o update for the api/impl separation in Plexus
> o make the runtime setup the same as what the Plexus runtime does which
> is to put classworlds in a separate directory as to simplify the
> directive to include all the core JARs: one line as opposed to having
> to list all the dependencies.
>
> Revision Changes Path
> 1.36 +45 -49
maven-components/maven-mboot2/src/main/java/MBoot.java
>
> Index: MBoot.java
> ===================================================================
> RCS file:
/home/cvs/maven-components/maven-mboot2/src/main/java/MBoot.java,v
> retrieving revision 1.35
> retrieving revision 1.36
> diff -u -r1.35 -r1.36
> --- MBoot.java 27 Sep 2004 12:49:54 -0000 1.35
> +++ MBoot.java 23 Oct 2004 13:31:15 -0000 1.36
> @@ -10,40 +10,23 @@
> import java.io.File;
> import java.io.FileInputStream;
> import java.io.FileNotFoundException;
> -import java.io.IOException;
> -import java.io.InputStream;
> import java.io.Serializable;
> import java.lang.reflect.Method;
> import java.util.ArrayList;
> import java.util.Arrays;
> +import java.util.Date;
> import java.util.Iterator;
> import java.util.List;
> -import java.util.Date;
>
> public class MBoot
> {
> - // I need:
> - // o pom install (done)
> - // o jar install (done)
> - // o bean generation - this is not entirely necessary
> - // o jelly generation - this is not entirely necessary
> - // o plugin descriptor (done)
> - // o xpp3/reader and writer (done)
> - // o compilation of generated sources in target/generated-sources
(done)
> - // o need to run modello to generate the sources (done)
> - // o make this work over and over again (done)
> - // o hide the dependencies for mboot in the JAR (done)
> -
> - // maven-core
> - // maven-plugin
> - // maven-plugins
> -
>
// ----------------------------------------------------------------------
> - //
> + // These are the bootstrap processes' dependencies
>
// ----------------------------------------------------------------------
>
> - String[] deps = new String[]
> + String[] bootstrapDeps = new String[]
> {
> + "maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar",
> "junit/jars/junit-3.8.1.jar",
> "modello/jars/modello-core-1.0-SNAPSHOT.jar",
> "modello/jars/modello-xdoc-plugin-1.0-SNAPSHOT.jar",
> @@ -53,14 +36,33 @@
> "surefire/jars/surefire-1.2-SNAPSHOT.jar",
> "xpp3/jars/xpp3-1.1.3.3.jar",
> "xstream/jars/xstream-1.0-SNAPSHOT.jar",
> - "qdox/jars/qdox-1.2.jar",
> - "maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar"
> + "qdox/jars/qdox-1.2.jar"
> };
>
> +
// ----------------------------------------------------------------------
> + // These are plexus' runtime dependencies
> +
// ----------------------------------------------------------------------
> +
> + String[] plexusDeps = new String[]
> + {
> + "classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
> + "plexus/jars/plexus-container-api-1.0-alpha-1-SNAPSHOT.jar",
> +
"plexus/jars/plexus-container-default-1.0-alpha-1-SNAPSHOT.jar",
> + "plexus/jars/plexus-utils-1.0-alpha-1-SNAPSHOT.jar",
> + "xpp3/jars/xpp3-1.1.3.3.jar",
> + "xstream/jars/xstream-1.0-SNAPSHOT.jar",
> + };
> +
> +
// ----------------------------------------------------------------------
> + // These are modello's runtime dependencies
> +
// ----------------------------------------------------------------------
> +
> String[] modelloDeps = new String[]
> {
> "classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
> - "plexus/jars/plexus-0.17-SNAPSHOT.jar",
> + "plexus/jars/plexus-container-api-1.0-alpha-1-SNAPSHOT.jar",
> +
"plexus/jars/plexus-container-default-1.0-alpha-1-SNAPSHOT.jar",
> + "plexus/jars/plexus-utils-1.0-alpha-1-SNAPSHOT.jar",
> "modello/jars/modello-core-1.0-SNAPSHOT.jar",
> "modello/jars/modello-xdoc-plugin-1.0-SNAPSHOT.jar",
> "modello/jars/modello-xml-plugin-1.0-SNAPSHOT.jar",
> @@ -69,26 +71,12 @@
> "xstream/jars/xstream-1.0-SNAPSHOT.jar"
> };
>
> - String[] plexusDeps = new String[]
> - {
> - "classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
> - //"plexus/jars/plexus-0.17.jar",
> - "plexus/jars/plexus-0.17-SNAPSHOT.jar",
> -
//"plexus/jars/plexus-artifact-container-1.0-alpha-1-SNAPSHOT.jar",
> - "xpp3/jars/xpp3-1.1.3.3.jar",
> - "xstream/jars/xstream-1.0-SNAPSHOT.jar",
> - //"maven/jars/maven-artifact-2.0-SNAPSHOT.jar",
> - //"maven/jars/wagon-api-1.0-alpha-1-SNAPSHOT.jar",
> - //"maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar"
> - };
> -
> String[] builds = new String[]
> {
> "maven-model",
> "maven-plugin",
> "maven-plugin-tools",
> "maven-artifact",
> - // "maven-1.x-integration",
> "maven-core",
> "maven-core-it-verifier"
> };
> @@ -224,7 +212,7 @@
>
> String basedir = System.getProperty( "user.dir" );
>
> - mbootDependencies = Arrays.asList( deps );
> + mbootDependencies = Arrays.asList( bootstrapDeps );
>
> if ( online )
> {
> @@ -323,9 +311,20 @@
>
> FileUtils.mkdir( new File( core ).getPath() );
>
> + String boot = new File( dist, "core/boot" ).getAbsolutePath();
> +
> + FileUtils.mkdir( new File( boot ).getPath() );
> +
> for ( int i = 0; i < plexusDeps.length; i++ )
> {
> - FileUtils.copyFileToDirectory( repoLocal + "/" +
plexusDeps[i], core );
> + if ( plexusDeps[i].startsWith( "classworlds") )
> + {
> + FileUtils.copyFileToDirectory( repoLocal + "/" +
plexusDeps[i], boot );
> + }
> + else
> + {
> + FileUtils.copyFileToDirectory( repoLocal + "/" +
plexusDeps[i], core );
> + }
> }
>
>
// ----------------------------------------------------------------------
> @@ -344,10 +343,7 @@
> d.artifactId.equals( "plexus" ) ||
> d.artifactId.equals( "xstream" ) ||
> d.artifactId.equals( "xpp3" ) ||
> - d.artifactId.equals( "junit" ) )// ||
> - //d.artifactId.equals( "wagon-api" ) ||
> - //d.artifactId.equals( "plexus-artifact-container" )
||
> - //d.artifactId.equals( "maven-artifact" ) )
> + d.artifactId.equals( "junit" ) )
> {
> continue;
> }
> @@ -434,7 +430,7 @@
> FileUtils.forceDelete( buildDirFile );
>
>
// ----------------------------------------------------------------------
> - // Download deps
> + // Download bootstrapDeps
>
// ----------------------------------------------------------------------
>
> if ( online )
> @@ -470,19 +466,19 @@
>
> generateSources( model.getAbsolutePath(), "java",
generatedSources, "4.0.0", "false" );
>
> - generateSources( model.getAbsolutePath(), "java",
generatedSources, "3.0.0", "true" );
> + //generateSources( model.getAbsolutePath(), "java",
generatedSources, "3.0.0", "true" );
>
> generateSources( model.getAbsolutePath(), "xpp3-reader",
generatedSources, "4.0.0", "false" );
>
> - generateSources( model.getAbsolutePath(), "xpp3-reader",
generatedSources, "3.0.0", "true" );
> + //generateSources( model.getAbsolutePath(), "xpp3-reader",
generatedSources, "3.0.0", "true" );
>
> generateSources( model.getAbsolutePath(), "xpp3-writer",
generatedSources, "4.0.0", "false" );
>
> - generateSources( model.getAbsolutePath(), "xpp3-writer",
generatedSources, "3.0.0", "true" );
> + //generateSources( model.getAbsolutePath(), "xpp3-writer",
generatedSources, "3.0.0", "true" );
>
> generateSources( model.getAbsolutePath(), "xdoc",
generatedDocs, "4.0.0", "false" );
>
> - generateSources( model.getAbsolutePath(), "xdoc",
generatedDocs, "3.0.0", "true" );
> + //generateSources( model.getAbsolutePath(), "xdoc",
generatedDocs, "3.0.0", "true" );
> }
>
>
// ----------------------------------------------------------------------
>
>
>
>