Author: aheritier
Date: Mon Oct 9 09:08:46 2006
New Revision: 454414
URL: http://svn.apache.org/viewvc?view=rev&rev=454414
Log:
MAVEN-1755 : New maven-model using dom4j as reader.
Modified:
maven/components/trunk/maven-model/maven.xml
maven/components/trunk/maven-model/project.properties
maven/components/trunk/maven-model/project.xml
Modified: maven/components/trunk/maven-model/maven.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model/maven.xml?view=diff&rev=454414&r1=454413&r2=454414
==============================================================================
--- maven/components/trunk/maven-model/maven.xml (original)
+++ maven/components/trunk/maven-model/maven.xml Mon Oct 9 09:08:46 2006
@@ -5,16 +5,16 @@
<j:set var="sourcesPresent" value="true" />
<modello:generate model="maven.mdo" type="java" packageWithVersion="false"
version="3.0.0" targetDirectory="target/generated-sources" />
- <modello:generate model="maven.mdo" type="xpp3-reader"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
- <modello:generate model="maven.mdo" type="xpp3-writer"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
+ <modello:generate model="maven.mdo" type="dom4j-reader"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
+ <modello:generate model="maven.mdo" type="dom4j-writer"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
<!-- Need the original package as well -->
<ant:copy tofile="target/maven.mdo.m1" file="maven.mdo" />
<ant:replace file="target/maven.mdo.m1" token="org.apache.maven.model"
value="org.apache.maven.project" />
<modello:generate model="target/maven.mdo.m1" type="java"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
- <modello:generate model="target/maven.mdo.m1" type="xpp3-reader"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
- <modello:generate model="target/maven.mdo.m1" type="xpp3-writer"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
+ <modello:generate model="target/maven.mdo.m1" type="dom4j-reader"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
+ <modello:generate model="target/maven.mdo.m1" type="dom4j-writer"
packageWithVersion="false" version="3.0.0"
targetDirectory="target/generated-sources" />
</preGoal>
</project>
Modified: maven/components/trunk/maven-model/project.properties
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model/project.properties?view=diff&rev=454414&r1=454413&r2=454414
==============================================================================
--- maven/components/trunk/maven-model/project.properties (original)
+++ maven/components/trunk/maven-model/project.properties Mon Oct 9 09:08:46
2006
@@ -1,14 +1,28 @@
-maven.repo.remote=http://cvs.apache.org/repository,http://www.ibiblio.org/maven
+#=====
+# Repositories settings
+#=====
+
+# TODO: remove http://people.apache.org/repo/m1-snapshot-repository/, just
there for SNAPSHOTs
+maven.repo.remote =
http://www.ibiblio.org/maven,http://people.apache.org/repo/m1-snapshot-repository/
+
+# Repository to deploy to
maven.repo.list=apache.snapshots
-maven.repo.apache.snapshots=scp://cvs.apache.org
-maven.repo.apache.snapshots.directory=/www/cvs.apache.org/repository
-maven.repo.apache.snapshots.username=${maven.repo.apache.username}
-maven.repo.apache.snapshots.privatekey=${maven.repo.apache.privatekey}
-maven.repo.apache.snapshots.passphrase=${maven.repo.apache.passphrase}
-maven.repo.apache.snapshots.group=maven
-maven.repo.apache.releases=scp://people.apache.org
-maven.repo.apache.releases.directory=/www/www.apache.org/dist/java-repository
+maven.repo.apache.releases=scp://${pom.distributionSite}
+maven.repo.apache.releases.directory=${pom.distributionDirectory}
+maven.repo.apache.releases.group=maven
+# These must be set elsewhere
+#maven.repo.apache.releases.username=
+#maven.repo.apache.releases.privatekey=
+#maven.repo.apache.releases.passphrase=
+
+# Repository to deploy snapshots
+maven.repo.apache.snapshots=scp://people.apache.org
+maven.repo.apache.snapshots.directory=/www/people.apache.org/repo/m1-snapshot-repository
+maven.repo.apache.snapshots.username=${maven.repo.apache.releases.username}
+maven.repo.apache.snapshots.privatekey=${maven.repo.apache.releases.privatekey}
+maven.repo.apache.snapshots.passphrase=${maven.repo.apache.releases.passphrase}
+maven.repo.apache.snapshots.group=${maven.repo.apache.releases.group}
maven.compile.source=1.4
-maven.compile.target=1.4
+maven.compile.target=1.4
\ No newline at end of file
Modified: maven/components/trunk/maven-model/project.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model/project.xml?view=diff&rev=454414&r1=454413&r2=454414
==============================================================================
--- maven/components/trunk/maven-model/project.xml (original)
+++ maven/components/trunk/maven-model/project.xml Mon Oct 9 09:08:46 2006
@@ -4,20 +4,29 @@
<name>Maven Model</name>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <currentVersion>3.0.1</currentVersion>
+ <currentVersion>3.0.2-SNAPSHOT</currentVersion>
<description>Maven Model</description>
<shortDescription>Maven Model</shortDescription>
<dependencies>
<dependency>
<groupId>maven</groupId>
<artifactId>maven-modello-plugin</artifactId>
- <version>1.0-alpha-2</version>
+ <version>1.0-alpha-3-SNAPSHOT</version>
<type>plugin</type>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.0-alpha-3</version>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.7-20060614</version>
+ <url>http://www.dom4j.org/</url>
</dependency>
</dependencies>
+ <build>
+ <defaultGoal>jar</defaultGoal>
+ </build>
</project>
