o updating assembly and that we don't need the shaded jar anymore

o keep JDOM in the distro for the time being


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585563 13f79535-47bb-0310-9956-ffa450edef68

maven-embedder/pom.xml

@@ -208,40 +208,6 @@ under the License.
       </activation>
       <build>
         <plugins>
-          <plugin>
-            <artifactId>shade-maven-plugin</artifactId>
-            <groupId>org.codehaus.mojo</groupId>
-            <version>1.0-alpha-12</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>shade</goal>
-                </goals>
-                <configuration>
-                  <!-- The IDEA folks don't want to put SNAPSHOT libs in their projects even though they are -->
-                  <finalName>maven-embedder-std-2.1</finalName>
-                  <createDependencyReducedPom>false</createDependencyReducedPom>
-                  <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
-                  <transformers>
-                    <transformer implementation="org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer"/>
-                  </transformers>
-                  <relocations>
-                    <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>
-                    <relocation>
-                      <pattern>org.jdom</pattern>
-                    </relocation>
-                  </relocations>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
             <version>2.2-beta-1</version>

maven-embedder/src/main/assembly/bin.xml

@@ -43,7 +43,9 @@ under the License.
         <exclude>org.apache.maven:maven-artifact</exclude>
         <exclude>org.apache.maven:maven-monitor</exclude>
         <exclude>org.apache.maven:maven-plugin-descriptor</exclude>
+        <!--
         <exclude>jdom:jdom</exclude>
+        -->
       </excludes>
     </dependencySet>
   </dependencySets>
@@ -82,7 +84,7 @@ under the License.
       <directory>target</directory>
       <outputDirectory>lib</outputDirectory>
       <includes>
-        <include>maven-embedder-std*.jar</include>
+        <include>maven-embedder-*.jar</include>
       </includes>
     </fileSet>
   </fileSets>