Репозитории ALT
S: | 3.6.3-alt5_10jpp11 |
5.1: | 1.1-alt7_7jpp5 |
4.1: | 1.1-alt6_3jpp1.7 |
4.0: | 1.1-alt6_3jpp1.7 |
Группа :: Разработка/Java
Пакет: maven
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: maven-1.1-jpp.patch
Скачать
Скачать
--- src/bin/maven.sav0 2006-07-24 20:46:56.000000000 +0200
+++ src/bin/maven 2007-04-10 17:57:40.000000000 +0200
@@ -18,8 +18,6 @@
# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
# reserved.
-FOREHEAD_VERSION=1.0-beta-5
-
if [ -z "$MAVEN_OPTS" ] ; then
MAVEN_OPTS="-Xmx256m"
fi
@@ -148,7 +146,7 @@
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
"-Djava.endorsed.dirs=${MAVEN_ENDORSED}" \
- -classpath "${MAVEN_HOME}/lib/forehead-${FOREHEAD_VERSION}.jar" \
+ -classpath "${MAVEN_HOME}/lib/forehead.jar" \
"-Dforehead.conf.file=${MAVEN_HOME}/bin/forehead.conf" \
"-Dtools.jar=$TOOLS_JAR" \
"-Dmaven.home=${MAVEN_HOME}" \
--- src/bin/forehead.conf.sav0 2006-04-26 00:18:36.000000000 +0200
+++ src/bin/forehead.conf 2007-04-10 18:00:55.000000000 +0200
@@ -22,11 +22,11 @@
[root]
${tools.jar}
- ${maven.home}/lib/ant-*.jar
- ${maven.home}/lib/commons-logging-*.jar
- ${maven.home}/lib/log4j-*.jar
+ ${maven.home}/lib/ant*.jar
+ ${maven.home}/lib/commons-logging.jar
+ ${maven.home}/lib/log4j.jar
${maven.home}/lib/endorsed/*.jar
[root.maven]
${maven.home}/lib/*.jar
- ${maven.home}/lib/endorsed/*.jar
\ No newline at end of file
+ ${maven.home}/lib/endorsed/*.jar
--- project.properties.sav0 2007-06-20 20:49:15.000000000 +0200
+++ project.properties 2007-08-16 14:55:51.000000000 +0200
@@ -207,13 +207,13 @@
#=====
maven.bootstrap.plugins = clean/**,jar/**,java/**,license/**,plugin/**,test/**
maven.bootstrap.test.plugins = true
-maven.plugins.directory = ${basedir}/../plugins
+maven.plugins.directory = ${basedir}/../maven-plugins
# Plugins to bundle in maven
maven.plugins.includes = */project.xml
maven.plugins.excludes = plugins-common/project.xml,plugins-parent/project.xml,plugins-site/project.xml,examples/project.xml,touchstone/**,touchstone-partner/**
-maven.get.jars.baseUrl = http://repo1.maven.org/maven
+maven.get.jars.baseUrl = file://${basedir}/repository
# can't go under target, currently cleans stuff that is needed
maven.bootstrap.dir = ${basedir}/bootstrap
@@ -225,7 +225,7 @@
# Offline mode:
# maven.bootstrap.online = -o
# ------------------------------------------------------------------------------
-maven.bootstrap.online=
+maven.bootstrap.online= -o
# ------------------------------------------------------------------------------
# The bootstrap classes consist of an Ant task front that:
--- build-bootstrap.xml.sav0 2007-03-11 22:15:50.000000000 +0100
+++ build-bootstrap.xml 2010-09-05 22:20:47.000000000 +0200
@@ -43,9 +43,20 @@
todir="${maven.bootstrap.install.dir}/lib"
overwrite="yes"
/>
+ <!-- Install maven to a local repo so that plugins can use it -->
+
+ <copy
+ file="${maven.bootstrap.dir}/maven.jar"
+ todir="${maven.repo.local}/maven/jars"
+ overwrite="true"
+ />
+
<copy tofile="${maven.bootstrap.install.dir}/maven-project-3.xsd" overwrite="yes" file="${basedir}/src/xsd/maven-v3_0_0.xsd"/>
- <copy todir="${maven.home}">
- <fileset dir="${maven.bootstrap.install.dir}"/>
+ <copy todir="${maven.home}/bin">
+ <fileset dir="${maven.bootstrap.install.dir}/bin"/>
+ </copy>
+ <copy todir="${maven.home}/plugins">
+ <fileset dir="${maven.bootstrap.install.dir}/plugins"/>
</copy>
<chmod file="${maven.home}/bin/maven" perm="+x"/>
</target>
@@ -65,7 +76,6 @@
<arg value="${maven.bootstrap.online}"/>
<arg value="clean"/>
<arg value="jar:jar"/>
- <arg value="maven:run-touchstone"/>
<!-- Allows failonerror to work -->
<env key="MAVEN_TERMINATE_CMD" value="on" />
</exec>
@@ -316,12 +326,23 @@
</fileset>
</delete>
+ <!-- Install maven to a local repo so that plugins can use it -->
+
+ <copy
+ file="${maven.bootstrap.dir}/maven.jar"
+ todir="${maven.repo.local}/maven/jars"
+ overwrite="true"
+ />
+
<copy todir="${maven.bootstrap.install.dir}/plugins">
<fileset dir="${maven.plugins.directory}" includes="${maven.bootstrap.plugins},project.xml" excludes="**/maven.xml,**/target/**" />
</copy>
- <copy todir="${maven.home}">
- <fileset dir="${maven.bootstrap.install.dir}" />
+ <copy todir="${maven.home}/bin">
+ <fileset dir="${maven.bootstrap.install.dir}/bin" />
+ </copy>
+ <copy todir="${maven.home}/plugins">
+ <fileset dir="${maven.bootstrap.install.dir}/plugins" />
</copy>
<!-- Now we have a functional maven install -->
@@ -349,8 +370,10 @@
depends="env">
<delete dir="${maven.home}/bin"/>
<mkdir dir="${maven.home}/bin"/>
+<!--
<delete dir="${maven.home}/lib"/>
<mkdir dir="${maven.home}/lib"/>
+-->
<delete dir="${maven.home}/plugins"/>
<mkdir dir="${maven.home}/plugins"/>
<!-- cleanup the local plugins dir -->
--- project.xml.sav0 2007-06-25 02:23:55.000000000 +0200
+++ project.xml 2011-01-19 21:57:43.000000000 +0100
@@ -539,234 +539,277 @@
<!-- Need to mark these as compile-time/run-time -->
<dependencies>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>dom4j</artifactId>
<version>1.7-20060614</version>
+ <jar>dom4j.jar</jar>
<url>http://www.dom4j.org/</url>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
+ <groupId>JPP</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-9</version>
+ <jar>jaxen.jar</jar>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>JPP</groupId>
<artifactId>ant</artifactId>
<version>1.6.5</version>
+ <jar>ant.jar</jar>
<url>http://ant.apache.org/</url>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>JPP</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.6.5</version>
+ <jar>ant17/ant17-nodeps.jar</jar>
<url>http://ant.apache.org/</url>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>JPP</groupId>
<artifactId>ant-junit</artifactId>
<version>1.6.5</version>
+ <jar>ant17/ant17-junit.jar</jar>
<url>http://ant.apache.org/</url>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>JPP</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.6.5</version>
+ <jar>ant17-launcher.jar</jar>
<url>http://ant.apache.org/</url>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>JPP</groupId>
<artifactId>ant-trax</artifactId>
<version>1.6.5</version>
+ <jar>ant17/ant17-trax.jar</jar>
<url>http://ant.apache.org/</url>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.0.1-20060717</version>
+ <jar>commons-jelly.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/</url>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-ant</artifactId>
<version>1.1</version>
+ <jar>jelly-tags/commons-jelly-tags-ant.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/libs/ant/</url>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-define</artifactId>
<version>1.0</version>
+ <jar>jelly-tags/commons-jelly-tags-define.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/libs/define/</url>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-util</artifactId>
<version>1.1.1</version>
+ <jar>jelly-tags/commons-jelly-tags-util.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/libs/util/</url>
</dependency>
<dependency>
- <groupId>commons-jelly</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
+ <jar>jelly-tags/commons-jelly-tags-xml.jar</jar>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-jexl</artifactId>
<version>1.1</version>
+ <jar>commons-jexl.jar</jar>
<url>http://jakarta.apache.org/commons/jexl/</url>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
+ <jar>commons-logging.jar</jar>
<url>http://jakarta.apache.org/commons/logging/</url>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0</version>
+ <jar>commons-httpclient.jar</jar>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-codec</artifactId>
<version>1.2</version>
+ <jar>commons-codec.jar</jar>
<url>http://jakarta.apache.org/commons/codec/</url>
<properties>
<comment>This library is needed by httpclient.</comment>
</properties>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-cli</artifactId>
<version>1.0-beta-2</version>
+ <jar>commons-cli10.jar</jar>
<url>http://jakarta.apache.org/commons/cli/</url>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-io</artifactId>
<version>1.2</version>
+ <jar>commons-io.jar</jar>
<url>http://jakarta.apache.org/commons/io/</url>
</dependency>
<dependency>
- <groupId>forehead</groupId>
+ <groupId>JPP</groupId>
<artifactId>forehead</artifactId>
<version>1.0-beta-5</version>
+ <jar>forehead.jar</jar>
</dependency>
<dependency>
- <groupId>log4j</groupId>
+ <groupId>JPP</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
+ <jar>log4j.jar</jar>
<url>http://logging.apache.org/log4j/docs/</url>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
+ <jar>xml-commons-jaxp-1.3-apis.jar</jar>
<url>http://xml.apache.org/commons/</url>
<properties>
<endorsed>true</endorsed>
</properties>
</dependency>
<dependency>
- <groupId>xml-resolver</groupId>
+ <groupId>JPP</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
+ <jar>xml-commons-resolver11.jar</jar>
<url>http://xml.apache.org/commons/</url>
<properties>
<endorsed>true</endorsed>
</properties>
</dependency>
<dependency>
- <groupId>xerces</groupId>
+ <groupId>JPP</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.0</version>
+ <jar>xerces-j2.jar</jar>
<url>http://xerces.apache.org/xerces2-j/</url>
<properties>
<endorsed>true</endorsed>
</properties>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>JPP</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.0.5</version>
+ <jar>plexus/utils.jar</jar>
<properties>
<scope>runtime</scope>
</properties>
</dependency>
<dependency>
- <groupId>maven</groupId>
+ <groupId>JPP</groupId>
<artifactId>maven-model</artifactId>
<version>3.0.2</version>
+ <jar>maven-model.jar</jar>
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>JPP</groupId>
<artifactId>stax</artifactId>
<version>1.2.0</version>
+ <jar>bea-stax-ri.jar</jar>
</dependency>
<dependency>
- <groupId>stax</groupId>
+ <groupId>JPP</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
+ <jar>bea-stax-api.jar</jar>
</dependency>
<dependency>
- <groupId>net.java.dev.stax-utils</groupId>
+ <groupId>JPP</groupId>
<artifactId>stax-utils</artifactId>
<version>20060502</version>
+ <jar>stax-utils.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/provider-api.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
<artifactId>wagon-http</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/http.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
+ <artifactId>wagon-http-shared</artifactId>
+ <version>1.0-beta-2</version>
+ <jar>maven-wagon/http-shared.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>JPP</groupId>
<artifactId>wagon-file</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/file.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
<artifactId>wagon-ssh-common</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/ssh-common.jar</jar>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
+ <groupId>JPP</groupId>
<artifactId>wagon-ssh</artifactId>
<version>1.0-beta-2</version>
+ <jar>maven-wagon/ssh.jar</jar>
</dependency>
<!-- Runtime dependencies -->
<dependency>
- <groupId>commons-beanutils</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
+ <jar>commons-beanutils16.jar</jar>
<properties>
<scope>runtime</scope>
</properties>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
+ <jar>commons-collections.jar</jar>
<properties>
<scope>runtime</scope>
</properties>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>JPP</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
+ <jar>commons-lang.jar</jar>
<properties>
<scope>runtime</scope>
</properties>
</dependency>
<dependency>
- <groupId>com.jcraft</groupId>
+ <groupId>JPP</groupId>
<artifactId>jsch</artifactId>
<version>0.1.27</version>
+ <jar>jsch.jar</jar>
<properties>
<scope>runtime</scope>
</properties>