Author: elecharny
Date: Thu Sep 16 15:43:07 2010
New Revision: 997797
URL: http://svn.apache.org/viewvc?rev=997797&view=rev
Log:
restarted with a fresh new maven build, restauration the distribution' submodule
Added:
mina/trunk/distribution/
mina/trunk/distribution/pom.xml
mina/trunk/distribution/src/
mina/trunk/distribution/src/main/
mina/trunk/distribution/src/main/assembly/
mina/trunk/distribution/src/main/assembly/bin.xml
- copied, changed from r997312, mina/trunk/src/main/assembly/bin.xml
mina/trunk/distribution/src/main/assembly/src.xml
- copied, changed from r997312, mina/trunk/src/main/assembly/src.xml
Removed:
mina/trunk/src/
Modified:
mina/trunk/pom.xml
Added: mina/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/distribution/pom.xml?rev=997797&view=auto
==============================================================================
--- mina/trunk/distribution/pom.xml (added)
+++ mina/trunk/distribution/pom.xml Thu Sep 16 15:43:07 2010
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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. -->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>mina-parent</artifactId>
+ <groupId>org.apache.mina</groupId>
+ <version>2.0.0-RC2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>distribution</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache MINA Distribution</name>
+
+ <properties>
+ <docsFolder>${project.build.directory}/docs</docsFolder>
+ </properties>
+
+ <build>
+ <finalName>apache-mina-${project.version}</finalName>
+
+ <!-- Here, we create the src and bin packages -->
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+
+ <phase>package</phase>
+
+ <goals>
+ <goal>single</goal>
+ </goals>
+
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <!-- Uses this profile to copy the Javadoc when releasing -->
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <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>
+
+ <!-- We don't include distrinution as a dependency : it's not part of the
release -->
+ </dependencies>
+
+</project>
+
Copied: mina/trunk/distribution/src/main/assembly/bin.xml (from r997312,
mina/trunk/src/main/assembly/bin.xml)
URL:
http://svn.apache.org/viewvc/mina/trunk/distribution/src/main/assembly/bin.xml?p2=mina/trunk/distribution/src/main/assembly/bin.xml&p1=mina/trunk/src/main/assembly/bin.xml&r1=997312&r2=997797&rev=997797&view=diff
==============================================================================
--- mina/trunk/src/main/assembly/bin.xml (original)
+++ mina/trunk/distribution/src/main/assembly/bin.xml Thu Sep 16 15:43:07 2010
@@ -31,7 +31,6 @@
<fileSet>
<directory>..</directory>
<outputDirectory></outputDirectory>
- <filtered>false</filtered>
<includes>
<include>README*</include>
<include>LICENSE*</include>
@@ -59,10 +58,10 @@
<!-- Including only Mina modules -->
<include>${project.groupId}:*</include>
</includes>
+
<excludes>
<!-- Excluding sources jars -->
<exclude>*:sources</exclude>
- <exclude>${project.groupId}:mina-transport-serial</exclude>
</excludes>
</dependencySet>
@@ -72,11 +71,9 @@
<excludes>
<!-- Excluding Mina modules -->
<exclude>${project.groupId}:*</exclude>
- <exclude>${project.groupId}:mina-transport-serial</exclude>
+
<!-- Excluding sources jars -->
<exclude>*:sources</exclude>
- <!-- Explicitely excluding RXTX jars -->
- <exclude>org.rxtx:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
Copied: mina/trunk/distribution/src/main/assembly/src.xml (from r997312,
mina/trunk/src/main/assembly/src.xml)
URL:
http://svn.apache.org/viewvc/mina/trunk/distribution/src/main/assembly/src.xml?p2=mina/trunk/distribution/src/main/assembly/src.xml&p1=mina/trunk/src/main/assembly/src.xml&r1=997312&r2=997797&rev=997797&view=diff
==============================================================================
--- mina/trunk/src/main/assembly/src.xml (original)
+++ mina/trunk/distribution/src/main/assembly/src.xml Thu Sep 16 15:43:07 2010
@@ -31,7 +31,6 @@
<fileSet>
<directory>..</directory>
<outputDirectory></outputDirectory>
- <filtered>false</filtered>
<includes>
<include>README*</include>
<include>LICENSE*</include>
@@ -53,7 +52,6 @@
<fileSet>
<directory>..</directory>
<outputDirectory>src</outputDirectory>
- <filtered>false</filtered>
<includes>
<include>**/*</include>
</includes>
@@ -62,9 +60,9 @@
<exclude>LICENSE*.txt</exclude>
<exclude>NOTICE.txt</exclude>
<exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
+ <exclude>**/target/**</exclude>
<exclude>**/.settings</exclude>
- <exclude>**/.settings/**/*</exclude>
+ <exclude>**/.settings/**</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
<exclude>**/*.gen</exclude>
@@ -72,6 +70,8 @@
<exclude>**/surefire*</exclude>
<exclude>**/cobertura.ser</exclude>
<exclude>**/velocity.log</exclude>
+ <exclude>distribution</exclude>
+ <exclude>distribution/**</exclude>
</excludes>
</fileSet>
</fileSets>
Modified: mina/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=997797&r1=997796&r2=997797&view=diff
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Thu Sep 16 15:43:07 2010
@@ -587,3 +587,4 @@
</plugins>
</reporting>
</project>
+
