Please mail the output of `patch -sp0 < GERONIMO-2161-v4.patch`.

Yes, my workspace is clean. As I have noted before in previous emails... svn diff is producing output that can not be reapplied with patch. David J has seen this happen too IIRC.

--jason


On Jul 5, 2006, at 2:52 PM, Jacek Laskowski (JIRA) wrote:

[ http://issues.apache.org/jira/browse/GERONIMO-2161? page=comments#action_12419339 ]

Jacek Laskowski commented on GERONIMO-2161:
-------------------------------------------

Jason, I can't apply the v4 patch. It ends with errors. Have you checked out clean Geronimo sources and apply it? Did it finish properly? I'm concerned as others have reported it worked fine.

[RTC] Remove Geronimo modules from dependencyManagement in root pom.xml --------------------------------------------------------------------- --

         Key: GERONIMO-2161
         URL: http://issues.apache.org/jira/browse/GERONIMO-2161
     Project: Geronimo
        Type: Task
    Security: public(Regular issues)
  Components: buildsystem
    Reporter: Jason Dillon
    Assignee: Jason Dillon
     Fix For: 1.2
Attachments: GERONIMO-2161-configs-v1.1.sub.patch, GERONIMO-2161- v1.patch, GERONIMO-2161-v2.patch, GERONIMO-2161-v3.patch, GERONIMO-2161-v4.patch

As I have mentioned before, I believe we should remove the Geronimo modules that are currently listed in the root pom.xml:
This reduces the configuration of the pom by *~500 lines*.
Modules that reference these as dependencies will need their pom's adjusted to include <version>${pom.version}</version> and <type>car</type> for the configs. But in many places version already exists with the ${geronimoVersion} property... which kinda negates the purpose of the dependencyManagement section anyways. I believe that it is more work to keep track of every module in the root pom than it is to specify the additonal elements (mostly just <version>${pom.version}</version>) in child poms. There is no additional maintenance, as the new elements never need to be changed. Net effect if this change is less configuration to maintain and thus a less brittle build that can adapt to change easier.
Specifically these should be removed:
{code:xml}
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>ge-activemq-rar</artifactId>
        <version>${geronimoVersion}</version>
        <type>rar</type>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-activation</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-client</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-client-builder</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-common</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-connector</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-connector-builder</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-converter</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-core</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-deploy-config</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-deploy-jsr88</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-deploy-tool</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-deployment</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-derby</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-directory</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-javamail-transport</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-j2ee</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-j2ee-builder</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-j2ee-schema</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-kernel</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-jetty</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-jetty-builder</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-jmx-remoting</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-mail</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-management</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-naming</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-naming-builder</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-security</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-security-builder</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-service-builder</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-system</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-test-ddbean</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-timer</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-tomcat</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-tomcat-builder</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-transaction</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-upgrade</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-util</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-web-builder</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-webservices</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-axis</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.modules</groupId>
        <artifactId>geronimo-axis-builder</artifactId>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>activemq</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>activemq-broker</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>axis</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>axis-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>client</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>client-corba</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>client-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>client-security</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>client-system</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>console-jetty</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>console-tomcat</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>daytrader-jetty</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>daytrader-tomcat</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>directory</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>geronimo-gbean-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>hot-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>j2ee-corba</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>j2ee-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>j2ee-security</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>j2ee-server</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>j2ee-system</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>javamail</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>jetty</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>jetty-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>jsp-examples-jetty</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>jsp-examples-tomcat</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>ldap-demo-jetty</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>ldap-demo-tomcat</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>ldap-realm</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>online-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>openejb</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>openejb-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>project.properties</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>remote-deploy-jetty</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>remote-deploy-tomcat</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>rmi-naming</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>servlets-examples-jetty</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>servlets-examples-tomcat</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>sharedlib</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>shutdown</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>system-database</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>tomcat</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>tomcat-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>uddi-jetty</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>uddi-tomcat</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>unavailable-client-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>unavailable-ejb-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>unavailable-webservices-deployer</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>upgrade</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>upgrade-cli</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>welcome-jetty</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
    <dependency>
        <groupId>org.apache.geronimo.configs</groupId>
        <artifactId>welcome-tomcat</artifactId>
        <type>car</type>
        <version>${geronimoVersion}</version>
    </dependency>
{code}

--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
   http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see:
   http://www.atlassian.com/software/jira


Reply via email to