broke transport-serial bad, bad, bad :o) always use mvn with "-Dwith-LGPL-dependencies" for including transport-serial module. Julien
2009/3/30 <[email protected]>: > Author: akarasulu > Date: Mon Mar 30 17:10:38 2009 > New Revision: 760049 > > URL: http://svn.apache.org/viewvc?rev=760049&view=rev > Log: > [DIRMINAA-673]: Applying patch from Chris Custine to fix issues with OSGi > > Added: > mina/trunk/legal/ > mina/trunk/legal/pom.xml > mina/trunk/legal/src/ > mina/trunk/legal/src/main/ > mina/trunk/legal/src/main/resources/ > mina/trunk/legal/src/main/resources/notices.xml > mina/trunk/parent/ > mina/trunk/parent/pom.xml > Modified: > mina/trunk/core/pom.xml > mina/trunk/example/pom.xml > mina/trunk/filter-codec-netty/pom.xml > mina/trunk/filter-compression/LICENSE.jzlib.txt > mina/trunk/filter-compression/pom.xml > mina/trunk/integration-beans/pom.xml > mina/trunk/integration-jmx/pom.xml > mina/trunk/integration-ognl/pom.xml > mina/trunk/integration-xbean/pom.xml > mina/trunk/pom.xml > mina/trunk/release.xml > mina/trunk/statemachine/pom.xml > mina/trunk/transport-apr/pom.xml > > Modified: mina/trunk/core/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/core/pom.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/core/pom.xml (original) > +++ mina/trunk/core/pom.xml Mon Mar 30 17:10:38 2009 > @@ -23,7 +23,7 @@ > <modelVersion>4.0.0</modelVersion> > <parent> > <groupId>org.apache.mina</groupId> > - <artifactId>build</artifactId> > + <artifactId>mina-parent</artifactId> > <version>2.0.0-RC1-SNAPSHOT</version> > </parent> > <artifactId>mina-core</artifactId> > > Modified: mina/trunk/example/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/example/pom.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/example/pom.xml (original) > +++ mina/trunk/example/pom.xml Mon Mar 30 17:10:38 2009 > @@ -20,7 +20,7 @@ > <modelVersion>4.0.0</modelVersion> > <parent> > <groupId>org.apache.mina</groupId> > - <artifactId>build</artifactId> > + <artifactId>mina-parent</artifactId> > <version>2.0.0-RC1-SNAPSHOT</version> > </parent> > <artifactId>mina-example</artifactId> > @@ -47,6 +47,7 @@ > <groupId>jmock</groupId> > <artifactId>jmock</artifactId> > <version>1.2.0</version> > + <scope>test</scope> > </dependency> > </dependencies> > </project> > > Modified: mina/trunk/filter-codec-netty/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/filter-codec-netty/pom.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/filter-codec-netty/pom.xml (original) > +++ mina/trunk/filter-codec-netty/pom.xml Mon Mar 30 17:10:38 2009 > @@ -23,7 +23,7 @@ > <modelVersion>4.0.0</modelVersion> > <parent> > <groupId>org.apache.mina</groupId> > - <artifactId>build</artifactId> > + <artifactId>mina-parent</artifactId> > <version>2.0.0-RC1-SNAPSHOT</version> > </parent> > <artifactId>mina-filter-codec-netty</artifactId> > > Modified: mina/trunk/filter-compression/LICENSE.jzlib.txt > URL: > http://svn.apache.org/viewvc/mina/trunk/filter-compression/LICENSE.jzlib.txt?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/filter-compression/LICENSE.jzlib.txt (original) > +++ mina/trunk/filter-compression/LICENSE.jzlib.txt Mon Mar 30 17:10:38 2009 > @@ -1,29 +0,0 @@ > -JZlib 0.0.* were released under the GNU LGPL license. Later, we have > switched > -over to a BSD-style license. > - > ------------------------------------------------------------------------------- > -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. > - > -Redistribution and use in source and binary forms, with or without > -modification, are permitted provided that the following conditions are met: > - > - 1. Redistributions of source code must retain the above copyright notice, > - this list of conditions and the following disclaimer. > - > - 2. Redistributions in binary form must reproduce the above copyright > - notice, this list of conditions and the following disclaimer in > - the documentation and/or other materials provided with the distribution. > - > - 3. The names of the authors may not be used to endorse or promote products > - derived from this software without specific prior written permission. > - > -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, > -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND > -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, > -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, > -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, > -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, > -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > Modified: mina/trunk/filter-compression/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/filter-compression/pom.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/filter-compression/pom.xml (original) > +++ mina/trunk/filter-compression/pom.xml Mon Mar 30 17:10:38 2009 > @@ -23,7 +23,7 @@ > <modelVersion>4.0.0</modelVersion> > <parent> > <groupId>org.apache.mina</groupId> > - <artifactId>build</artifactId> > + <artifactId>mina-parent</artifactId> > <version>2.0.0-RC1-SNAPSHOT</version> > </parent> > <artifactId>mina-filter-compression</artifactId> > > Modified: mina/trunk/integration-beans/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/integration-beans/pom.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/integration-beans/pom.xml (original) > +++ mina/trunk/integration-beans/pom.xml Mon Mar 30 17:10:38 2009 > @@ -23,7 +23,7 @@ > <modelVersion>4.0.0</modelVersion> > <parent> > <groupId>org.apache.mina</groupId> > - <artifactId>build</artifactId> > + <artifactId>mina-parent</artifactId> > <version>2.0.0-RC1-SNAPSHOT</version> > </parent> > <artifactId>mina-integration-beans</artifactId> > > Modified: mina/trunk/integration-jmx/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/integration-jmx/pom.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/integration-jmx/pom.xml (original) > +++ mina/trunk/integration-jmx/pom.xml Mon Mar 30 17:10:38 2009 > @@ -23,7 +23,7 @@ > <modelVersion>4.0.0</modelVersion> > <parent> > <groupId>org.apache.mina</groupId> > - <artifactId>build</artifactId> > + <artifactId>mina-parent</artifactId> > <version>2.0.0-RC1-SNAPSHOT</version> > </parent> > <artifactId>mina-integration-jmx</artifactId> > > Modified: mina/trunk/integration-ognl/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/integration-ognl/pom.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/integration-ognl/pom.xml (original) > +++ mina/trunk/integration-ognl/pom.xml Mon Mar 30 17:10:38 2009 > @@ -23,7 +23,7 @@ > <modelVersion>4.0.0</modelVersion> > <parent> > <groupId>org.apache.mina</groupId> > - <artifactId>build</artifactId> > + <artifactId>mina-parent</artifactId> > <version>2.0.0-RC1-SNAPSHOT</version> > </parent> > <artifactId>mina-integration-ognl</artifactId> > > Modified: mina/trunk/integration-xbean/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/integration-xbean/pom.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/integration-xbean/pom.xml (original) > +++ mina/trunk/integration-xbean/pom.xml Mon Mar 30 17:10:38 2009 > @@ -22,8 +22,8 @@ > <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/maven-v4_0_0.xsd";> > > <parent> > - <artifactId>build</artifactId> > <groupId>org.apache.mina</groupId> > + <artifactId>mina-parent</artifactId> > <version>2.0.0-RC1-SNAPSHOT</version> > </parent> > <modelVersion>4.0.0</modelVersion> > > Added: mina/trunk/legal/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/legal/pom.xml?rev=760049&view=auto > ============================================================================== > --- mina/trunk/legal/pom.xml (added) > +++ mina/trunk/legal/pom.xml Mon Mar 30 17:10:38 2009 > @@ -0,0 +1,81 @@ > +<!-- > + 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/maven-v4_0_0.xsd";> > + <modelVersion>4.0.0</modelVersion> > + <parent> > + <groupId>org.apache.mina</groupId> > + <artifactId>build</artifactId> > + <version>2.0.0-RC1-SNAPSHOT</version> > + </parent> > + > + <groupId>org.apache.mina</groupId> > + <artifactId>mina-legal</artifactId> > + <name>Apache MINA Legal</name> > + <url>http://mina.apache.org</url> > + <packaging>jar</packaging> > + > + > + <properties> > + <maven.test.skip>true</maven.test.skip> > + </properties> > + > + <dependencies> > + <dependency> > + <groupId>jdom</groupId> > + <artifactId>jdom</artifactId> > + <version>1.0</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.codehaus.plexus</groupId> > + <artifactId>plexus-utils</artifactId> > + <version>1.4.4</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.apache.maven</groupId> > + <artifactId>maven-plugin-api</artifactId> > + <version>2.0.7</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.apache.maven</groupId> > + <artifactId>maven-model</artifactId> > + <version>2.0.7</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.apache.maven</groupId> > + <artifactId>maven-project</artifactId> > + <version>2.0.7</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-shade-plugin</artifactId> > + <version>1.1</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>pmd</groupId> > + <artifactId>pmd</artifactId> > + <version>4.2</version> > + </dependency> > + </dependencies> > +</project> > > Added: mina/trunk/legal/src/main/resources/notices.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/legal/src/main/resources/notices.xml?rev=760049&view=auto > ============================================================================== > --- mina/trunk/legal/src/main/resources/notices.xml (added) > +++ mina/trunk/legal/src/main/resources/notices.xml Mon Mar 30 17:10:38 2009 > @@ -0,0 +1,88 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<supplementalDataModels> > + <supplement> > + <project> > + <groupId>ognl</groupId> > + <artifactId>ognl</artifactId> > + <name>OGNL :: Object-Graph Notation Language</name> > + <organization> > + <name>The OpenSymphony Group</name> > + <url>http://www.opensymphony.com</url> > + </organization> > + <licenses> > + <license> > + <name>The OpenSymphony Software License, Version 1.1</name> > + <url>http://www.opensymphony.com/ognl/license.action</url> > + </license> > + </licenses> > + </project> > + </supplement> > + <supplement> > + <project> > + <groupId>org.slf4j</groupId> > + <artifactId>slf4j-api</artifactId> > + <name>SLF4J API Module</name> > + <organization> > + <name>QOS.ch</name> > + <url>http://www.qos.ch</url> > + </organization> > + <licenses> > + <license> > + <name>MIT style</name> > + <url>http://www.slf4j.org/license.html</url> > + </license> > + </licenses> > + </project> > + </supplement> > + <supplement> > + <project> > + <groupId>org.slf4j</groupId> > + <artifactId>slf4j-jdk14</artifactId> > + <name>SLF4J JDK14 Binding</name> > + <organization> > + <name>QOS.ch</name> > + <url>http://www.qos.ch</url> > + </organization> > + <licenses> > + <license> > + <name>MIT style</name> > + <url>http://www.slf4j.org/license.html</url> > + </license> > + </licenses> > + </project> > + </supplement> > + <supplement> > + <project> > + <groupId>org.slf4j</groupId> > + <artifactId>jcl-over-slf4j</artifactId> > + <name>SLF4J JDK14 Binding</name> > + <organization> > + <name>QOS.ch</name> > + <url>http://www.qos.ch</url> > + </organization> > + <licenses> > + <license> > + <name>MIT style</name> > + <url>http://www.slf4j.org/license.html</url> > + </license> > + </licenses> > + </project> > + </supplement> > + <supplement> > + <project> > + <groupId>org.slf4j</groupId> > + <artifactId>slf4j-log4j12</artifactId> > + <name>SLF4J JDK14 Binding</name> > + <organization> > + <name>QOS.ch</name> > + <url>http://www.qos.ch</url> > + </organization> > + <licenses> > + <license> > + <name>MIT style</name> > + <url>http://www.slf4j.org/license.html</url> > + </license> > + </licenses> > + </project> > + </supplement> > +</supplementalDataModels> > > Added: mina/trunk/parent/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/parent/pom.xml?rev=760049&view=auto > ============================================================================== > --- mina/trunk/parent/pom.xml (added) > +++ mina/trunk/parent/pom.xml Mon Mar 30 17:10:38 2009 > @@ -0,0 +1,298 @@ > +<!-- > + 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/maven-v4_0_0.xsd";> > + <modelVersion>4.0.0</modelVersion> > + <parent> > + <groupId>org.apache.mina</groupId> > + <artifactId>build</artifactId> > + <version>2.0.0-RC1-SNAPSHOT</version> > + </parent> > + > + <groupId>org.apache.mina</groupId> > + <artifactId>mina-parent</artifactId> > + <name>Apache MINA Parent POM</name> > + <url>http://mina.apache.org</url> > + <packaging>pom</packaging> > + > + <properties> > + <symbolicName>${exportedPackage}</symbolicName> > + </properties> > + > + <dependencyManagement> > + <dependencies> > + <!-- Submodules --> > + <dependency> > + <groupId>${groupId}</groupId> > + <artifactId>mina-core</artifactId> > + <version>${pom.version}</version> > + </dependency> > + > + <dependency> > + <groupId>${groupId}</groupId> > + <artifactId>mina-transport-apr</artifactId> > + <version>${pom.version}</version> > + </dependency> > + > + <dependency> > + <groupId>${groupId}</groupId> > + <artifactId>mina-filter-compression</artifactId> > + <version>${pom.version}</version> > + </dependency> > + > + <dependency> > + <groupId>${groupId}</groupId> > + <artifactId>mina-filter-codec-netty</artifactId> > + <version>${pom.version}</version> > + </dependency> > + > + <dependency> > + <groupId>${groupId}</groupId> > + <artifactId>mina-integration-beans</artifactId> > + <version>${pom.version}</version> > + </dependency> > + > + <dependency> > + <groupId>${groupId}</groupId> > + <artifactId>mina-integration-ognl</artifactId> > + <version>${pom.version}</version> > + </dependency> > + > + <dependency> > + <groupId>${groupId}</groupId> > + <artifactId>mina-integration-jmx</artifactId> > + <version>${pom.version}</version> > + </dependency> > + > + <dependency> > + <groupId>${groupId}</groupId> > + <artifactId>mina-statemachine</artifactId> > + <version>${pom.version}</version> > + </dependency> > + > + <!-- Transport --> > + <dependency> > + <groupId>tomcat</groupId> > + <artifactId>tomcat-apr</artifactId> > + <version>5.5.23</version> > + </dependency> > + > + <!-- Filter --> > + <dependency> > + <groupId>com.jcraft</groupId> > + <artifactId>jzlib</artifactId> > + <version>1.0.7</version> > + </dependency> > + > + <!-- Integration --> > + <dependency> > + <groupId>net.gleamynode</groupId> > + <artifactId>netty2</artifactId> > + <version>1.9.2</version> > + </dependency> > + > + <dependency> > + <groupId>org.apache.xbean</groupId> > + <artifactId>xbean-spring</artifactId> > + <version>3.4.3</version> > + </dependency> > + > + <dependency> > + <groupId>org.springframework</groupId> > + <artifactId>spring</artifactId> > + <version>2.5.5</version> > + <exclusions> > + <exclusion> > + <groupId>commons-logging</groupId> > + <artifactId>commons-logging</artifactId> > + </exclusion> > + <exclusion> > + <groupId>commons-logging</groupId> > + <artifactId>commons-logging-api</artifactId> > + </exclusion> > + <exclusion> > + <groupId>javax.servlet</groupId> > + <artifactId>servlet-api</artifactId> > + </exclusion> > + </exclusions> > + </dependency> > + > + <dependency> > + <groupId>ognl</groupId> > + <artifactId>ognl</artifactId> > + <version>2.7.2</version> > + </dependency> > + > + <dependency> > + <groupId>jboss</groupId> > + <artifactId>javassist</artifactId> > + <version>3.7.ga</version> > + </dependency> > + > + <!-- State Machine --> > + <dependency> > + <groupId>commons-lang</groupId> > + <artifactId>commons-lang</artifactId> > + <version>2.4</version> > + </dependency> > + > + <!-- Logging --> > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>slf4j-api</artifactId> > + <version>1.5.2</version> > + </dependency> > + > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>jcl-over-slf4j</artifactId> > + <version>1.5.2</version> > + </dependency> > + > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>slf4j-log4j12</artifactId> > + <version>1.5.2</version> > + </dependency> > + > + <dependency> > + <groupId>log4j</groupId> > + <artifactId>log4j</artifactId> > + <version>1.2.14</version> > + </dependency> > + > + <!-- Testing --> > + <dependency> > + <groupId>junit</groupId> > + <artifactId>junit</artifactId> > + <version>4.4</version> > + <scope>test</scope> > + </dependency> > + > + <dependency> > + <groupId>org.easymock</groupId> > + <artifactId>easymock</artifactId> > + <version>2.3</version> > + <scope>test</scope> > + </dependency> > + > + <dependency> > + <groupId>org.easymock</groupId> > + <artifactId>easymockclassextension</artifactId> > + <version>2.3</version> > + <scope>test</scope> > + </dependency> > + > + <dependency> > + <groupId>com.agical.rmock</groupId> > + <artifactId>rmock</artifactId> > + <version>2.0.0</version> > + <scope>test</scope> > + </dependency> > + </dependencies> > + </dependencyManagement> > + > + <dependencies> > + <!-- Logging --> > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>slf4j-api</artifactId> > + <scope>compile</scope> > + </dependency> > + > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>jcl-over-slf4j</artifactId> > + <scope>test</scope> > + </dependency> > + > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>slf4j-log4j12</artifactId> > + <scope>test</scope> > + </dependency> > + > + <dependency> > + <groupId>log4j</groupId> > + <artifactId>log4j</artifactId> > + <scope>test</scope> > + </dependency> > + > + <!-- Testing --> > + <dependency> > + <groupId>junit</groupId> > + <artifactId>junit</artifactId> > + <scope>test</scope> > + </dependency> > + > + <dependency> > + <groupId>org.easymock</groupId> > + <artifactId>easymock</artifactId> > + <scope>test</scope> > + </dependency> > + > + <dependency> > + <groupId>org.easymock</groupId> > + <artifactId>easymockclassextension</artifactId> > + <scope>test</scope> > + </dependency> > + > + <dependency> > + <groupId>com.agical.rmock</groupId> > + <artifactId>rmock</artifactId> > + <scope>test</scope> > + </dependency> > + </dependencies> > + > + <build> > + <plugins> > + <plugin> > + <artifactId>maven-remote-resources-plugin</artifactId> > + <version>1.0</version> > + <dependencies> > + <dependency> > + <groupId>org.apache.mina</groupId> > + <artifactId>mina-legal</artifactId> > + <version>${pom.version}</version> > + </dependency> > + </dependencies> > + <executions> > + <execution> > + <goals> > + <goal>process</goal> > + </goals> > + <configuration> > + <resourceBundles> > + > <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle> > + </resourceBundles> > + <supplementalModels> > + > <supplementalModel>notices.xml</supplementalModel> > + </supplementalModels> > + <properties> > + <projectName>Apache MINA</projectName> > + <addLicense>true</addLicense> > + <addArtifact>true</addArtifact> > + </properties> > + </configuration> > + </execution> > + </executions> > + </plugin> > + </plugins> > + </build> > + > +</project> > > Modified: mina/trunk/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/pom.xml (original) > +++ mina/trunk/pom.xml Mon Mar 30 17:10:38 2009 > @@ -33,7 +33,7 @@ > <groupId>org.apache.mina</groupId> > <version>2.0.0-RC1-SNAPSHOT</version> > <artifactId>build</artifactId> > - <name>Apache MINA Parent POM</name> > + <name>Apache MINA</name> > <packaging>pom</packaging> > > <url>http://mina.apache.org/</url> > @@ -76,244 +76,10 @@ > </license> > </licenses> > > - <properties> > - <symbolicName>${exportedPackage}</symbolicName> > - </properties> > - > - <dependencyManagement> > - <dependencies> > - <!-- Submodules --> > - <dependency> > - <groupId>${groupId}</groupId> > - <artifactId>mina-core</artifactId> > - <version>${pom.version}</version> > - </dependency> > - > - <!-- > - <dependency> > - <groupId>${groupId}</groupId> > - <artifactId>mina-transport-serial</artifactId> > - <version>${pom.version}</version> > - </dependency> > - --> > - > - <dependency> > - <groupId>${groupId}</groupId> > - <artifactId>mina-transport-apr</artifactId> > - <version>${pom.version}</version> > - </dependency> > - > - <dependency> > - <groupId>${groupId}</groupId> > - <artifactId>mina-filter-compression</artifactId> > - <version>${pom.version}</version> > - </dependency> > - > - <dependency> > - <groupId>${groupId}</groupId> > - <artifactId>mina-filter-codec-netty</artifactId> > - <version>${pom.version}</version> > - </dependency> > - > - <dependency> > - <groupId>${groupId}</groupId> > - <artifactId>mina-integration-beans</artifactId> > - <version>${pom.version}</version> > - </dependency> > - > - <dependency> > - <groupId>${groupId}</groupId> > - <artifactId>mina-integration-ognl</artifactId> > - <version>${pom.version}</version> > - </dependency> > - > - <dependency> > - <groupId>${groupId}</groupId> > - <artifactId>mina-integration-jmx</artifactId> > - <version>${pom.version}</version> > - </dependency> > - > - <dependency> > - <groupId>${groupId}</groupId> > - <artifactId>mina-statemachine</artifactId> > - <version>${pom.version}</version> > - </dependency> > - > - <!-- Transport --> > - <dependency> > - <groupId>tomcat</groupId> > - <artifactId>tomcat-apr</artifactId> > - <version>5.5.23</version> > - </dependency> > - > - <!-- Filter --> > - <dependency> > - <groupId>com.jcraft</groupId> > - <artifactId>jzlib</artifactId> > - <version>1.0.7</version> > - </dependency> > - > - <!-- Integration --> > - <dependency> > - <groupId>net.gleamynode</groupId> > - <artifactId>netty2</artifactId> > - <version>1.9.2</version> > - </dependency> > - > - <dependency> > - <groupId>org.apache.xbean</groupId> > - <artifactId>xbean-spring</artifactId> > - <version>3.4.3</version> > - </dependency> > - > - <dependency> > - <groupId>org.springframework</groupId> > - <artifactId>spring</artifactId> > - <version>2.5.5</version> > - <exclusions> > - <exclusion> > - <groupId>commons-logging</groupId> > - <artifactId>commons-logging</artifactId> > - </exclusion> > - <exclusion> > - <groupId>commons-logging</groupId> > - <artifactId>commons-logging-api</artifactId> > - </exclusion> > - <exclusion> > - <groupId>javax.servlet</groupId> > - <artifactId>servlet-api</artifactId> > - </exclusion> > - </exclusions> > - </dependency> > - > - <dependency> > - <groupId>ognl</groupId> > - <artifactId>ognl</artifactId> > - <version>2.7.2</version> > - </dependency> > - > - <dependency> > - <groupId>jboss</groupId> > - <artifactId>javassist</artifactId> > - <version>3.7.ga</version> > - </dependency> > - > - <!-- State Machine --> > - <dependency> > - <groupId>commons-lang</groupId> > - <artifactId>commons-lang</artifactId> > - <version>2.4</version> > - </dependency> > - > - <!-- Logging --> > - <dependency> > - <groupId>org.slf4j</groupId> > - <artifactId>slf4j-api</artifactId> > - <version>1.5.2</version> > - </dependency> > - > - <dependency> > - <groupId>org.slf4j</groupId> > - <artifactId>jcl-over-slf4j</artifactId> > - <version>1.5.2</version> > - </dependency> > - > - <dependency> > - <groupId>org.slf4j</groupId> > - <artifactId>slf4j-log4j12</artifactId> > - <version>1.5.2</version> > - </dependency> > - > - <dependency> > - <groupId>log4j</groupId> > - <artifactId>log4j</artifactId> > - <version>1.2.14</version> > - </dependency> > - > - <!-- Testing --> > - <dependency> > - <groupId>junit</groupId> > - <artifactId>junit</artifactId> > - <version>4.4</version> > - <scope>test</scope> > - </dependency> > - > - <dependency> > - <groupId>org.easymock</groupId> > - <artifactId>easymock</artifactId> > - <version>2.3</version> > - <scope>test</scope> > - </dependency> > - > - <dependency> > - <groupId>org.easymock</groupId> > - <artifactId>easymockclassextension</artifactId> > - <version>2.3</version> > - <scope>test</scope> > - </dependency> > - > - <dependency> > - <groupId>com.agical.rmock</groupId> > - <artifactId>rmock</artifactId> > - <version>2.0.0</version> > - <scope>test</scope> > - </dependency> > - </dependencies> > - </dependencyManagement> > - > - <dependencies> > - <!-- Logging --> > - <dependency> > - <groupId>org.slf4j</groupId> > - <artifactId>slf4j-api</artifactId> > - <scope>compile</scope> > - </dependency> > - > - <dependency> > - <groupId>org.slf4j</groupId> > - <artifactId>jcl-over-slf4j</artifactId> > - <scope>test</scope> > - </dependency> > - > - <dependency> > - <groupId>org.slf4j</groupId> > - <artifactId>slf4j-log4j12</artifactId> > - <scope>test</scope> > - </dependency> > - > - <dependency> > - <groupId>log4j</groupId> > - <artifactId>log4j</artifactId> > - <scope>test</scope> > - </dependency> > - > - <!-- Testing --> > - <dependency> > - <groupId>junit</groupId> > - <artifactId>junit</artifactId> > - <scope>test</scope> > - </dependency> > - > - <dependency> > - <groupId>org.easymock</groupId> > - <artifactId>easymock</artifactId> > - <scope>test</scope> > - </dependency> > - > - <dependency> > - <groupId>org.easymock</groupId> > - <artifactId>easymockclassextension</artifactId> > - <scope>test</scope> > - </dependency> > - > - <dependency> > - <groupId>com.agical.rmock</groupId> > - <artifactId>rmock</artifactId> > - <scope>test</scope> > - </dependency> > - </dependencies> > > <modules> > + <module>legal</module> > + <module>parent</module> > <module>core</module> > <module>transport-apr</module> > <module>filter-compression</module> > @@ -420,55 +186,6 @@ > </instructions> > </configuration> > </plugin> > - > - <plugin> > - <artifactId>maven-antrun-plugin</artifactId> > - <version>1.1</version> > - <executions> > - <execution> > - <id>add-license</id> > - <phase>package</phase> > - <configuration> > - <tasks> > - <taskdef resource="net/sf/antcontrib/antlib.xml" /> > - <if> > - <or> > - <equals arg1="${project.packaging}" arg2="jar" /> > - <equals arg1="${project.packaging}" arg2="bundle" /> > - </or> > - <then> > - <move > file="${project.build.directory}/${project.build.finalName}.jar" > tofile="${project.build.directory}/${project.build.finalName}.orig.jar" /> > - <zip > destfile="${project.build.directory}/${project.build.finalName}.jar"> > - <zipfileset dir="${basedir}/.." prefix="META-INF/"> > - <include name="LICENSE.*" /> > - <include name="NOTICE.*" /> > - </zipfileset> > - <zipfileset > src="${project.build.directory}/${project.build.finalName}.orig.jar" > filemode="644" dirmode="755" /> > - </zip> > - <jar > destfile="${project.build.directory}/${project.build.finalName}-sources.jar" > update="true"> > - <zipfileset dir="${basedir}/.." prefix="META-INF/"> > - <include name="LICENSE.*" /> > - <include name="NOTICE.*" /> > - </zipfileset> > - </jar> > - <delete > file="${project.build.directory}/${project.build.finalName}.orig.jar" /> > - </then> > - </if> > - </tasks> > - </configuration> > - <goals> > - <goal>run</goal> > - </goals> > - </execution> > - </executions> > - <dependencies> > - <dependency> > - <groupId>ant-contrib</groupId> > - <artifactId>ant-contrib</artifactId> > - <version>1.0b2</version> > - </dependency> > - </dependencies> > - </plugin> > </plugins> > </build> > > > Modified: mina/trunk/release.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/release.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/release.xml (original) > +++ mina/trunk/release.xml Mon Mar 30 17:10:38 2009 > @@ -47,6 +47,9 @@ > <moduleSets> > <moduleSet> > <includeSubModules/> > + <excludes> > + <exclude>org.apache.mina:mina-legal</exclude> > + </excludes> > <sources> > > <outputDirectoryMapping>src/${module.artifactId}</outputDirectoryMapping> > <fileSets> > > Modified: mina/trunk/statemachine/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/statemachine/pom.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/statemachine/pom.xml (original) > +++ mina/trunk/statemachine/pom.xml Mon Mar 30 17:10:38 2009 > @@ -23,7 +23,7 @@ > <modelVersion>4.0.0</modelVersion> > <parent> > <groupId>org.apache.mina</groupId> > - <artifactId>build</artifactId> > + <artifactId>mina-parent</artifactId> > <version>2.0.0-RC1-SNAPSHOT</version> > </parent> > <artifactId>mina-statemachine</artifactId> > > Modified: mina/trunk/transport-apr/pom.xml > URL: > http://svn.apache.org/viewvc/mina/trunk/transport-apr/pom.xml?rev=760049&r1=760048&r2=760049&view=diff > ============================================================================== > --- mina/trunk/transport-apr/pom.xml (original) > +++ mina/trunk/transport-apr/pom.xml Mon Mar 30 17:10:38 2009 > @@ -21,7 +21,7 @@ > <modelVersion>4.0.0</modelVersion> > <parent> > <groupId>org.apache.mina</groupId> > - <artifactId>build</artifactId> > + <artifactId>mina-parent</artifactId> > <version>2.0.0-RC1-SNAPSHOT</version> > </parent> > <artifactId>mina-transport-apr</artifactId> > > >
