maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1469697 - in /maven/shared/trunk/maven-dependency-tree/src/it/mshared-167: ./ expected-M2.txt expected-M3.txt invoker.properties pom.xml verify.bsh
Date Fri, 19 Apr 2013 05:32:05 GMT
Author: hboutemy
Date: Fri Apr 19 05:32:05 2013
New Revision: 1469697

URL: http://svn.apache.org/r1469697
Log:
[MSHARED-167] added IT

Added:
    maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/
    maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M2.txt   (with props)
    maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M3.txt   (with props)
    maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties   (with
props)
    maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/pom.xml   (with props)
    maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/verify.bsh   (with props)

Added: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M2.txt
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M2.txt?rev=1469697&view=auto
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M2.txt (added)
+++ maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M2.txt Fri Apr 19
05:32:05 2013
@@ -0,0 +1,18 @@
+org.apache.maven.its.dependency-tree:mshared-167:jar:1.0-SNAPSHOT
+\- org.apache.xmlgraphics:batik-swing:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-awt-util:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-bridge:jar:1.7:compile
+   |  +- org.apache.xmlgraphics:batik-anim:jar:1.7:compile
+   |  +- org.apache.xmlgraphics:batik-parser:jar:1.7:compile
+   |  +- org.apache.xmlgraphics:batik-script:jar:1.7:compile
+   |  +- org.apache.xmlgraphics:batik-xml:jar:1.7:compile
+   |  \- xalan:xalan:jar:2.6.0:compile
+   +- org.apache.xmlgraphics:batik-css:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-dom:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-ext:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-gui-util:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-gvt:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-svg-dom:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-util:jar:1.7:compile
+   +- xml-apis:xml-apis:jar:1.3.04:compile
+   \- xml-apis:xml-apis-ext:jar:1.3.04:compile

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M2.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M2.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M2.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M3.txt
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M3.txt?rev=1469697&view=auto
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M3.txt (added)
+++ maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M3.txt Fri Apr 19
05:32:05 2013
@@ -0,0 +1,19 @@
+org.apache.maven.its.dependency-tree:mshared-167:jar:1.0-SNAPSHOT
+\- org.apache.xmlgraphics:batik-swing:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-awt-util:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-bridge:jar:1.7:compile
+   |  +- org.apache.xmlgraphics:batik-anim:jar:1.7:compile
+   |  +- org.apache.xmlgraphics:batik-parser:jar:1.7:compile
+   |  +- org.apache.xmlgraphics:batik-script:jar:1.7:compile
+   |  |  \- org.apache.xmlgraphics:batik-js:jar:1.7:compile
+   |  +- org.apache.xmlgraphics:batik-xml:jar:1.7:compile
+   |  \- xalan:xalan:jar:2.6.0:compile
+   +- org.apache.xmlgraphics:batik-css:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-dom:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-ext:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-gui-util:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-gvt:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-svg-dom:jar:1.7:compile
+   +- org.apache.xmlgraphics:batik-util:jar:1.7:compile
+   +- xml-apis:xml-apis:jar:1.3.04:compile
+   \- xml-apis:xml-apis-ext:jar:1.3.04:compile

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M3.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M3.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/expected-M3.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties?rev=1469697&view=auto
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties (added)
+++ maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties Fri Apr
19 05:32:05 2013
@@ -0,0 +1 @@
+invoker.goals = clean dependency:tree

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/invoker.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/pom.xml?rev=1469697&view=auto
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/pom.xml (added)
+++ maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/pom.xml Fri Apr 19 05:32:05
2013
@@ -0,0 +1,85 @@
+<?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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.dependency-tree</groupId>
+  <artifactId>mshared-167</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>Test MSHARED-167</name>
+  <description>
+    Maven 2.2.x has a bug: omits batik-js (transitive batik-swing -> batik-bridge ->
batik-script -> batik-js)
+    Maven 3.x doesn't omit the transitive dependency
+  </description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <outputFile>target/tree-M2.txt</outputFile>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>batik-swing</artifactId>
+      <version>1.7</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.5</version>
+          <configuration>
+            <outputFile>${outputFile}</outputFile>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>@project.groupId@</groupId>
+              <artifactId>@project.artifactId@</artifactId>
+              <version>@project.version@</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>maven-3</id>
+      <activation>
+        <file>
+          <!--  This employs that the basedir expression is only recognized by Maven 3.x
(see MNG-2363) -->
+          <exists>${basedir}</exists>
+         </file>
+      </activation>
+      <properties>
+        <outputFile>target/tree-M3.txt</outputFile>
+      </properties>
+    </profile>    
+  </profiles>
+</project>

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/verify.bsh
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/verify.bsh?rev=1469697&view=auto
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/verify.bsh (added)
+++ maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/verify.bsh Fri Apr 19 05:32:05
2013
@@ -0,0 +1,26 @@
+import java.io.*;
+
+import org.codehaus.plexus.util.*;
+
+File outputFile = new File( basedir, "target/tree-M2.txt" );
+File expectedFile = new File( basedir, "expected-M2.txt" );
+if ( ! outputFile.exists() )
+{
+  outputFile = new File( basedir, "target/tree-M3.txt" );
+  expectedFile = new File( basedir, "expected-M3.txt" );
+}
+
+String actual = FileUtils.fileRead( outputFile );
+String expected = FileUtils.fileRead( expectedFile );
+
+actual = actual.replaceAll( "[\n\r]+", "\n" );
+expected = expected.replaceAll( "[\n\r]+", "\n" );
+
+System.out.println( "Checking dependency tree..." );
+
+if ( !actual.equals( expected ) )
+{
+    throw new Exception( "Unexpected dependency tree" );
+}
+
+return true;

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/verify.bsh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/shared/trunk/maven-dependency-tree/src/it/mshared-167/verify.bsh
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message