You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2010/09/10 16:03:56 UTC
svn commit: r995795 - in /mina/trunk/distribution: pom.xml release.xml
Author: elecharny
Date: Fri Sep 10 14:03:56 2010
New Revision: 995795
URL: http://svn.apache.org/viewvc?rev=995795&view=rev
Log:
applied pajbam patch from DIRMINA-795
Modified:
mina/trunk/distribution/pom.xml
mina/trunk/distribution/release.xml
Modified: mina/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/distribution/pom.xml?rev=995795&r1=995794&r2=995795&view=diff
==============================================================================
--- mina/trunk/distribution/pom.xml (original)
+++ mina/trunk/distribution/pom.xml Fri Sep 10 14:03:56 2010
@@ -32,7 +32,11 @@
<artifactId>distribution</artifactId>
<packaging>pom</packaging>
- <name>Apache MINA distribution</name>
+ <name>Apache MINA Distribution</name>
+
+ <properties>
+ <docsFolder>${project.build.directory}/docs</docsFolder>
+ </properties>
<build>
<finalName>apache-mina-${project.version}</finalName>
@@ -41,7 +45,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<executions>
-
<execution>
<id>release</id>
<phase>package</phase>
@@ -55,21 +58,6 @@
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
-
- <execution>
- <id>src</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>sources.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
-
</executions>
</plugin>
@@ -77,14 +65,97 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
<version>1.0-alpha-3</version>
- <configuration>
- <excludes>
- <exclude>LICENSE.slf4j.txt</exclude>
- <exclude>LICENSE.springframework.txt</exclude>
- </excludes>
- </configuration>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>copy-javadocs</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo>Copying Javadocs</echo>
+ <mkdir dir="${docsFolder}"></mkdir>
+ <copy todir="${docsFolder}">
+ <fileset dir="../target/site/">
+ <include name="apidocs" />
+ <include name="xref" />
+ <include name="xref-test" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-example</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-filter-compression</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-integration-beans</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-integration-jmx</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-integration-ognl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-integration-xbean</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-statemachine</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-transport-apr</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mina-transport-serial</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: mina/trunk/distribution/release.xml
URL: http://svn.apache.org/viewvc/mina/trunk/distribution/release.xml?rev=995795&r1=995794&r2=995795&view=diff
==============================================================================
--- mina/trunk/distribution/release.xml (original)
+++ mina/trunk/distribution/release.xml Fri Sep 10 14:03:56 2010
@@ -19,67 +19,16 @@
under the License.
-->
<assembly>
- <id>all</id>
<formats>
<format>tar.gz</format>
<format>tar.bz2</format>
<format>zip</format>
</formats>
- <moduleSets>
- <moduleSet>
- <includeSubModules/>
- <sources>
- <outputDirectoryMapping>src/${module.basedir.name}</outputDirectoryMapping>
- <fileSets>
- <fileSet>
- <includes>
- <!-- copy per-module sources into src/mina-*/ -->
- <include>src/**</include>
- <include>pom.xml</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- </includes>
- </fileSet>
- </fileSets>
- </sources>
- <binaries>
- <!-- copy project jars into dist/ -->
- <outputDirectory>dist</outputDirectory>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <!-- copy project dependencies into lib/ -->
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <excludes>
- <!-- during build, the plugin warns that this exclusion is never
- triggered, but the truth is it works just fine and you can't
- do without it. -->
- <exclude>org.apache.mina:*</exclude>
- <exclude>org.rxtx:*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
<fileSets>
+ <!-- Copy licenses into '/' -->
<fileSet>
- <!-- copy the root pom into src/ -->
- <outputDirectory>src</outputDirectory>
- <filtered>false</filtered>
- <includes>
- <include>pom.xml</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <!-- copy the licenses into / -->
+ <directory>..</directory>
<outputDirectory></outputDirectory>
<filtered>false</filtered>
<includes>
@@ -89,16 +38,70 @@
</includes>
</fileSet>
+ <!-- Copy Javadoc into '/docs' -->
<fileSet>
- <!-- copy the javadoc into docs/ -->
- <directory>target/site</directory>
+ <directory>target/docs</directory>
<outputDirectory>docs</outputDirectory>
<includes>
<include>apidocs*/**</include>
<include>xref*/**</include>
</includes>
</fileSet>
+
+ <!-- Copy sources into '/src' -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>src</outputDirectory>
+ <filtered>false</filtered>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>KEYS</exclude>
+ <exclude>LICENSE*.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/*.gen</exclude>
+ <exclude>**/.wtpmodules</exclude>
+ <exclude>**/surefire*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <exclude>**/velocity.log</exclude>
+ <exclude>**/derby.log</exclude>
+ </excludes>
+ </fileSet>
</fileSets>
+
+ <dependencySets>
+ <!-- Copy Mina modules into '/dist' -->
+ <dependencySet>
+ <outputDirectory>dist</outputDirectory>
+ <includes>
+ <!-- Including only Mina modules -->
+ <include>${project.groupId}:*</include>
+ </includes>
+ <excludes>
+ <!-- Excluding sources jars -->
+ <exclude>*:sources</exclude>
+ </excludes>
+ </dependencySet>
+
+ <!-- Copy Mina dependencies into '/lib' -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <!-- Excluding Mina modules -->
+ <exclude>${project.groupId}:*</exclude>
+ <!-- Excluding sources jars -->
+ <exclude>*:sources</exclude>
+ <!-- Explicitely excluding RXTX jars -->
+ <exclude>org.rxtx:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
</assembly>
-