You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2006/05/16 12:27:16 UTC
svn commit: r406895 [7/7] - in /maven/continuum/trunk: ./
continuum-api/src/main/java/org/apache/maven/continuum/
continuum-api/src/main/java/org/apache/maven/continuum/configuration/
continuum-api/src/main/java/org/apache/maven/continuum/execution/ co...
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm Tue May 16 03:26:59 2006
@@ -1,4 +1,4 @@
-$page.setTitle( "Continuum - Project View: ${item.name}" )
+$page.setTitle( "Continuum - Project View: Continuum Web" )
#if ( $data.user )
#set ( $c1user = $continuum.getUser( $data.user.userId ) )
@@ -10,12 +10,14 @@
#if ( $continuum.security.isAuthorized( $c1user, "showProject" ) )
<div>
- <p style="border-top: 1px solid transparent; border-bottom: 1px solid black;">
- <b style="border: 1px solid black; padding-left: 1em; padding-right: 1em;">Info</b>
+ <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
+ <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;">Info</b>
#set ( $buildsLink = $link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id', $item.id) )
- <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="$buildsLink">Builds</a>
- #set ( $workingCopy = $link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $item.id) )
- <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="$workingCopy">Working Copy</a>
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="$buildsLink">Builds</a>
+ #if ( $item.state == 10 || $item.state == 2 || $item.state == 3 || $item.state == 4 || $item.state == 6 )
+ #set ( $workingCopy = $link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $item.id) )
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="$workingCopy">Working Copy</a>
+ #end
</p>
</div>
#end
@@ -24,7 +26,8 @@
<h3>$i18n.getString( $form.view.titleKey )</h3>
<div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <table border="1" cellpadding="3" cellspacing="2" width="100%">
+ <tbody>
<tr class="b">
<th>$i18n.getString( "project.name.label" )</th>
<td>$item.name</td>
@@ -41,33 +44,41 @@
<th>$i18n.getString( "project.group.label" )</th>
<td>$item.projectGroup.name</td>
</tr>
+ </tbody>
</table>
#if ( $continuum.security.isAuthorized( $c1user, "editProject" ) )
<div class="functnbar3">
<table>
+ <tbody>
<tr>
<td>
<form method="post" action="$link.setPage('Edit.vm').addPathInfo('fid', "$!{item.executorId}Project").addPathInfo('id', $item.id)">
<input type="submit" name="edit-project" value="Edit"/>
</form>
</td>
+ <td>
+ <form method="post" action="$link.addPathInfo('action', 'cam').addPathInfo('cid','buildProject').addPathInfo('id', $item.id)">
+ <input type="submit" name="build-project" value="Build Now"/>
+ </form>
+ </td>
</tr>
+ </tbody>
</table>
</div>
#end
</div>
-
<h3>$i18n.getString( "project.buildDefinitions.label" )</h3>
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <table border="1" cellpadding="3" cellspacing="2" width="100%">
+ <tbody>
<tr>
- <th>Goals</th>
- <th>Arguments</th>
- <th>POM File</th>
- <th>Profile</th>
- <th>Schedule</th>
- <th>From</th>
- <th width="10%"> </th>
+ <th class="tablehead">Goals</th>
+ <th class="tablehead">Arguments</th>
+ <th class="tablehead">POM File</th>
+ <th class="tablehead">Profile</th>
+ <th class="tablehead">Schedule</th>
+ <th class="tablehead">From</th>
+ <th colspan="3" class="tablehead"> </th>
</tr>
#foreach ( $buildDefinition in $project.buildDefinitions )
<tr class="$css.nextClass">
@@ -89,22 +100,38 @@
#end
</td>
<td>Project</td>
- <td>
+ <td width="1%">
+ #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) )
+ #set ( $buildNowLink = $link.addPathInfo('action', 'cam').addPathInfo('cid','buildProjectWithBuildDefinition').addPathInfo('id', $item.id).addPathInfo('buildDefinitionId', $buildDefinition.id) )
+ <a href="$buildNowLink"><img src="$requestUtil.getContextPath()/images/buildnow.gif" alt="Build Now" title="Build Now" width="16" height="16" border="0"></a>
+ #else
+ <img src="$requestUtil.getContextPath()/images/buildnow_disabled.gif" alt="Build Now" title="Build Now" width="16" height="16" border="0">
+ #end
+ </td>
+ <td width="1%">
#if ( $continuum.security.isAuthorized( $c1user, "editBuildDefinition" ) )
- #set ( $buildDefinitionLink = $link.setPage('BuildDefinition.vm').addPathInfo('view','BuildDefinition').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id) )
- <a href="$buildDefinitionLink">Edit</a> |
+ #set ( $buildDefinitionLink = $link.setPage('BuildDefinition.vm').addPathInfo('view','BuildDefinition').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id) )
+ <a href="$buildDefinitionLink"><img src="$requestUtil.getContextPath()/images/edit.gif" alt="Edit" title="Edit" width="16" height="16" border="0"></a>
+ #else
+ <img src="$requestUtil.getContextPath()/images/edit_disabled.gif" alt="Edit" title="Edit" width="16" height="16" border="0">
#end
+ </td>
+ <td width="1%">
#if ( $continuum.security.isAuthorized( $c1user, "deleteBuildDefinition" ) )
- #set ( $deleteBuildDefinitionLink = $link.setPage('DeleteBuildDefinition.vm').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
- <a href="$deleteBuildDefinitionLink">Delete</a>
+ #set ( $deleteBuildDefinitionLink = $link.setPage('DeleteBuildDefinition.vm').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
+ <a href="$deleteBuildDefinitionLink"><img src="$requestUtil.getContextPath()/images/delete.gif" alt="Delete" title="Delete" width="16" height="16" border="0"></a>
+ #else
+ <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete" title="Delete" width="16" height="16" border="0">
#end
</td>
</tr>
#end
+ </tbody>
</table>
#if ( $continuum.security.isAuthorized( $c1user, "addBuildDefinition" ) )
<div class="functnbar3">
<table>
+ <tbody>
<tr>
<td>
<form method="post" action="$link.setPage('AddBuildDefinition.vm').addPathInfo('view','BuildDefinition').addPathInfo('fid', 'buildDefinition').addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId)">
@@ -112,19 +139,21 @@
</form>
</td>
</tr>
+ </tbody>
</table>
</div>
#end
#if ( $project.notifiers )
<h3>$i18n.getString( "project.notifiers.label" )</h3>
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <table border="1" cellpadding="3" cellspacing="2" width="100%">
+ <tbody>
<tr>
- <th>Type</th>
- <th>Recipient</th>
- <th>Events</th>
- <th>From</th>
- <th width="10%"> </th>
+ <th class="tablehead">Type</th>
+ <th class="tablehead">Recipient</th>
+ <th class="tablehead">Events</th>
+ <th class="tablehead">From</th>
+ <th colspan="2" class="tablehead"> </th>
</tr>
#foreach ( $notifier in $project.notifiers )
<tr class="$css.nextClass" #if ( !$notifier.isEnabled() ) style="color: silver;" #end>
@@ -168,35 +197,45 @@
User
#end
</td>
- <td>
- #if ( $notifier.isFromUser() )
+ #if ( $notifier.isFromUser() )
+ <td width="1%">
#if ( $continuum.security.isAuthorized( $c1user, "editNotifier" ) )
#if ( $notifier.type == "irc" )
#set ( $editNotifierLink = $link.setPage('EditIrcNotifier.vm').addPathInfo('view','EditIrcNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
- <a href="$editNotifierLink">Edit</a>
+ <a href="$editNotifierLink"><img src="$requestUtil.getContextPath()/images/edit.gif" alt="Edit" title="Edit" width="16" height="16" border="0"></a>
#elseif ( $notifier.type == "mail" )
#set ( $editNotifierLink = $link.setPage('EditMailNotifier.vm').addPathInfo('view','EditMailNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
- <a href="$editNotifierLink">Edit</a>
+ <a href="$editNotifierLink"><img src="$requestUtil.getContextPath()/images/edit.gif" alt="Edit" title="Edit" width="16" height="16" border="0"></a>
#elseif ( $notifier.type == "msn" )
#set ( $editNotifierLink = $link.setPage('EditMsnNotifier.vm').addPathInfo('view','EditMsnNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
- <a href="$editNotifierLink">Edit</a>
+ <a href="$editNotifierLink"><img src="$requestUtil.getContextPath()/images/edit.gif" alt="Edit" title="Edit" width="16" height="16" border="0"></a>
#elseif ( $notifier.type == "jabber" )
#set ( $editNotifierLink = $link.setPage('EditJabberNotifier.vm').addPathInfo('view','EditJabberNotifier').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
- <a href="$editNotifierLink">Edit</a>
+ <a href="$editNotifierLink"><img src="$requestUtil.getContextPath()/images/edit.gif" alt="Edit" title="Edit" width="16" height="16" border="0"></a>
#end
+ #else
+ <img src="$requestUtil.getContextPath()/images/edit_disabled.gif" alt="Edit" title="Edit" width="16" height="16" border="0">
#end
+ </td>
+ <td width="1%">
#if ( $continuum.security.isAuthorized( $c1user, "deleteNotifier" ) )
#set ( $deleteNotifierLink = $link.setPage('DeleteNotifier.vm').addPathInfo('notifierId', $notifier.id).addPathInfo('id', $item.id).addPathInfo('executorId', $item.executorId) )
- | <a href="$deleteNotifierLink">Delete</a>
+ <a href="$deleteNotifierLink"><img src="$requestUtil.getContextPath()/images/delete.gif" alt="Delete" title="Delete" width="16" height="16" border="0"></a>
+ #else
+ <img src="$requestUtil.getContextPath()/images/delete_disabled.gif" alt="Delete" title="Delete" width="16" height="16" border="0">
#end
- #end
- </td>
+ </td>
+ #else
+ <td width="2%" colspan="2"> </td>
+ #end
</tr>
#end
+ </tbody>
</table>
#if ( $continuum.security.isAuthorized( $c1user, "addNotifier" ) )
<div class="functnbar3">
<table>
+ <tbody>
<tr>
<td>
<form method="post" action="$link.setPage('SelectNotifier.vm').addPathInfo('id', $project.id )">
@@ -204,6 +243,7 @@
</form>
</td>
</tr>
+ </tbody>
</table>
</div>
#end
@@ -211,7 +251,8 @@
#if ( $project.dependencies )
<h3>$i18n.getString( "project.dependencies.label" )</h3>
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <table border="1" cellpadding="3" cellspacing="2" width="100%">
+ <tbody>
<tr>
<th>Name</th>
</tr>
@@ -220,24 +261,28 @@
<td>$!{dependency.groupId}:$!{dependency.artifactId}:$!{dependency.version}</td>
</tr>
#end
+ </tbody>
</table>
#end
<!--
<h3>$i18n.getString( "project.usedBy.label" )</h3>
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <table border="1" cellpadding="3" cellspacing="2" width="100%">
+ <tbody>
<tr>
<th>Name</th>
</tr>
<tr class="b">
<td> </td>
</tr>
+ </tbody>
</table>
-->
#if ( $project.developers )
<h3>$i18n.getString( "project.developers.label" )</h3>
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <table border="1" cellpadding="3" cellspacing="2" width="100%">
+ <tbody>
<tr>
<th>Name</th>
<th>Email</th>
@@ -250,10 +295,12 @@
<!-- td> </td -->
</tr>
#end
+ </tbody>
</table>
<!--
<div class="functnbar3">
<table>
+ <tbody>
<tr>
<td>
<form method="post" action="$link">
@@ -261,6 +308,7 @@
</form>
</td>
</tr>
+ </tbody>
</table>
</div>
-->
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewIrcNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewIrcNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewIrcNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewIrcNotifier.vm Tue May 16 03:26:59 2006
@@ -4,7 +4,8 @@
<div id="axial" class="h3">
<h3>IRC Notifier</h3>
<div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <table border="1" cellpadding="3" cellspacing="2" width="100%">
+ <tbody>
<tr class="b">
<th>IRC Host</th>
<td>$notifier.configuration.host</td>
@@ -17,6 +18,7 @@
<th>IRC Channel</th>
<td>$notifier.configuration.channel</td>
</tr>
+ </tbody>
</table>
</div>
<div class="functnbar3">
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewJabberNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewJabberNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewJabberNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewJabberNotifier.vm Tue May 16 03:26:59 2006
@@ -4,7 +4,8 @@
<div id="axial" class="h3">
<h3>Jabber Notifier</h3>
<div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <table border="1" cellpadding="3" cellspacing="2" width="100%">
+ <tbody>
<tr class="b">
<th>Jabber Host</th>
<td>$notifier.configuration.host</td>
@@ -21,6 +22,7 @@
<th>Is Jabber Group?</th>
<td>$notifier.configuration.isGroup</td>
</tr>
+ </tbody>
</table>
</div>
<div class="functnbar3">
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMailNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMailNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMailNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMailNotifier.vm Tue May 16 03:26:59 2006
@@ -4,11 +4,13 @@
<div id="axial" class="h3">
<h3>Mail Notifier</h3>
<div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <table border="1" cellpadding="3" cellspacing="2" width="100%">
+ <tbody>
<tr class="b">
<th>Address</th>
<td>$notifier.configuration.address</td>
</tr>
+ </tbody>
</table>
</div>
<div class="functnbar3">
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMsnNotifier.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMsnNotifier.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMsnNotifier.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ViewMsnNotifier.vm Tue May 16 03:26:59 2006
@@ -4,7 +4,8 @@
<div id="axial" class="h3">
<h3>MSN Notifier</h3>
<div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <table border="1" cellpadding="3" cellspacing="2" width="100%">
+ <tbody>
<tr class="b">
<th>MSN Login</th>
<td>$notifier.configuration.login</td>
@@ -17,6 +18,7 @@
<th>MSN Recipient</th>
<td>$notifier.configuration.address</td>
</tr>
+ </tbody>
</table>
</div>
<div class="functnbar3">
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm Tue May 16 03:26:59 2006
@@ -10,12 +10,12 @@
#if ( $continuum.security.isAuthorized( $c1user, "showProject" ) )
<div>
- <p style="border-top: 1px solid transparent; border-bottom: 1px solid black;">
+ <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
#set ( $infoLink = $link.setPage('View.vm').addPathInfo('fid', "$!{project.executorId}Project").addPathInfo('id', $project.id) )
- <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="$infoLink">Info</a>
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="$infoLink">Info</a>
#set ( $buildsLink = $link.setPage('ProjectBuilds.vm').addPathInfo('view', "ProjectBuilds").addPathInfo('id', $project.id) )
- <a style="border: 1px solid black; padding-left: 1em; padding-right: 1em; text-decoration:none;" href="$buildsLink">Builds</a>
- <b style="border: 1px solid black; padding-left: 1em; padding-right: 1em;">Working Copy</b>
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="$buildsLink">Builds</a>
+ <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;">Working Copy</b>
</p>
</div>
#end
@@ -25,12 +25,4 @@
#set ( $files = $continuum.getFiles( $project.id, $data.getParameters().getString( "userDirectory" ) ) )
#set ( $baseUrl = $link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $project.id) )
$workingCopy.generate( $files, $baseUrl.toString(), $continuum.getWorkingDirectory( $project.id ) )
-
- #if ( $data.getParameters().getString( "file" ) )
- #set( $filename = $data.getParameters().getString( "file" ) )
- <br />
- <form>
- <textarea rows="50" cols="100">$continuum.getFileContent( $project.id, $data.getParameters().getString( "userDirectory" ), $filename )</textarea>
- </form>
- #end
</div>
Modified: maven/continuum/trunk/continuum-xmlrpc/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xmlrpc/pom.xml?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/pom.xml (original)
+++ maven/continuum/trunk/continuum-xmlrpc/pom.xml Tue May 16 03:26:59 2006
@@ -42,9 +42,13 @@
<artifactId>continuum-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/pom.xml?rev=406895&r1=406894&r2=406895&view=diff
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Tue May 16 03:26:59 2006
@@ -11,7 +11,7 @@
<packaging>pom</packaging>
<name>Continuum Parent Project</name>
<version>1.1-SNAPSHOT</version>
- <url>http://maven.apache.org/continuum/</url>
+ <url>http://maven.apache.org/continuum</url>
<issueManagement>
<system>jira</system>
<url>http://jira.codehaus.org/browse/CONTINUUM</url>
@@ -32,7 +32,7 @@
</mailingList>
</mailingLists>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/continuum/trunk/</connection>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/maven/continuum/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/continuum/trunk/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/continuum/trunk/</url>
</scm>
@@ -42,7 +42,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
- <version>1.1.3</version>
+ <version>1.2</version>
<extensions>true</extensions>
</plugin>
</plugins>
@@ -55,11 +55,33 @@
<module>continuum-core</module>
<module>continuum-model</module>
<module>continuum-notifiers</module>
+ <module>continuum-plexus-application</module>
+ <module>continuum-rpc-client</module>
<module>continuum-store</module>
<module>continuum-test</module>
<module>continuum-webapp</module>
<module>continuum-xmlrpc</module>
</modules>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <id>snapshots</id>
+ <name>Maven Central Development Repository</name>
+ <url>http://snapshots.maven.codehaus.org/maven2</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <id>snapshots</id>
+ <name>Maven Central Development Repository</name>
+ <url>http://snapshots.maven.codehaus.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -70,7 +92,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-8</version>
+ <version>1.0-alpha-9</version>
</dependency>
</dependencies>
<dependencyManagement>
@@ -78,72 +100,72 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0-1</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0-1</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>2.0</version>
+ <version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <version>1.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-manager-plexus</artifactId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <version>1.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-bazaar</artifactId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <version>1.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-clearcase</artifactId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <version>1.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-cvsexe</artifactId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <version>1.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-local</artifactId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <version>1.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-perforce</artifactId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <version>1.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-starteam</artifactId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <version>1.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svnexe</artifactId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <version>1.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -153,7 +175,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
- <version>1.0-alpha-6</version>
+ <version>1.0-alpha-7</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -163,7 +185,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>1.0-alpha-6</version>
+ <version>1.0-alpha-7</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -231,9 +253,9 @@
<version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>jpox</groupId>
+ <groupId>org.apache.maven.continuum.jpox</groupId>
<artifactId>jpox</artifactId>
- <version>1.1.0-beta-4</version>
+ <version>1.1.0-20060413</version>
<exclusions>
<exclusion>
<artifactId>ant</artifactId>
@@ -247,27 +269,56 @@
<artifactId>ojdbc</artifactId>
<groupId>ojdbc</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xmlParserAPIs</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>jpox</groupId>
+ <groupId>org.apache.maven.continuum.jpox</groupId>
<artifactId>jpox-enhancer</artifactId>
- <version>1.1.0-beta-4</version>
+ <version>1.1.0-20060413</version>
+ </dependency>
+ <dependency>
+ <groupId>jpox</groupId>
+ <artifactId>jpox-dbcp</artifactId>
+ <version>1.1.0-rc-1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jpox</artifactId>
+ <groupId>jpox</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-jdo2</artifactId>
- <version>1.0-alpha-3</version>
+ <version>1.0-alpha-4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xmlParserAPIs</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-formica</artifactId>
- <version>1.0-beta-9</version>
+ <version>1.0-beta-10</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -312,11 +363,6 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-security-api</artifactId>
- <version>1.0-alpha-3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-security-osuser</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
</dependency>
@@ -331,20 +377,20 @@
<version>1.7.3.3</version>
</dependency>
<dependency>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
- <version>1.4.5</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-quartz</artifactId>
+ <version>1.0-alpha-2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-security-api</artifactId>
+ <version>1.0-alpha-3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-security-summit</artifactId>
+ <version>1.0-alpha-3</version>
</dependency>
</dependencies>
</dependencyManagement>
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <id>snapshots</id>
- <name>Maven Central Development Repository</name>
- <url>http://snapshots.maven.codehaus.org/maven2</url>
- </repository>
- </repositories>
</project>