maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r640546 - in /maven/components/branches/maven-2.0.x: apache-maven/ apache-maven/src/conf/ apache-maven/src/site/apt/ maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ maven-core/src/test/java/org/apache/maven/usability/ maven...
Date Mon, 24 Mar 2008 19:53:54 GMT
Author: bentmann
Date: Mon Mar 24 12:53:51 2008
New Revision: 640546

URL: http://svn.apache.org/viewvc?rev=640546&view=rev
Log:
o Added svn:eol-style=native

Modified:
    maven/components/branches/maven-2.0.x/apache-maven/pom.xml   (contents, props changed)
    maven/components/branches/maven-2.0.x/apache-maven/src/conf/settings.xml   (props changed)
    maven/components/branches/maven-2.0.x/apache-maven/src/site/apt/getting-to-container-configured-mojos.apt
  (props changed)
    maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
  (props changed)
    maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoserTest.java
  (contents, props changed)
    maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoFailureExceptionDiagnoserTest.java
  (contents, props changed)
    maven/components/branches/maven-2.0.x/maven-plugin-descriptor/src/main/mdo/lifecycle.mdo
  (props changed)
    maven/components/branches/maven-2.0.x/maven-project/src/test/resources/projects/scope/transitive-provided-dep.xml
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/mdo/toolchains.xml   (props
changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/main/resources/META-INF/plexus/components.xml
  (props changed)
    maven/components/branches/maven-2.0.x/maven-toolchain/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
  (props changed)

Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=640546&r1=640545&r2=640546&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Mon Mar 24 12:53:51 2008
@@ -1,172 +1,172 @@
-<?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.
--->
-
-<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>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>apache-maven</artifactId>
-  <name>Maven Bundle</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <finalName>maven-${project.version}-uber</finalName>
-              <createDependencyReducedPom>
-                false
-              </createDependencyReducedPom>
-              <keepDependenciesWithProvidedScope>
-                true
-              </keepDependenciesWithProvidedScope>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
/>
-              </transformers>
-              <artifactSet>
-                <excludes>
-                  <exclude>
-                    org.codehaus.plexus:plexus-component-api
-                  </exclude>
-                  <exclude>classworlds:classworlds</exclude>
-                  <exclude>junit:junit</exclude>
-                  <exclude>jmock:jmock</exclude>
-                  <exclude>xml-apis:xml-apis</exclude>
-                </excludes>
-              </artifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>org.jdom</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>de.zeigermann.xml</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.webdav</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.commons.httpclient</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.commons.logging</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.codehaus.plexus.util</pattern>
-                  <excludes>
-                    <exclude>
-                      org.codehaus.plexus.util.xml.Xpp3Dom
-                    </exclude>
-                    <exclude>
-                      org.codehaus.plexus.util.xml.pull.*
-                    </exclude>
-                  </excludes>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <descriptor>src/assemble/bin.xml</descriptor>
-          <finalName>apache-maven-${project.version}</finalName>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-toolchain</artifactId>
-    </dependency>
- </dependencies>
-
-  <profiles>
-    <profile>
-      <id>include-site</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-scm-plugin</artifactId>
-            <configuration>
-              <connectionUrl>scm:svn:http://svn.apache.org/repos/asf/maven/site/trunk</connectionUrl>
-              <checkoutDirectory>${project.build.directory}/maven-site</checkoutDirectory>
-            </configuration>
-            <executions>
-              <execution>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>checkout</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <configuration>
-              <projectsDirectory>${project.build.directory}/maven-site</projectsDirectory>
-              <pom>${project.build.directory}/maven-site/pom.xml</pom>
-              <goals>
-                <goal>clean</goal>
-                <goal>site</goal>
-              </goals>
-            </configuration>
-            <executions>
-              <execution>
-                <id>initialize</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</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.
+-->
+
+<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>
+    <artifactId>maven</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <version>2.0.9-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>apache-maven</artifactId>
+  <name>Maven Bundle</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <finalName>maven-${project.version}-uber</finalName>
+              <createDependencyReducedPom>
+                false
+              </createDependencyReducedPom>
+              <keepDependenciesWithProvidedScope>
+                true
+              </keepDependenciesWithProvidedScope>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
/>
+              </transformers>
+              <artifactSet>
+                <excludes>
+                  <exclude>
+                    org.codehaus.plexus:plexus-component-api
+                  </exclude>
+                  <exclude>classworlds:classworlds</exclude>
+                  <exclude>junit:junit</exclude>
+                  <exclude>jmock:jmock</exclude>
+                  <exclude>xml-apis:xml-apis</exclude>
+                </excludes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>org.jdom</pattern>
+                </relocation>
+                <relocation>
+                  <pattern>de.zeigermann.xml</pattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.webdav</pattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.commons.httpclient</pattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.commons.logging</pattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.codehaus.plexus.util</pattern>
+                  <excludes>
+                    <exclude>
+                      org.codehaus.plexus.util.xml.Xpp3Dom
+                    </exclude>
+                    <exclude>
+                      org.codehaus.plexus.util.xml.pull.*
+                    </exclude>
+                  </excludes>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <descriptor>src/assemble/bin.xml</descriptor>
+          <finalName>apache-maven-${project.version}</finalName>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-toolchain</artifactId>
+    </dependency>
+ </dependencies>
+
+  <profiles>
+    <profile>
+      <id>include-site</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-scm-plugin</artifactId>
+            <configuration>
+              <connectionUrl>scm:svn:http://svn.apache.org/repos/asf/maven/site/trunk</connectionUrl>
+              <checkoutDirectory>${project.build.directory}/maven-site</checkoutDirectory>
+            </configuration>
+            <executions>
+              <execution>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>checkout</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <configuration>
+              <projectsDirectory>${project.build.directory}/maven-site</projectsDirectory>
+              <pom>${project.build.directory}/maven-site/pom.xml</pom>
+              <goals>
+                <goal>clean</goal>
+                <goal>site</goal>
+              </goals>
+            </configuration>
+            <executions>
+              <execution>
+                <id>initialize</id>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

Propchange: maven/components/branches/maven-2.0.x/apache-maven/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/conf/settings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/site/apt/getting-to-container-configured-mojos.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoserTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoserTest.java?rev=640546&r1=640545&r2=640546&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoserTest.java
(original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoserTest.java
Mon Mar 24 12:53:51 2008
@@ -1,30 +1,30 @@
-package org.apache.maven.usability;
-
-import org.apache.maven.plugin.MojoExecutionException;
-
-import junit.framework.TestCase;
-
-/**
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- *
- */
-public class MojoExecutionExceptionDiagnoserTest
-    extends TestCase
-{
-
-    public void testDiag()
-    {
-        MojoExecutionExceptionDiagnoser diag = new MojoExecutionExceptionDiagnoser();
-        
-        Exception e = new NullPointerException("Test");
-        
-        assertFalse( diag.canDiagnose( e ) );
-        
-        MojoExecutionException me = new MojoExecutionException(null);
-        
-        assertTrue( diag.canDiagnose( me ) );
-        
-        diag.diagnose( me );   
-        
-    }
-}
+package org.apache.maven.usability;
+
+import org.apache.maven.plugin.MojoExecutionException;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
+ *
+ */
+public class MojoExecutionExceptionDiagnoserTest
+    extends TestCase
+{
+
+    public void testDiag()
+    {
+        MojoExecutionExceptionDiagnoser diag = new MojoExecutionExceptionDiagnoser();
+        
+        Exception e = new NullPointerException("Test");
+        
+        assertFalse( diag.canDiagnose( e ) );
+        
+        MojoExecutionException me = new MojoExecutionException(null);
+        
+        assertTrue( diag.canDiagnose( me ) );
+        
+        diag.diagnose( me );   
+        
+    }
+}

Propchange: maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoserTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoFailureExceptionDiagnoserTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoFailureExceptionDiagnoserTest.java?rev=640546&r1=640545&r2=640546&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoFailureExceptionDiagnoserTest.java
(original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoFailureExceptionDiagnoserTest.java
Mon Mar 24 12:53:51 2008
@@ -1,30 +1,30 @@
-package org.apache.maven.usability;
-
-import junit.framework.TestCase;
-
-import org.apache.maven.plugin.MojoFailureException;
-
-/**
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- *
- */
-public class MojoFailureExceptionDiagnoserTest
-    extends TestCase
-{
-
-    public void testDiag()
-    {
-        MojoFailureExceptionDiagnoser diag = new MojoFailureExceptionDiagnoser();
-        
-        Exception e = new NullPointerException("Test");
-        
-        assertFalse( diag.canDiagnose( e ) );
-        
-        MojoFailureException me = new MojoFailureException(null);
-        
-        assertTrue( diag.canDiagnose( me ) );
-        
-        diag.diagnose( me );   
-        
-    }
-}
+package org.apache.maven.usability;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.plugin.MojoFailureException;
+
+/**
+ * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
+ *
+ */
+public class MojoFailureExceptionDiagnoserTest
+    extends TestCase
+{
+
+    public void testDiag()
+    {
+        MojoFailureExceptionDiagnoser diag = new MojoFailureExceptionDiagnoser();
+        
+        Exception e = new NullPointerException("Test");
+        
+        assertFalse( diag.canDiagnose( e ) );
+        
+        MojoFailureException me = new MojoFailureException(null);
+        
+        assertTrue( diag.canDiagnose( me ) );
+        
+        diag.diagnose( me );   
+        
+    }
+}

Propchange: maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoFailureExceptionDiagnoserTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-plugin-descriptor/src/main/mdo/lifecycle.mdo
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-project/src/test/resources/projects/scope/transitive-provided-dep.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/mdo/toolchains.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message