maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject svn commit: r1615358 - in /maven/plugins/trunk/maven-dependency-plugin: ./ src/it/ src/it/analyze-dep-mgt/ src/it/analyze-report/ src/it/analyze/ src/it/build-classpath/ src/it/copy-and-unpack-with-alternate-local-repo/ src/it/copy-cli/ src/it/copy-dep...
Date Sat, 02 Aug 2014 19:44:52 GMT
Author: rfscholte
Date: Sat Aug  2 19:44:51 2014
New Revision: 1615358

URL: http://svn.apache.org/r1615358
Log:
[MDEP-452]
Introduce mock repository manager, clean up old m2repo

Added:
    maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/
    maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/
    maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/purge-local-repository-1.0.pom
      - copied unchanged from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/org/apache/maven/its/dependency/purge-local-repository/1.0/purge-local-repository-1.0.pom
    maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/purge-local-repository-2-1.0.pom
      - copied unchanged from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/org/apache/maven/its/dependency/purge-local-repository-2/1.0/purge-local-repository-2-1.0.pom
    maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/settings.xml
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/analyze/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-dep-mgt/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-dep-mgt/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/copy/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-and-unpack-with-alternate-local-repo/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/copy-and-unpack-with-alternate-local-repo/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-cli/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/copy-cli/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-dependencies/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-reactor/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/copy-from-reactor/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/dependency-properties/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/dependency-properties/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/filterunpack/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/go-offline/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/go-offline/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-439-analyze-java8/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-439-analyze-java8/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-450-project-with-ancestor/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-450-project-with-ancestor/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-450-project-without-ancestor/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-450-project-without-ancestor/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-pom/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-bad-pom/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-non-transitive/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-non-transitive/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-reresolve/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-reresolve/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-snapshots-only/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-snapshots-only/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-version-range/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-version-range/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/resolve/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/resolve/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/resolve-plugins/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/resolve-plugins/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/resolve-plugins-exclude-reactor/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/resolve-plugins-exclude-reactor/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/resolve-plugins-with-exclude/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/resolve-plugins-with-exclude/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/setup-custom-ear-lifecycle/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/setup-custom-ear-lifecycle/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/sources/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/sources/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/tree/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/tree/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/tree-includes/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/tree-includes/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/tree-verbose/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/tree-verbose/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/unpack/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-cli/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/unpack-cli/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-custom-ear/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/unpack-custom-ear/
    maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-dependencies/
      - copied from r1613617, maven/plugins/trunk/maven-dependency-plugin/src/it/unpack-dependencies/
Removed:
    maven/plugins/trunk/maven-dependency-plugin/src/it/analyze/
    maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-dep-mgt/
    maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/
    maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/
    maven/plugins/trunk/maven-dependency-plugin/src/it/copy/
    maven/plugins/trunk/maven-dependency-plugin/src/it/copy-and-unpack-with-alternate-local-repo/
    maven/plugins/trunk/maven-dependency-plugin/src/it/copy-cli/
    maven/plugins/trunk/maven-dependency-plugin/src/it/copy-dependencies/
    maven/plugins/trunk/maven-dependency-plugin/src/it/copy-from-reactor/
    maven/plugins/trunk/maven-dependency-plugin/src/it/dependency-properties/
    maven/plugins/trunk/maven-dependency-plugin/src/it/filterunpack/
    maven/plugins/trunk/maven-dependency-plugin/src/it/go-offline/
    maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-439-analyze-java8/
    maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-450-project-with-ancestor/
    maven/plugins/trunk/maven-dependency-plugin/src/it/mdep-450-project-without-ancestor/
    maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository/
    maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-bad-pom/
    maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-non-transitive/
    maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-reresolve/
    maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-snapshots-only/
    maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-version-range/
    maven/plugins/trunk/maven-dependency-plugin/src/it/resolve/
    maven/plugins/trunk/maven-dependency-plugin/src/it/resolve-plugins/
    maven/plugins/trunk/maven-dependency-plugin/src/it/resolve-plugins-exclude-reactor/
    maven/plugins/trunk/maven-dependency-plugin/src/it/resolve-plugins-with-exclude/
    maven/plugins/trunk/maven-dependency-plugin/src/it/settings.xml
    maven/plugins/trunk/maven-dependency-plugin/src/it/setup-custom-ear-lifecycle/
    maven/plugins/trunk/maven-dependency-plugin/src/it/sources/
    maven/plugins/trunk/maven-dependency-plugin/src/it/tree/
    maven/plugins/trunk/maven-dependency-plugin/src/it/tree-includes/
    maven/plugins/trunk/maven-dependency-plugin/src/it/tree-verbose/
    maven/plugins/trunk/maven-dependency-plugin/src/it/unpack/
    maven/plugins/trunk/maven-dependency-plugin/src/it/unpack-cli/
    maven/plugins/trunk/maven-dependency-plugin/src/it/unpack-custom-ear/
    maven/plugins/trunk/maven-dependency-plugin/src/it/unpack-dependencies/
    maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/
