You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/01/29 23:26:35 UTC
svn commit: r739053 - in /maven/components/trunk/apache-maven: pom.xml
src/.cd/ src/.cd/apache-maven-3.0-SNAPSHOT.cd
src/.cd/apache-maven-3.0-SNAPSHOT.ldl src/.cd/apache-maven.cd
src/bin/mvnUpdate src/main/assembly/bin.xml
Author: ogusakov
Date: Thu Jan 29 22:26:34 2009
New Revision: 739053
URL: http://svn.apache.org/viewvc?rev=739053&view=rev
Log:
[MNG-3962] - self-update
Added:
maven/components/trunk/apache-maven/src/.cd/
maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.cd
maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.ldl
maven/components/trunk/apache-maven/src/.cd/apache-maven.cd
maven/components/trunk/apache-maven/src/bin/mvnUpdate (with props)
Modified:
maven/components/trunk/apache-maven/pom.xml
maven/components/trunk/apache-maven/src/main/assembly/bin.xml
Modified: maven/components/trunk/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/pom.xml?rev=739053&r1=739052&r2=739053&view=diff
==============================================================================
--- maven/components/trunk/apache-maven/pom.xml (original)
+++ maven/components/trunk/apache-maven/pom.xml Thu Jan 29 22:26:34 2009
@@ -73,6 +73,11 @@
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
+ <!--Mercury MP3-->
+ <dependency>
+ <groupId>org.sonatype.mercury</groupId>
+ <artifactId>mercury-mp3-cli</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
Added: maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.cd
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.cd?rev=739053&view=auto
==============================================================================
--- maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.cd (added)
+++ maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.cd Thu Jan 29 22:26:34 2009
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodeConfig>
+ <containers>
+ <container>
+ <id>apache-maven</id>
+ <version>3.0-SNAPSHOT</version>
+ <type>maven</type>
+ <distribution>
+ <name>org.apache.maven:maven-distribution:3.0-SNAPSHOT:bin:zip</name>
+ </distribution>
+ <dependencies>
+ <dependency>
+ <name>org.apache.maven:maven-core:3.0-SNAPSHOT</name>
+ </dependency>
+ </dependencies>
+ </container>
+ </containers>
+</nodeConfig>
Added: maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.ldl
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.ldl?rev=739053&view=auto
==============================================================================
--- maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.ldl (added)
+++ maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.ldl Thu Jan 29 22:26:34 2009
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lockDownList>
+ <dependencies>
+ <dependency>
+ <name>org.apache.maven:maven-core:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-lifecycle:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-reporting-api:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.doxia:doxia-sink-api:1.0-alpha-9::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-model:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-compat:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.wagon:wagon-provider-api:1.0-beta-4::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-plugin-api:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-container-default:1.0-beta-3.0.5::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.xbean:xbean-reflect:3.4::jar</name>
+ </dependency>
+ <dependency>
+ <name>asm:asm:2.2.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>asm:asm-commons:2.2.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>asm:asm-tree:2.2.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>log4j:log4j:1.2.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>commons-logging:commons-logging-api:1.1::jar</name>
+ </dependency>
+ <dependency>
+ <name>com.google.code.google-collections:google-collect:snapshot-20080530::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-project:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-project-builder:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>commons-cli:commons-cli:1.0::jar</name>
+ </dependency>
+ <dependency>
+ <name>commons-logging:commons-logging:1.0::jar</name>
+ </dependency>
+ <dependency>
+ <name>commons-lang:commons-lang:1.0::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-interactivity-api:1.0-alpha-6::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-component-api:1.0-alpha-16::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-interpolation:1.1::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-utils:1.5.6::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-classworlds:1.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-component-annotations:1.0-beta-3.0.5::jar</name>
+ </dependency>
+ <dependency>
+ <name>junit:junit:3.8.2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.sonatype.plexus:plexus-plugin-manager:1.0-alpha-1::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-plexus:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-repo-remote-m2:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-repo-api:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-transport-http:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.mortbay.jetty:jetty-client:6.1.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.mortbay.jetty:jetty-sslengine:6.1.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.mortbay.jetty:jetty:6.1.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.mortbay.jetty:jetty-util:6.1.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.mortbay.jetty:servlet-api-2.5:6.1.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-transport-api:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-repo-local-m2:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-repo-virtual:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-repo-cache-fs:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-md-sat:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.sat4j:org.sat4j.core:2.0.4::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.sat4j:org.sat4j.pb:2.0.4::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-md-shared:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-util:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-crypto-basic:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>bouncycastle:bcprov-jdk15:140::jar</name>
+ </dependency>
+ <dependency>
+ <name>bouncycastle:bcpg-jdk15:140::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-crypto-api:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-event:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-logging:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.slf4j:slf4j-jdk14:1.5.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.slf4j:slf4j-api:1.5.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-mercury:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-artifact:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-external:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-lang:1.1::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.sonatype.spice:model-builder:1.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.woodstox:wstx-asl:3.2.6::jar</name>
+ </dependency>
+ <dependency>
+ <name>stax:stax-api:1.0.1::jar</name>
+ </dependency>
+ </dependencies>
+</lockDownList>
Added: maven/components/trunk/apache-maven/src/.cd/apache-maven.cd
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/.cd/apache-maven.cd?rev=739053&view=auto
==============================================================================
--- maven/components/trunk/apache-maven/src/.cd/apache-maven.cd (added)
+++ maven/components/trunk/apache-maven/src/.cd/apache-maven.cd Thu Jan 29 22:26:34 2009
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodeConfig>
+ <containers>
+ <container>
+ <id>apache-maven</id>
+ <version>3.0-SNAPSHOT</version>
+ <type>maven</type>
+ <distribution>
+ <name>org.apache.maven:maven-distribution:3.0-SNAPSHOT:bin:zip</name>
+ </distribution>
+ <dependencies>
+ <dependency>
+ <name>org.apache.maven:maven-core:3.0-SNAPSHOT</name>
+ </dependency>
+ </dependencies>
+ </container>
+ </containers>
+</nodeConfig>
Added: maven/components/trunk/apache-maven/src/bin/mvnUpdate
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/bin/mvnUpdate?rev=739053&view=auto
==============================================================================
--- maven/components/trunk/apache-maven/src/bin/mvnUpdate (added)
+++ maven/components/trunk/apache-maven/src/bin/mvnUpdate Thu Jan 29 22:26:34 2009
@@ -0,0 +1,163 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Update Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven Update itself, use
+# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# ----------------------------------------------------------------------------
+
+QUOTED_ARGS=""
+while [ "$1" != "" ] ; do
+
+ QUOTED_ARGS="$QUOTED_ARGS \"$1\""
+ shift
+
+done
+
+if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+fi
+
+if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_VERSION" ] ; then
+ JAVA_VERSION="CurrentJDK"
+ else
+ echo "Using Java version: $JAVA_VERSION"
+ fi
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$HOME" ] &&
+ HOME=`cygpath --path --windows "$HOME"`
+fi
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -jar "${M2_HOME}"/.cd/bin/*.jar \
+ -m "${M2_HOME}" \
+ $QUOTED_ARGS
+
+
Propchange: maven/components/trunk/apache-maven/src/bin/mvnUpdate
------------------------------------------------------------------------------
svn:executable = *
Modified: maven/components/trunk/apache-maven/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/main/assembly/bin.xml?rev=739053&r1=739052&r2=739053&view=diff
==============================================================================
--- maven/components/trunk/apache-maven/src/main/assembly/bin.xml (original)
+++ maven/components/trunk/apache-maven/src/main/assembly/bin.xml Thu Jan 29 22:26:34 2009
@@ -49,6 +49,12 @@
<exclude>jdom:jdom</exclude>
</excludes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>.cd/bin</outputDirectory>
+ <includes>
+ <include>org.sonatype.mercury:mercury-mp3-cli</include>
+ </includes>
+ </dependencySet>
</dependencySets>
<fileSets>
<fileSet>
@@ -76,6 +82,8 @@
<include>mvnDebug</include>
<!-- This is so that CI systems can periodically run the profiler -->
<include>mvnyjp</include>
+ <!-- This is self-update CLI -->
+ <include>mvnUpdate</include>
</includes>
<lineEnding>unix</lineEnding>
<fileMode>0755</fileMode>
@@ -84,5 +92,9 @@
<directory>src/conf</directory>
<outputDirectory>conf</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>src/.cd</directory>
+ <outputDirectory>.cd</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
Re: svn commit: r739053 - in /maven/components/trunk/apache-maven: pom.xml src/.cd/ src/.cd/apache-maven-3.0-SNAPSHOT.cd src/.cd/apache-maven-3.0-SNAPSHOT.ldl src/.cd/apache-maven.cd src/bin/mvnUpdate src/main/assembly/bin.xml
Posted by Brett Porter <br...@apache.org>.
Is there more info available than what is in the commit and the jira?
I found this one a bit hard to follow... a few questions anyway:
On 30/01/2009, at 9:26 AM, ogusakov@apache.org wrote:
> Author: ogusakov
> Date: Thu Jan 29 22:26:34 2009
> New Revision: 739053
>
> URL: http://svn.apache.org/viewvc?rev=739053&view=rev
> Log:
> [MNG-3962] - self-update
>
> Added:
> maven/components/trunk/apache-maven/src/.cd/
I don't quite get this... is it really meant to be a hidden directory?
Won't it cause problems for editors, etc.?
>
> + <!--Mercury MP3-->
> + <dependency>
> + <groupId>org.sonatype.mercury</groupId>
> + <artifactId>mercury-mp3-cli</artifactId>
> + </dependency>
While I'm quite sure I get the joke, it seems more like an audio-
related acronym, and maybe a better choice is needed :)
> Added: maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-
> SNAPSHOT.ldl
> URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.ldl?rev=739053&view=auto
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-
> SNAPSHOT.ldl (added)
> +++ maven/components/trunk/apache-maven/src/.cd/apache-maven-3.0-
> SNAPSHOT.ldl Thu Jan 29 22:26:34 2009
> @@ -0,0 +1,191 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<lockDownList>
Can this be autogenerated? Quite long.
>
>
> Added: maven/components/trunk/apache-maven/src/bin/mvnUpdate
> URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/bin/mvnUpdate?rev=739053&view=auto
Seems to be 90% the same as mvn - can this either be a parameter to
mvn itself, or constructed by the build so it doesn't take too much to
keep it up to date if one of the batch/launch files changes?
Anyway, sounds cool, should be fun to see how it works.
- Brett
--
Brett Porter
brett@apache.org
http://blogs.exist.com/bporter/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org