You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/07 03:43:27 UTC
svn commit: r419764 - /geronimo/trunk/m2-plugins/pom.xml
Author: jdillon
Date: Thu Jul 6 18:43:26 2006
New Revision: 419764
URL: http://svn.apache.org/viewvc?rev=419764&view=rev
Log:
Merge changes for m2
Modified:
geronimo/trunk/m2-plugins/pom.xml (contents, props changed)
Modified: geronimo/trunk/m2-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/pom.xml?rev=419764&r1=419763&r2=419764&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/pom.xml (original)
+++ geronimo/trunk/m2-plugins/pom.xml Thu Jul 6 18:43:26 2006
@@ -17,7 +17,11 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,32 +33,37 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins-parent</artifactId>
- <packaging>pom</packaging>
<name>Geronimo Plugins</name>
- <description>Geronimo Plugins</description>
+ <description>Geronimo :: Plugins</description>
+ <packaging>pom</packaging>
+
+ <properties>
+ <maven.version>2.0</maven.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>geronimo-packaging-plugin</module>
- </modules>
- </profile>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
- <profile>
- <id>singleplugin</id>
- <activation>
- <property>
- <name>plugin</name>
- </property>
- </activation>
- <modules>
- <module>${plugin}</module>
- </modules>
- </profile>
- </profiles>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>geronimo-packaging-plugin</module>
+ </modules>
+
</project>
Propchange: geronimo/trunk/m2-plugins/pom.xml
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Thu Jul 6 18:43:26 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/m2-plugins/pom.xml:419355
Re: svn commit: r419764 - /geronimo/trunk/m2-plugins/pom.xml
Posted by Jacek Laskowski <ja...@laskowski.net.pl>.
On 7/7/06, Jason Dillon <ja...@planet57.com> wrote:
> On Jul 7, 2006, at 1:12 AM, Jacek Laskowski wrote:
> > It is when one's doing some non-trivial changes
> > without careful thinking how to sort out issues with testing/applying
> > before they become painful when it comes to applying them to trunk,
>
> What exactly are you suggesting by this statement?!
Just to quote what you said:
"This is an unfortunate reality that occurs when delaying major
changes for a significant period."
We've got troubles with patches and their testing. I'm really
concerned that we don't approach it, but await the next 'major change'
that will again remind us about it. I wonder how much time will it
take to apply another m2 patch and how we work on it. So, the above
should be read as:
'I'm really concerned that although we know we're in a big trouble
with patches and their way to trunk, we don't want to sort it out once
and for all, but rather ignore it until there's no other way'.
I'm preparing a doc about a possible solution that will guide us thru
this bumpy RTC road. Will surely take some time, but I hope it's worth
it. See you soon...;-)
Jacek
--
Jacek Laskowski
http://www.laskowski.net.pl
Re: svn commit: r419764 - /geronimo/trunk/m2-plugins/pom.xml
Posted by Jason Dillon <ja...@planet57.com>.
On Jul 7, 2006, at 1:12 AM, Jacek Laskowski wrote:
> It is when one's doing some non-trivial changes
> without careful thinking how to sort out issues with testing/applying
> before they become painful when it comes to applying them to trunk,
What exactly are you suggesting by this statement?!
--jason
Re: svn commit: r419764 - /geronimo/trunk/m2-plugins/pom.xml
Posted by Jacek Laskowski <ja...@laskowski.net.pl>.
On 7/7/06, Jason Dillon <ja...@planet57.com> wrote:
> This is an unfortunate reality that occurs when delaying major
> changes for a significant period.
I disagree, Jason.
Quite a contrary. It is when one's doing some non-trivial changes
without careful thinking how to sort out issues with testing/applying
before they become painful when it comes to applying them to trunk,
i.e. the problems testers had were dismissed and noone really knew how
the changes were made but the author. It's unnacceptable and am happy
to read your comment as supporting the opinion ;-)
Jacek
--
Jacek Laskowski
http://www.laskowski.net.pl
Re: svn commit: r419764 - /geronimo/trunk/m2-plugins/pom.xml
Posted by Jason Dillon <ja...@planet57.com>.
Yes, sorry... I'm currently resolving an issue that has popped up due
to changes made in the trunk post the last cut of the patch which
kinda whacked the application an validation.
I'm reapplying now from a known good source and revalidating.
Will need to correct a faulty commit to all_changes.log post
commiting the real changes for 2161.
This is an unfortunate reality that occurs when delaying major
changes for a significant period.
--jason
On Jul 6, 2006, at 7:39 PM, John Sisson wrote:
> jdillon@apache.org wrote:
>> Author: jdillon
>> Date: Thu Jul 6 18:43:26 2006
>> New Revision: 419764
>>
>> URL: http://svn.apache.org/viewvc?rev=419764&view=rev
>> Log:
>> Merge changes for m2
>>
>> Modified:
>> geronimo/trunk/m2-plugins/pom.xml (contents, props changed)
>>
>>
> Hi Jason,
>
> Can you please put the JIRA issue in the svn log comments so it
> shows up in the "Subversion commits" tab in the JIRA issue so
> everyone can keep track of what commits/merges have been done for a
> JIRA.
>
> Thanks,
>
> John
Re: svn commit: r419764 - /geronimo/trunk/m2-plugins/pom.xml
Posted by John Sisson <jr...@gmail.com>.
jdillon@apache.org wrote:
> Author: jdillon
> Date: Thu Jul 6 18:43:26 2006
> New Revision: 419764
>
> URL: http://svn.apache.org/viewvc?rev=419764&view=rev
> Log:
> Merge changes for m2
>
> Modified:
> geronimo/trunk/m2-plugins/pom.xml (contents, props changed)
>
>
Hi Jason,
Can you please put the JIRA issue in the svn log comments so it shows up
in the "Subversion commits" tab in the JIRA issue so everyone can keep
track of what commits/merges have been done for a JIRA.
Thanks,
John