From 038d807b38115ff093bf16f3b0a2db439202bf67 Mon Sep 17 00:00:00 2001
From: rfscholte <rfscholte@apache.org>
Date: Tue, 4 Feb 2020 22:28:08 +0100
Subject: [PATCH] [MSHADE-223] restructure/refactor test

---
 .../apache/maven/its/shade/drpe/a/0.1/a-0.1.jar | Bin 22 -> 0 bytes
 .../maven/its/shade/drpe/b/0.2/b-0.2-alt.jar    | Bin 22 -> 0 bytes
 .../apache/maven/its/shade/drpe/b/0.2/b-0.2.jar | Bin 22 -> 0 bytes
 .../org/apache/maven/its/shade/drpe/c/1/c-1.jar | Bin 22 -> 0 bytes
 .../dep-reduced-pom-exclusions}/a-0.1.pom       |   0
 .../b-0.2-alt.jar/b-alt.properties              |  16 ++++++++++++++++
 .../dep-reduced-pom-exclusions}/b-0.2.pom       |   0
 .../dep-reduced-pom-exclusions}/c-1.pom         |   0
 .../invoker.properties                          |   0
 .../dep-reduced-pom-exclusions/pom.xml          |  15 ---------------
 .../dep-reduced-pom-exclusions/verify.groovy    |   0
 11 files changed, 16 insertions(+), 15 deletions(-)
 delete mode 100644 src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1/a-0.1.jar
 delete mode 100644 src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2-alt.jar
 delete mode 100644 src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2.jar
 delete mode 100644 src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1/c-1.jar
 rename src/it/{dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1 => mrm/repository/dep-reduced-pom-exclusions}/a-0.1.pom (100%)
 create mode 100644 src/it/mrm/repository/dep-reduced-pom-exclusions/b-0.2-alt.jar/b-alt.properties
 rename src/it/{dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2 => mrm/repository/dep-reduced-pom-exclusions}/b-0.2.pom (100%)
 rename src/it/{dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1 => mrm/repository/dep-reduced-pom-exclusions}/c-1.pom (100%)
 rename src/it/{ => projects}/dep-reduced-pom-exclusions/invoker.properties (100%)
 rename src/it/{ => projects}/dep-reduced-pom-exclusions/pom.xml (87%)
 rename src/it/{ => projects}/dep-reduced-pom-exclusions/verify.groovy (100%)

diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1/a-0.1.jar b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1/a-0.1.jar
deleted file mode 100644
index 15cb0ecb3e219d1701294bfdf0fe3f5cb5d208e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22
NcmWIWW@Tf*000g10H*)|

diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2-alt.jar b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2-alt.jar
deleted file mode 100644
index 15cb0ecb3e219d1701294bfdf0fe3f5cb5d208e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22
NcmWIWW@Tf*000g10H*)|

diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2.jar b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2.jar
deleted file mode 100644
index 15cb0ecb3e219d1701294bfdf0fe3f5cb5d208e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22
NcmWIWW@Tf*000g10H*)|

diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1/c-1.jar b/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1/c-1.jar
deleted file mode 100644
index 15cb0ecb3e219d1701294bfdf0fe3f5cb5d208e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22
NcmWIWW@Tf*000g10H*)|

diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1/a-0.1.pom b/src/it/mrm/repository/dep-reduced-pom-exclusions/a-0.1.pom
similarity index 100%
rename from src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/a/0.1/a-0.1.pom
rename to src/it/mrm/repository/dep-reduced-pom-exclusions/a-0.1.pom
diff --git a/src/it/mrm/repository/dep-reduced-pom-exclusions/b-0.2-alt.jar/b-alt.properties b/src/it/mrm/repository/dep-reduced-pom-exclusions/b-0.2-alt.jar/b-alt.properties
new file mode 100644
index 00000000..287f9b1f
--- /dev/null
+++ b/src/it/mrm/repository/dep-reduced-pom-exclusions/b-0.2-alt.jar/b-alt.properties
@@ -0,0 +1,16 @@
+# 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.
\ No newline at end of file
diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2.pom b/src/it/mrm/repository/dep-reduced-pom-exclusions/b-0.2.pom
similarity index 100%
rename from src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/b/0.2/b-0.2.pom
rename to src/it/mrm/repository/dep-reduced-pom-exclusions/b-0.2.pom
diff --git a/src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1/c-1.pom b/src/it/mrm/repository/dep-reduced-pom-exclusions/c-1.pom
similarity index 100%
rename from src/it/dep-reduced-pom-exclusions/repo/org/apache/maven/its/shade/drpe/c/1/c-1.pom
rename to src/it/mrm/repository/dep-reduced-pom-exclusions/c-1.pom
diff --git a/src/it/dep-reduced-pom-exclusions/invoker.properties b/src/it/projects/dep-reduced-pom-exclusions/invoker.properties
similarity index 100%
rename from src/it/dep-reduced-pom-exclusions/invoker.properties
rename to src/it/projects/dep-reduced-pom-exclusions/invoker.properties
diff --git a/src/it/dep-reduced-pom-exclusions/pom.xml b/src/it/projects/dep-reduced-pom-exclusions/pom.xml
similarity index 87%
rename from src/it/dep-reduced-pom-exclusions/pom.xml
rename to src/it/projects/dep-reduced-pom-exclusions/pom.xml
index de4f1a61..6c5eb3f3 100644
--- a/src/it/dep-reduced-pom-exclusions/pom.xml
+++ b/src/it/projects/dep-reduced-pom-exclusions/pom.xml
@@ -25,26 +25,12 @@ under the License.
   <groupId>org.apache.maven.its.shade.drpe</groupId>
   <artifactId>test</artifactId>
   <version>1.0</version>
-  <packaging>jar</packaging>
 
   <name>MSHADE-223</name>
   <description>
     Test that creation of the dependency reduced POM properly handles dependencies with classifiers.
   </description>
 
-  <repositories>
-    <repository>
-      <id>shade-it</id>
-      <url>file:///${basedir}/repo</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.its.shade.drpe</groupId>
@@ -68,7 +54,6 @@ under the License.
         <executions>
           <execution>
             <id>attach-shade</id>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
diff --git a/src/it/dep-reduced-pom-exclusions/verify.groovy b/src/it/projects/dep-reduced-pom-exclusions/verify.groovy
similarity index 100%
rename from src/it/dep-reduced-pom-exclusions/verify.groovy
rename to src/it/projects/dep-reduced-pom-exclusions/verify.groovy