Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2010-12-03 15:29:54 +0000
committerJesse McConnell2010-12-03 15:29:54 +0000
commit4f2064638092ceb9ee9d6d98b98a05dbb493d805 (patch)
treeebbb386a365e3330b6ad72e533d73010f1c73b8b
parentd2161e36cfacbd7558640133f8024fea05b805bd (diff)
downloadorg.eclipse.jetty.project-4f2064638092ceb9ee9d6d98b98a05dbb493d805.tar.gz
org.eclipse.jetty.project-4f2064638092ceb9ee9d6d98b98a05dbb493d805.tar.xz
org.eclipse.jetty.project-4f2064638092ceb9ee9d6d98b98a05dbb493d805.zip
clean up distro a bit
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2577 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--jetty-distribution/pom.xml85
-rw-r--r--jetty-distribution/src/main/assembly/jetty-assembly.xml1
2 files changed, 0 insertions, 86 deletions
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 41b2785934..f2ccd0da28 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -603,89 +603,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>eclipse-release</id>
- <build>
- <plugins>
- <!--
- leverages new includeDependencySources which pulls all the sources
- and generates the javadoc off of them yielding a javadoc setup
- for the entire distribution
-
- this step can take over 10 minutes as it spawns additional javadoc
- plugin calls which is why it has been moved to strictly release
- process execution (requires 2.7+ version)
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <includeDependencySources>true</includeDependencySources>
- <additionalJOption>-J-Xmx256m</additionalJOption>
- <dependencySourceExcludes>
- <dependencySourceExclude>asm:*</dependencySourceExclude>
- <dependencySourceExclude>com.sun.mail:*</dependencySourceExclude>
- <dependencySourceExclude>javax.mail:*</dependencySourceExclude>
- </dependencySourceExcludes>
- <reportOutputDirectory>${assembly-directory}</reportOutputDirectory>
- <destDir>javadoc</destDir>
- </configuration>
- <executions>
- <execution>
- <id>distribution-docs</id>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <phase>process-sources</phase>
- </execution>
- </executions>
- </plugin>
- <!--
- svn export the jetty directory which is then bundled via the jetty-src.xml
- assembly descriptor to create a source distribution archive
- -->
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.4</version>
- <configuration>
- <connectionUrl>${project.parent.scm.connection}</connectionUrl>
- </configuration>
- <executions>
- <execution>
- <id>distribution-source</id>
- <goals>
- <goal>export</goal>
- </goals>
- <phase>process-sources</phase>
- </execution>
- </executions>
- </plugin-->
- <!--
- Adds in the additional jetty-src assembly descriptor to the release process
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/jetty-assembly.xml</descriptor>
- <descriptor>src/main/assembly/jetty-src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/jetty-distribution/src/main/assembly/jetty-assembly.xml b/jetty-distribution/src/main/assembly/jetty-assembly.xml
index eac183cc96..1573d6b445 100644
--- a/jetty-distribution/src/main/assembly/jetty-assembly.xml
+++ b/jetty-distribution/src/main/assembly/jetty-assembly.xml
@@ -1,7 +1,6 @@
<assembly>
<formats>
<format>tar.gz</format>
- <format>tar.bz2</format>
<format>zip</format>
</formats>
<fileSets>

Back to the top