maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r648510 - in /maven/components/trunk/maven-distribution: ./ LICENSE.txt NOTICE.txt README.txt pom.xml src/ src/bin/ src/conf/ src/main/ src/main/assembly/ src/main/assembly/bin.xml
Date Wed, 16 Apr 2008 04:57:17 GMT
Author: jvanzyl
Date: Tue Apr 15 21:57:15 2008
New Revision: 648510

URL: http://svn.apache.org/viewvc?rev=648510&view=rev
Log:
o creating a separate module for the distribution like there is in the 2.0.x branch

Added:
    maven/components/trunk/maven-distribution/
    maven/components/trunk/maven-distribution/LICENSE.txt
      - copied unchanged from r648276, maven/components/trunk/maven-embedder/LICENSE.txt
    maven/components/trunk/maven-distribution/NOTICE.txt
      - copied unchanged from r648276, maven/components/trunk/maven-embedder/NOTICE.txt
    maven/components/trunk/maven-distribution/README.txt
      - copied unchanged from r648276, maven/components/trunk/maven-embedder/README.txt
    maven/components/trunk/maven-distribution/pom.xml
      - copied, changed from r648294, maven/components/trunk/maven-embedder/pom.xml
    maven/components/trunk/maven-distribution/src/
    maven/components/trunk/maven-distribution/src/bin/
      - copied from r648276, maven/components/trunk/maven-embedder/src/bin/
    maven/components/trunk/maven-distribution/src/conf/
      - copied from r648276, maven/components/trunk/maven-embedder/src/conf/
    maven/components/trunk/maven-distribution/src/main/
    maven/components/trunk/maven-distribution/src/main/assembly/
      - copied from r648276, maven/components/trunk/maven-embedder/src/main/assembly/
Modified:
    maven/components/trunk/maven-distribution/src/main/assembly/bin.xml

Copied: maven/components/trunk/maven-distribution/pom.xml (from r648294, maven/components/trunk/maven-embedder/pom.xml)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-distribution/pom.xml?p2=maven/components/trunk/maven-distribution/pom.xml&p1=maven/components/trunk/maven-embedder/pom.xml&r1=648294&r2=648510&rev=648510&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-distribution/pom.xml Tue Apr 15 21:57:15 2008
@@ -26,12 +26,17 @@
     <version>2.1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>maven-embedder</artifactId>
-  <name>Maven Embedder</name>
+  <artifactId>maven-distribution</artifactId>
+  <name>Maven Distribution</name>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-embedder</artifactId>
+      <version>2.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>2.1-SNAPSHOT</version>
     </dependency>
@@ -97,39 +102,6 @@
     </dependency>
   </dependencies>
 
-  <distributionManagement>
-    <site>
-      <id>apache.website</id>
-      <url>scp://people.apache.org/www/maven.apache.org/embedder/${project.version}/</url>
-    </site>
-  </distributionManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>aspectj-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>compile-aspects</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <aspectLibraries>
-                <aspectLibrary>
-                  <groupId>org.apache.maven</groupId>
-                  <artifactId>maven-core</artifactId>
-                </aspectLibrary>
-              </aspectLibraries>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
   <profiles>
     <profile>
       <!--
@@ -192,68 +164,6 @@
     <profile>
       <!--
        |
-       | This profile is specifically for creating an embedder that can be used for Eclipse
integration. We need to
-       | need a single embedder JAR that looks like an OSGi bundle.
-       |
-       -->
-      <id>tycho</id>
-      <properties>
-        <bundleVersion>2.1.0.v20071120-1632</bundleVersion>
-      </properties>
-      <build>
-        <resources>
-          <resource>
-            <directory>src/main/resources</directory>
-            <filtering>true</filtering>
-          </resource>
-        </resources>
-        <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>
-                  <finalName>maven-embedder-tycho-${bundleVersion}</finalName>
-                  <createDependencyReducedPom>false</createDependencyReducedPom>
-                  <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
-                  <transformers>
-                    <transformer implementation="org.codehaus.mojo.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.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>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <!--
-       |
        | This profile is specifically for creating an embedder that can be used for netbeans
integration
        |
        -->
@@ -332,51 +242,6 @@
             <configuration>
               <forkMode>once</forkMode>
             </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    
-    <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>

Modified: maven/components/trunk/maven-distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-distribution/src/main/assembly/bin.xml?rev=648510&r1=648276&r2=648510&view=diff
==============================================================================
--- maven/components/trunk/maven-distribution/src/main/assembly/bin.xml (original)
+++ maven/components/trunk/maven-distribution/src/main/assembly/bin.xml Tue Apr 15 21:57:15
2008
@@ -82,16 +82,5 @@
       <directory>src/conf</directory>
       <outputDirectory>conf</outputDirectory>
     </fileSet>
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>lib</outputDirectory>
-      <includes>
-        <include>maven-embedder-*.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target/maven-site/target/site</directory>
-      <outputDirectory>docs</outputDirectory>
-    </fileSet>
   </fileSets>
 </assembly>



Mime
View raw message