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/07 01:29:25 UTC
svn commit: r732186 - in /maven/mercury/trunk:
mercury-ant/mercury-ant-tasks/src/site/apt/ mercury-ant/src/site/xdoc/
mercury-it/ mercury-maven/ mercury-maven/mercury-compare-maven-plugin/
mercury-maven/mercury-compare-mdo/ mercury-maven/mercury-compar...
Author: ogusakov
Date: Tue Jan 6 16:29:24 2009
New Revision: 732186
URL: http://svn.apache.org/viewvc?rev=732186&view=rev
Log:
documentation updates, small pom streamlining, upgrade to test [MNG-3856]
Added:
maven/mercury/trunk/mercury-maven/list-dep.txt (with props)
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/site/apt/howto.apt
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/site/apt/intro.apt
maven/mercury/trunk/mercury-ant/src/site/xdoc/index.xml
maven/mercury/trunk/mercury-it/pom.xml
maven/mercury/trunk/mercury-maven/list-.txt
maven/mercury/trunk/mercury-maven/list.txt
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/site/apt/howto.apt
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/site/apt/howto.apt?rev=732186&r1=732185&r2=732186&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/site/apt/howto.apt (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/site/apt/howto.apt Tue Jan 6 16:29:24 2009
@@ -1,3 +1,11 @@
+ ------
+ Maven Ant tasks
+ ------
+ Oleg Gusakov
+ ------
+ 21 December 2008
+ ------
+
Where to get mercury-ant-tasks?
All the development releases will be deployed to {{{http://people.apache.org/~ogusakov/repos/test/org/apache/maven/mercury/mercury-ant-tasks/1.0-alpha-1-SNAPSHOT}this site}}
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/site/apt/intro.apt
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/site/apt/intro.apt?rev=732186&r1=732185&r2=732186&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/site/apt/intro.apt (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/site/apt/intro.apt Tue Jan 6 16:29:24 2009
@@ -1,3 +1,11 @@
+ ------
+ Maven Ant tasks
+ ------
+ Oleg Gusakov
+ ------
+ 21 December 2008
+ ------
+
Mercury Ant Tasks
This project is an implementation of Ant wrapper for Mercury functionality. It also implements a
Modified: maven/mercury/trunk/mercury-ant/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/src/site/xdoc/index.xml?rev=732186&r1=732185&r2=732186&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/src/site/xdoc/index.xml (original)
+++ maven/mercury/trunk/mercury-ant/src/site/xdoc/index.xml Tue Jan 6 16:29:24 2009
@@ -32,19 +32,6 @@
<p>Mercury Ant tasks is an Apache Ant wrapper for Mercury functionality. It supports both new and a subset of the old maven-ant-tasks syntax</p>
- <p>
- <!-- workaround for DOXIA-227: usemap attribute is stripped (fixed in Doxia 1.1, was 1.0-beta-1) -->
- <script type="text/javascript">
- tag='<img src="mercury-deps.png" width="610" height="498" border="0" usemap="#Mercury_dependencies" />';
- tag=tag.substring(0,tag.length-2)+' usemap=\'#Mercury_ant_dependencies\''+tag.substring(tag.length-2);
- document.write(tag);
- </script>
-
- <map name="Mercury_ant_dependencies">
- <area shape="rect" coords="145,1,297,30" href="mercury-ant-tasks/" />
- </map>
- </p>
-
</section>
</body>
Modified: maven/mercury/trunk/mercury-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/pom.xml?rev=732186&r1=732185&r2=732186&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/pom.xml (original)
+++ maven/mercury/trunk/mercury-it/pom.xml Tue Jan 6 16:29:24 2009
@@ -61,6 +61,7 @@
</properties>
<dependencies>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-event</artifactId>
Modified: maven/mercury/trunk/mercury-maven/list-.txt
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/list-.txt?rev=732186&r1=732185&r2=732186&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/list-.txt (original)
+++ maven/mercury/trunk/mercury-maven/list-.txt Tue Jan 6 16:29:24 2009
@@ -1,21 +1,3 @@
-====
- 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.
-====
asm:asm-xml:3.0
org.apache.maven.plugins:maven-antrun-plugin:1.2
org.apache.maven.plugins:maven-archetypeng-plugin:2.0
Added: maven/mercury/trunk/mercury-maven/list-dep.txt
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/list-dep.txt?rev=732186&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-maven/list-dep.txt (added)
+++ maven/mercury/trunk/mercury-maven/list-dep.txt Tue Jan 6 16:29:24 2009
@@ -0,0 +1 @@
+org.apache.maven.plugins:maven-dependency-plugin:2.0
Propchange: maven/mercury/trunk/mercury-maven/list-dep.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-maven/list-dep.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/mercury/trunk/mercury-maven/list.txt
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/list.txt?rev=732186&r1=732185&r2=732186&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/list.txt (original)
+++ maven/mercury/trunk/mercury-maven/list.txt Tue Jan 6 16:29:24 2009
@@ -1,21 +1,3 @@
-====
- 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.
-====
excalibur-xmlutil:excalibur-xmlutil:20020820
excalibur-xmlutil:excalibur-xmlutil:1.0
excalibur-xmlutil:excalibur-xmlutil:2.1
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml?rev=732186&r1=732185&r2=732186&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml Tue Jan 6 16:29:24 2009
@@ -22,8 +22,8 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-pom</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <artifactId>mercury</artifactId>
+ <version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
<groupId>org.sonatype.maven.plugins</groupId>
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml?rev=732186&r1=732185&r2=732186&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml Tue Jan 6 16:29:24 2009
@@ -22,8 +22,8 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-pom</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <artifactId>mercury</artifactId>
+ <version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
<artifactId>mercury-compare-mdo</artifactId>
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml?rev=732186&r1=732185&r2=732186&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml Tue Jan 6 16:29:24 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
<groupId>org.sonatype.maven.plugins</groupId>
@@ -43,9 +43,9 @@
<timezone>-8</timezone>
</developer>
</developers>
-
+
<properties>
- <maven.version>3.0-SNAPSHOT</maven.version>
+ <maven.version>3.0-alpha-1</maven.version>
</properties>
<dependencies>
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml?rev=732186&r1=732185&r2=732186&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml Tue Jan 6 16:29:24 2009
@@ -38,31 +38,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <!--
- <version>1.0-alpha-17</version>
- -->
- <configuration>
- <version>1.0.0</version>
- <models>
- <model>src/main/mdo/cached-metadata.mdo</model>
- </models>
- </configuration>
- <executions>
- <execution>
- <id>standard</id>
- <goals>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
- <goal>xpp3-writer</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file