Modified:
    maven/plugins/trunk/maven-dependency-plugin/pom.xml

Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1615358&r1=1615357&r2=1615358&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Sat Aug  2 19:44:51 2014
@@ -301,23 +301,54 @@ under the License.
     <profile>
       <id>run-its</id>
       <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-invoker-plugin</artifactId>
-              <configuration>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <configuration>
+              <goals>
+                <goal>clean</goal>
+                <goal>process-sources</goal>
+              </goals>
+              <projectsDirectory>src/it/projects</projectsDirectory>
+              <pomExcludes>
+                <pomExclude>purge-local-repository-bad-pom/pom.xml</pomExclude>
+              </pomExcludes>
+              <!-- for mrm -->
+              <settingsFile>src/it/mrm/settings.xml</settingsFile>
+              <filterProperties>
+                <repository.proxy.url>${repository.proxy.url}</repository.proxy.url>
+              </filterProperties>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>mrm-maven-plugin</artifactId>
+            <version>1.0-beta-2</version>
+            <executions>
+              <execution>
                 <goals>
-                  <goal>clean</goal>
-                  <goal>process-sources</goal>
+                  <goal>start</goal>
+                  <goal>stop</goal>
                 </goals>
-                <pomExcludes>
-                  <pomExclude>purge-local-repository-bad-pom/pom.xml</pomExclude>
-                </pomExcludes>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
+              </execution>
+            </executions>
+            <configuration>
+              <propertyName>repository.proxy.url</propertyName>
+              <repositories>
+                <mockRepo>
+                  <source>src/it/mrm/repository</source>
+                </mockRepo>
+                <!-- 
+                <mockRepo>
+                  <source>src/test/resources/m2repo</source>
+                </mockRepo>
+                 -->
+                <proxyRepo/>
+              </repositories>
+            </configuration>
+          </plugin>
+        </plugins>
       </build>
     </profile>
     <profile>

Added: maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/settings.xml?rev=1615358&view=auto
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/settings.xml (added)
+++ maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/settings.xml Sat Aug  2 19:44:51
2014
@@ -0,0 +1,70 @@
+<?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.
+-->
+<settings>
+  <mirrors>
+    <mirror>
+      <id>mrm-maven-plugin</id>
+      <name>Mock Repository Manager</name>
+      <url>@repository.proxy.url@</url>
+      <mirrorOf>*</mirrorOf>
+    </mirror>
+  </mirrors>
+  <profiles>
+    <profile>
+      <id>it-repo</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>snapshots</id>
+          <url>@repository.proxy.url@</url>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>snapshots</id>
+          <url>@repository.proxy.url@</url>
+          <releases>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <checksumPolicy>ignore</checksumPolicy>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+</settings>



Mime
View raw message