Bommels05/BefatorNix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
BefatorNix/maven/maven_2-bootstrap-3.patch
Some One 8292f027a9 maven 2 work
2025-10-05 22:57:02 +02:00

306 lines
12 KiB
Diff
Raw Permalink Blame History

diff --git a/m2-bootstrap-all.sh b/m2-bootstrap-all.sh
index 3ab354b..2c63f57 100644
--- a/m2-bootstrap-all.sh
+++ b/m2-bootstrap-all.sh
@@ -30,13 +30,3 @@ ret=$?; if [ $ret != 0 ]; then exit $ret; fi
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
)
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-
-(
- cd ./maven-core-it
- echo
- echo "Running maven-core integration tests ..."
- echo
- ./maven-core-it.sh $ARGS
- ret=$?; if [ $ret != 0 ]; then exit $ret; fi
-)
-ret=$?; if [ $ret != 0 ]; then exit $ret; fi
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 2596608..1c1b5e7 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,10 +25,5 @@
<artifactId>wagon-file</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>maven</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java
index ea18f9c..c3ea328 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java
@@ -85,6 +85,7 @@ public abstract class ArtifactComponentTestCase
File f = new File( getBasedir(), path );
repository.setUrl( "file://" + f.getPath() );
+ repository.setId("unnamed");
return repository;
}
@@ -94,6 +95,7 @@ public abstract class ArtifactComponentTestCase
ArtifactRepository repository = new ArtifactRepository();
repository.setUrl( "http://foo.bar/repository" );
+ repository.setId("unnamed2");
return repository;
}
diff --git a/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java b/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
index 2c7e4d8..6bec532 100644
--- a/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
+++ b/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
@@ -1,6 +1,5 @@
package org.apache.maven.it;
-import org.apache.xpath.XPathAPI;
import org.apache.maven.it.cli.Commandline;
import org.apache.maven.it.cli.CommandLineUtils;
import org.apache.maven.it.cli.StreamConsumer;
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index e57b321..5abf9e3 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -51,12 +51,7 @@
<groupId>maven</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>maven</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </dependency>
+ </dependency>
</dependencies>
<distributionManagement>
<site>
diff --git a/maven-core/src/bin/m2 b/maven-core/src/bin/m2
index 6e90d67..7f2c88a 100755
--- a/maven-core/src/bin/m2
+++ b/maven-core/src/bin/m2
@@ -5,6 +5,14 @@
# All rights reserved.
# -----------------------------------------------------------------------------
+if [ -z "$M2_HOME" ]; then
+ #find the path of the bin directory
+ BIN_DIR=`dirname $0`
+
+ #use dirname once again to trim the /bin from the m2_home path
+ M2_HOME=`dirname $BIN_DIR`
+fi
+
#@#
CLASSWORLDS_JAR=${M2_HOME}/core/boot/classworlds-*.jar
CLASSWORLDS_CONF=${M2_HOME}/bin/m2.conf
@@ -63,14 +71,6 @@ if $cygwin; then
[ -n "$M2_HOME" ] && M2_HOME=`cygpath --path --unix "$M2_HOME"`
fi
-if [ -z "$M2_HOME" ]; then
- #find the path of the bin directory
- BIN_DIR=`dirname $0`
-
- #use dirname once again to trim the /bin from the m2_home path
- M2_HOME=`dirname $BIN_DIR`
-fi
-
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
[ -n "$CP" ] && CP=`cygpath --path --windows "$CP"`
@@ -84,5 +84,6 @@ $JAVACMD \
-classpath ${CLASSWORLDS_JAR} \
"-Dclassworlds.conf=${CLASSWORLDS_CONF}" \
"-Dmaven.home=${M2_HOME}" \
+ "-Dmaven.repo.local=/build/.maven/repository" \
${CLASSWORLDS_LAUNCHER} $@
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
index fc1d0da..67e6f8f 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
@@ -212,7 +212,7 @@ public class DefaultPluginManager
remotePluginRepositories,
localRepository,
metadataSource,
- artifactFilter );
+ new String[]{"maven-core", "maven-artifact", "maven-model", "maven-plugin", "plexus-container-api", "plexus-container-default", "plexus-artifact-container", "plexus-utils", "classworlds"} );
}
public void contextualize( Context context )
diff --git a/maven-core/src/main/java/org/apache/maven/repository/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/repository/RepositoryUtils.java
index ccd7b2d..a1edb94 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/RepositoryUtils.java
@@ -32,6 +32,7 @@ public class RepositoryUtils
ArtifactRepository retValue = new ArtifactRepository();
retValue.setUrl( mavenRepository.getUrl() );
+ retValue.setId(mavenRepository.getId());
return retValue;
}
diff --git a/maven-mboot2/src/main/java/MBoot.java b/maven-mboot2/src/main/java/MBoot.java
index 059469a..b4d91d9 100644
--- a/maven-mboot2/src/main/java/MBoot.java
+++ b/maven-mboot2/src/main/java/MBoot.java
@@ -39,7 +39,7 @@ public class MBoot
"modello/jars/modello-xdoc-plugin-1.0-SNAPSHOT.jar",
"modello/jars/modello-xml-plugin-1.0-SNAPSHOT.jar",
"modello/jars/modello-xpp3-plugin-1.0-SNAPSHOT.jar",
- "plexus/jars/plexus-utils-1.0-alpha-1-SNAPSHOT.jar",
+ "plexus/jars/plexus-utils-1.0-alpha-1.jar",
"surefire/jars/surefire-booter-1.2-SNAPSHOT.jar",
"surefire/jars/surefire-1.2-SNAPSHOT.jar",
"qdox/jars/qdox-1.2.jar"
@@ -52,9 +52,8 @@ public class MBoot
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"
+ "plexus/jars/plexus-container-default-1.0-alpha-1.jar",
+ "plexus/jars/plexus-utils-1.0-alpha-1.jar"
};
// ----------------------------------------------------------------------
@@ -64,9 +63,8 @@ public class MBoot
String[] modelloDeps = 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",
+ "plexus/jars/plexus-container-default-1.0-alpha-1.jar",
+ "plexus/jars/plexus-utils-1.0-alpha-1.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",
diff --git a/maven-plugin-tools/pom.xml b/maven-plugin-tools/pom.xml
index 61c3b37..08c16be 100644
--- a/maven-plugin-tools/pom.xml
+++ b/maven-plugin-tools/pom.xml
@@ -24,7 +24,7 @@
</dependency>
<dependency>
<groupId>modello</groupId>
- <artifactId>modello</artifactId>
+ <artifactId>modello-core</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 0dec2c9..890b23b 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -19,7 +19,7 @@
</dependency>
<dependency>
<groupId>modello</groupId>
- <artifactId>modello</artifactId>
+ <artifactId>modello-core</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
index 0ed1497..e821d8d 100644
--- a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
+++ b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
@@ -95,19 +95,7 @@ public class CompilerMojo
}
}
- boolean compilationError = false;
-
- for ( Iterator i = messages.iterator(); i.hasNext(); )
- {
- CompilerError message = (CompilerError) i.next();
-
- if ( message.isError() )
- {
- compilationError = true;
- }
- }
-
- if ( compilationError )
+ if (!messages.isEmpty())
{
response.setExecutionFailure( true, new CompilationFailureResponse( messages ) );
}
diff --git a/maven-plugins/maven-compiler-plugin/pom.xml b/maven-plugins/maven-compiler-plugin/pom.xml
index 839af27..131e61a 100644
--- a/maven-plugins/maven-compiler-plugin/pom.xml
+++ b/maven-plugins/maven-compiler-plugin/pom.xml
@@ -18,7 +18,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.17</version>
+ <version>0.17-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
diff --git a/maven-plugins/maven-jar-plugin/pom.xml b/maven-plugins/maven-jar-plugin/pom.xml
index bc24dd6..c7a8d7a 100644
--- a/maven-plugins/maven-jar-plugin/pom.xml
+++ b/maven-plugins/maven-jar-plugin/pom.xml
@@ -17,7 +17,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.17</version>
+ <version>0.17-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>maven</groupId>
diff --git a/maven-plugins/maven-resources-plugin/pom.xml b/maven-plugins/maven-resources-plugin/pom.xml
index 2702022..1d03127 100644
--- a/maven-plugins/maven-resources-plugin/pom.xml
+++ b/maven-plugins/maven-resources-plugin/pom.xml
@@ -27,7 +27,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.17</version>
+ <version>0.17-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 9ca423b..f8f1d42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,15 +81,10 @@
</developers>
<dependencies>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-container-api</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
+ <version>1.0-alpha-1</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
@@ -99,7 +94,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
+ <version>1.0-alpha-1</version>
</dependency>
<dependency>
<groupId>classworlds</groupId>
Reference in New Issue View Git Blame Copy Permalink