Or is it simply that not everyone has updated their .subversion/config with suggested values (to handle eol-style and autoprops) or that we're missing svn props from some of our files?
-Donald On 9/10/10 5:11 PM, Kevan Miller wrote: > In addition to the bad shell scripts in 2.1.6, I ran across the following > difference between branches/2.1 and tags/geronimo-2.1.6 (I ran across a > number of pom's with the same basic issue). > > Would like to see release processes put in place that prevent these things > from happening in the future. In some instances, we probably force some of > our files to have Unix line endings (so people can build from a Windows svn > checkout). I'm also would be ok with requiring releases be run from > unix-style machines. I assume this would avoid issues like the following > pom.xml file... > > Thoughts? > > $ svn diff > https://svn.apache.org/repos/asf/geronimo/server/tags/geronimo-2.1.6/plugins/monitoring/mconsole-jetty/pom.xml > > https://svn.apache.org/repos/asf/geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/pom.xml > svn diff > https://svn.apache.org/repos/asf/geronimo/server/tags/geronimo-2.1.6/plugins/monitoring/mconsole-jetty/pom.xml > > https://svn.apache.org/repos/asf/geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/pom.xml > Index: pom.xml > =================================================================== > --- pom.xml > (.../tags/geronimo-2.1.6/plugins/monitoring/mconsole-jetty/pom.xml) > (revision 995984) > +++ pom.xml (.../branches/2.1/plugins/monitoring/mconsole-jetty/pom.xml) > (revision 995984) > @@ -1,123 +1,123 @@ > -<?xml version="1.0" encoding="UTF-8"?> > -<!-- > - 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. > ---> > - > -<!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ --> > - > -<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> > - <groupId>org.apache.geronimo.plugins.monitoring</groupId> > - <artifactId>monitoring</artifactId> > - <version>2.1.6</version> > - </parent> > - > - <groupId>org.apache.geronimo.plugins</groupId> > - <artifactId>mconsole-jetty</artifactId> > - <name>Geronimo Plugins, Monitoring :: Console (Jetty)</name> > - <packaging>car</packaging> > - > - <dependencies> > - <dependency> > - <groupId>org.apache.geronimo.configs</groupId> > - <artifactId>jetty6-deployer</artifactId> > - <version>${version}</version> > - <type>car</type> > - <scope>provided</scope> > - </dependency> > - > - <dependency> > - <groupId>org.apache.geronimo.configs</groupId> > - <artifactId>jasper-deployer</artifactId> > - <version>${version}</version> > - <type>car</type> > - <scope>provided</scope> > - </dependency> > - > - <dependency> > - <groupId>org.apache.geronimo.configs</groupId> > - <artifactId>connector-deployer</artifactId> > - <version>${version}</version> > - <type>car</type> > - <scope>provided</scope> > - </dependency> > - > - <dependency> > - <groupId>org.apache.geronimo.plugins</groupId> > - <artifactId>mconsole-ds</artifactId> > - <version>${version}</version> > - <type>car</type> > - </dependency> > - > - <dependency> > - <groupId>org.apache.geronimo.plugins</groupId> > - <artifactId>console-jetty</artifactId> > - <version>${version}</version> > - <type>car</type> > - </dependency> > - > - <dependency> > - <groupId>org.apache.geronimo.plugins.monitoring</groupId> > - <artifactId>mconsole-war</artifactId> > - <version>${version}</version> > - <type>war</type> > - <scope>provided</scope> > - </dependency> > - > - <dependency> > - <groupId>org.apache.geronimo.configs</groupId> > - <artifactId>dojo-legacy-jetty6</artifactId> > - <version>${version}</version> > - <type>car</type> > - </dependency> > - > - <dependency> > - <groupId>org.apache.geronimo.configs</groupId> > - <artifactId>openejb</artifactId> > - <version>${version}</version> > - <type>car</type> > - </dependency> > - </dependencies> > - > - <build> > - <plugins> > - <plugin> > - <groupId>org.apache.geronimo.buildsupport</groupId> > - <artifactId>car-maven-plugin</artifactId> > - <configuration> > - <deploymentConfigs> > - <deploymentConfig>${gbeanDeployer}</deploymentConfig> > - <deploymentConfig>${j2eeDeployer}</deploymentConfig> > - > <deploymentConfig>${jasperDeployer}</deploymentConfig> > - > <deploymentConfig>${jetty6Deployer}</deploymentConfig> > - > <deploymentConfig>${connectorDeployer}</deploymentConfig> > - </deploymentConfigs> > - <module> > - > <groupId>org.apache.geronimo.plugins.monitoring</groupId> > - <artifactId>mconsole-war</artifactId> > - <version>${version}</version> > - <type>war</type> > - </module> > - <category>Monitoring</category> > - </configuration> > - </plugin> > - </plugins> > - </build> > - > -</project> > +<?xml version="1.0" encoding="UTF-8"?> > +<!-- > + 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. > +--> > + > +<!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ --> > + > +<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> > + <groupId>org.apache.geronimo.plugins.monitoring</groupId> > + <artifactId>monitoring</artifactId> > + <version>2.1.7-SNAPSHOT</version> > + </parent> > + > + <groupId>org.apache.geronimo.plugins</groupId> > + <artifactId>mconsole-jetty</artifactId> > + <name>Geronimo Plugins, Monitoring :: Console (Jetty)</name> > + <packaging>car</packaging> > + > + <dependencies> > + <dependency> > + <groupId>org.apache.geronimo.configs</groupId> > + <artifactId>jetty6-deployer</artifactId> > + <version>${version}</version> > + <type>car</type> > + <scope>provided</scope> > + </dependency> > + > + <dependency> > + <groupId>org.apache.geronimo.configs</groupId> > + <artifactId>jasper-deployer</artifactId> > + <version>${version}</version> > + <type>car</type> > + <scope>provided</scope> > + </dependency> > + > + <dependency> > + <groupId>org.apache.geronimo.configs</groupId> > + <artifactId>connector-deployer</artifactId> > + <version>${version}</version> > + <type>car</type> > + <scope>provided</scope> > + </dependency> > + > + <dependency> > + <groupId>org.apache.geronimo.plugins</groupId> > + <artifactId>mconsole-ds</artifactId> > + <version>${version}</version> > + <type>car</type> > + </dependency> > + > + <dependency> > + <groupId>org.apache.geronimo.plugins</groupId> > + <artifactId>console-jetty</artifactId> > + <version>${version}</version> > + <type>car</type> > + </dependency> > + > + <dependency> > + <groupId>org.apache.geronimo.plugins.monitoring</groupId> > + <artifactId>mconsole-war</artifactId> > + <version>${version}</version> > + <type>war</type> > + <scope>provided</scope> > + </dependency> > + > + <dependency> > + <groupId>org.apache.geronimo.configs</groupId> > + <artifactId>dojo-legacy-jetty6</artifactId> > + <version>${version}</version> > + <type>car</type> > + </dependency> > + > + <dependency> > + <groupId>org.apache.geronimo.configs</groupId> > + <artifactId>openejb</artifactId> > + <version>${version}</version> > + <type>car</type> > + </dependency> > + </dependencies> > + > + <build> > + <plugins> > + <plugin> > + <groupId>org.apache.geronimo.buildsupport</groupId> > + <artifactId>car-maven-plugin</artifactId> > + <configuration> > + <deploymentConfigs> > + <deploymentConfig>${gbeanDeployer}</deploymentConfig> > + <deploymentConfig>${j2eeDeployer}</deploymentConfig> > + > <deploymentConfig>${jasperDeployer}</deploymentConfig> > + > <deploymentConfig>${jetty6Deployer}</deploymentConfig> > + > <deploymentConfig>${connectorDeployer}</deploymentConfig> > + </deploymentConfigs> > + <module> > + > <groupId>org.apache.geronimo.plugins.monitoring</groupId> > + <artifactId>mconsole-war</artifactId> > + <version>${version}</version> > + <type>war</type> > + </module> > + <category>Monitoring</category> > + </configuration> > + </plugin> > + </plugins> > + </build> > + > +</project> > >
