Author: elecharny Date: Mon May 31 14:31:41 2010 New Revision: 949755 URL: http://svn.apache.org/viewvc?rev=949755&view=rev Log: fixed dependencies so that they point to bundle. Updated the maven release plugin version
Modified: mina/trunk/example/pom.xml 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/parent/pom.xml mina/trunk/pom.xml mina/trunk/statemachine/pom.xml mina/trunk/transport-apr/pom.xml mina/trunk/transport-serial/pom.xml Modified: mina/trunk/example/pom.xml URL: http://svn.apache.org/viewvc/mina/trunk/example/pom.xml?rev=949755&r1=949754&r2=949755&view=diff ============================================================================== --- mina/trunk/example/pom.xml (original) +++ mina/trunk/example/pom.xml Mon May 31 14:31:41 2010 @@ -33,18 +33,29 @@ <groupId>${groupId}</groupId> <artifactId>mina-core</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> + <groupId>${groupId}</groupId> + <artifactId>mina-integration-beans</artifactId> + <version>${version}</version> + <type>bundle</type> + </dependency> + + + <dependency> <groupId>${groupId}</groupId> <artifactId>mina-integration-jmx</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> <groupId>${groupId}</groupId> <artifactId>mina-statemachine</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> Modified: mina/trunk/filter-compression/pom.xml URL: http://svn.apache.org/viewvc/mina/trunk/filter-compression/pom.xml?rev=949755&r1=949754&r2=949755&view=diff ============================================================================== --- mina/trunk/filter-compression/pom.xml (original) +++ mina/trunk/filter-compression/pom.xml Mon May 31 14:31:41 2010 @@ -40,6 +40,7 @@ <groupId>${groupId}</groupId> <artifactId>mina-core</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> Modified: mina/trunk/integration-beans/pom.xml URL: http://svn.apache.org/viewvc/mina/trunk/integration-beans/pom.xml?rev=949755&r1=949754&r2=949755&view=diff ============================================================================== --- mina/trunk/integration-beans/pom.xml (original) +++ mina/trunk/integration-beans/pom.xml Mon May 31 14:31:41 2010 @@ -40,6 +40,7 @@ <groupId>${groupId}</groupId> <artifactId>mina-core</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> </dependencies> </project> Modified: mina/trunk/integration-jmx/pom.xml URL: http://svn.apache.org/viewvc/mina/trunk/integration-jmx/pom.xml?rev=949755&r1=949754&r2=949755&view=diff ============================================================================== --- mina/trunk/integration-jmx/pom.xml (original) +++ mina/trunk/integration-jmx/pom.xml Mon May 31 14:31:41 2010 @@ -40,18 +40,27 @@ <groupId>${groupId}</groupId> <artifactId>mina-core</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> <groupId>${groupId}</groupId> <artifactId>mina-integration-beans</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> <groupId>${groupId}</groupId> <artifactId>mina-integration-ognl</artifactId> <version>${version}</version> + <type>bundle</type> + </dependency> + + <dependency> + <groupId>ognl</groupId> + <artifactId>ognl</artifactId> + <version>${version.ognl}</version> </dependency> </dependencies> </project> Modified: mina/trunk/integration-ognl/pom.xml URL: http://svn.apache.org/viewvc/mina/trunk/integration-ognl/pom.xml?rev=949755&r1=949754&r2=949755&view=diff ============================================================================== --- mina/trunk/integration-ognl/pom.xml (original) +++ mina/trunk/integration-ognl/pom.xml Mon May 31 14:31:41 2010 @@ -40,12 +40,14 @@ <groupId>${groupId}</groupId> <artifactId>mina-core</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> <groupId>${groupId}</groupId> <artifactId>mina-integration-beans</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> Modified: mina/trunk/integration-xbean/pom.xml URL: http://svn.apache.org/viewvc/mina/trunk/integration-xbean/pom.xml?rev=949755&r1=949754&r2=949755&view=diff ============================================================================== --- mina/trunk/integration-xbean/pom.xml (original) +++ mina/trunk/integration-xbean/pom.xml Mon May 31 14:31:41 2010 @@ -45,6 +45,7 @@ <groupId>${groupId}</groupId> <artifactId>mina-integration-beans</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> @@ -58,6 +59,7 @@ <groupId>${groupId}</groupId> <artifactId>mina-core</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> Modified: mina/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/mina/trunk/parent/pom.xml?rev=949755&r1=949754&r2=949755&view=diff ============================================================================== --- mina/trunk/parent/pom.xml (original) +++ mina/trunk/parent/pom.xml Mon May 31 14:31:41 2010 @@ -41,42 +41,49 @@ <groupId>${groupId}</groupId> <artifactId>mina-core</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> <groupId>${groupId}</groupId> <artifactId>mina-transport-apr</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> <groupId>${groupId}</groupId> <artifactId>mina-filter-compression</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> <groupId>${groupId}</groupId> <artifactId>mina-integration-beans</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> <groupId>${groupId}</groupId> <artifactId>mina-integration-ognl</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> <groupId>${groupId}</groupId> <artifactId>mina-integration-jmx</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> <groupId>${groupId}</groupId> <artifactId>mina-statemachine</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <!-- Transport --> Modified: mina/trunk/pom.xml URL: http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=949755&r1=949754&r2=949755&view=diff ============================================================================== --- mina/trunk/pom.xml (original) +++ mina/trunk/pom.xml Mon May 31 14:31:41 2010 @@ -89,7 +89,7 @@ <version.javadoc.plugin>2.6.1</version.javadoc.plugin> <version.jxr.plugin>2.1</version.jxr.plugin> <version.rat.maven.plugin>1.0-alpha-3</version.rat.maven.plugin> - <version.release.plugin>2.0-beta-9</version.release.plugin> + <version.release.plugin>2.0</version.release.plugin> <version.remote.resources.plugin>1.1</version.remote.resources.plugin> <version.site.plugin>2.1</version.site.plugin> <version.source.plugin>2.1.1</version.source.plugin> Modified: mina/trunk/statemachine/pom.xml URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/pom.xml?rev=949755&r1=949754&r2=949755&view=diff ============================================================================== --- mina/trunk/statemachine/pom.xml (original) +++ mina/trunk/statemachine/pom.xml Mon May 31 14:31:41 2010 @@ -41,6 +41,7 @@ <artifactId>mina-core</artifactId> <version>${version}</version> <optional>true</optional> + <type>bundle</type> </dependency> <dependency> Modified: mina/trunk/transport-apr/pom.xml URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/pom.xml?rev=949755&r1=949754&r2=949755&view=diff ============================================================================== --- mina/trunk/transport-apr/pom.xml (original) +++ mina/trunk/transport-apr/pom.xml Mon May 31 14:31:41 2010 @@ -38,6 +38,7 @@ <groupId>${groupId}</groupId> <artifactId>mina-core</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> Modified: mina/trunk/transport-serial/pom.xml URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/pom.xml?rev=949755&r1=949754&r2=949755&view=diff ============================================================================== --- mina/trunk/transport-serial/pom.xml (original) +++ mina/trunk/transport-serial/pom.xml Mon May 31 14:31:41 2010 @@ -40,12 +40,14 @@ <groupId>${groupId}</groupId> <artifactId>mina-core</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency> <groupId>${groupId}</groupId> <artifactId>mina-integration-beans</artifactId> <version>${version}</version> + <type>bundle</type> </dependency> <dependency>