You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jv...@apache.org on 2013/07/24 22:32:24 UTC
git commit: DIRMINA-919 package artifacts as jar, not bundle
Updated Branches:
refs/heads/trunk 363f108c1 -> 765883b71
DIRMINA-919 package artifacts as jar, not bundle
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/765883b7
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/765883b7
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/765883b7
Branch: refs/heads/trunk
Commit: 765883b71771d90d323a78adb245a2dcf141172c
Parents: 363f108
Author: jvermillard <jv...@apache.org>
Authored: Wed Jul 24 22:16:25 2013 +0200
Committer: jvermillard <jv...@apache.org>
Committed: Wed Jul 24 22:26:20 2013 +0200
----------------------------------------------------------------------
benchmarks/pom.xml | 9 ++++-----
benchmarks2/pom.xml | 9 ++++-----
coap/pom.xml | 10 ++++------
codec/pom.xml | 2 +-
core/pom.xml | 3 +--
examples/pom.xml | 9 ++++-----
http/pom.xml | 7 +++----
pom.xml | 18 ++++++++----------
protobuf/pom.xml | 5 ++---
thrift/pom.xml | 9 ++++-----
10 files changed, 35 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/765883b7/benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index b8c7df1..8de019f 100755
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -8,9 +8,9 @@
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
@@ -30,18 +30,17 @@
<artifactId>mina-benchmarks</artifactId>
<groupId>org.apache.mina</groupId>
<name>Apache MINA Benchmarks tests</name>
-
+
<properties>
<!-- defined in order to run against a different MINA version -->
<mina.version>${project.version}</mina.version>
<netty3.version>3.6.6.Final</netty3.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-core</artifactId>
- <type>bundle</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/mina/blob/765883b7/benchmarks2/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks2/pom.xml b/benchmarks2/pom.xml
index 292e957..8936de0 100755
--- a/benchmarks2/pom.xml
+++ b/benchmarks2/pom.xml
@@ -8,9 +8,9 @@
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
@@ -30,18 +30,17 @@
<artifactId>mina-benchmarks2</artifactId>
<groupId>org.apache.mina</groupId>
<name>Apache MINA Benchmarks tests for Netty4</name>
-
+
<properties>
<!-- defined in order to run against a different MINA version -->
<mina.version>${project.version}</mina.version>
<netty.version>4.0.4.Final</netty.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-core</artifactId>
- <type>bundle</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/mina/blob/765883b7/coap/pom.xml
----------------------------------------------------------------------
diff --git a/coap/pom.xml b/coap/pom.xml
index bc39cea..a2cd5ea 100644
--- a/coap/pom.xml
+++ b/coap/pom.xml
@@ -8,9 +8,9 @@
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
@@ -41,15 +41,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-core</artifactId>
- <type>bundle</type>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-codec</artifactId>
- <type>bundle</type>
</dependency>
-
+
<dependency>
<groupId>org.apache.logging.log4j.adapters</groupId>
<artifactId>slf4j-impl</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/765883b7/codec/pom.xml
----------------------------------------------------------------------
diff --git a/codec/pom.xml b/codec/pom.xml
index 3eead83..5c6d58b 100644
--- a/codec/pom.xml
+++ b/codec/pom.xml
@@ -28,7 +28,7 @@
<artifactId>mina-codec</artifactId>
<name>Apache MINA Codec ${project.version}</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<symbolicName>${project.groupId}.codec</symbolicName>
http://git-wip-us.apache.org/repos/asf/mina/blob/765883b7/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 060e4fc..3dac326 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@
<artifactId>mina-core</artifactId>
<name>Apache MINA Core ${project.version}</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<symbolicName>${project.groupId}.core</symbolicName>
@@ -48,7 +48,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-codec</artifactId>
- <type>bundle</type>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/mina/blob/765883b7/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 9d98934..1080d01 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -8,9 +8,9 @@
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
@@ -41,9 +41,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-core</artifactId>
- <type>bundle</type>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-http</artifactId>
@@ -61,7 +60,7 @@
<artifactId>slf4j-impl</artifactId>
<scope>runtime</scope>
</dependency>
-
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/mina/blob/765883b7/http/pom.xml
----------------------------------------------------------------------
diff --git a/http/pom.xml b/http/pom.xml
index 19e2d04..7485de3 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -8,9 +8,9 @@
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
@@ -29,7 +29,7 @@
<artifactId>mina-http</artifactId>
<name>Apache MINA HTTP ${project.version}</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<description>Low level HTTP codec for building simple & fast HTTP server and clients</description>
<properties>
@@ -41,7 +41,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-core</artifactId>
- <type>bundle</type>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/mina/blob/765883b7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5f94a3a..3bbdbd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,9 +8,9 @@
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
@@ -73,9 +73,9 @@
</ciManagement>
<description>
- Apache MINA is a network application framework which helps users
- develop high performance and highly scalable network applications easily.
- It provides an abstract event-driven asynchronous API over various
+ Apache MINA is a network application framework which helps users
+ develop high performance and highly scalable network applications easily.
+ It provides an abstract event-driven asynchronous API over various
transports such as TCP/IP and UDP/IP via Java NIO.
</description>
@@ -126,14 +126,12 @@
<groupId>${project.groupId}</groupId>
<artifactId>mina-core</artifactId>
<version>${project.version}</version>
- <type>bundle</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-codec</artifactId>
<version>${project.version}</version>
- <type>bundle</type>
</dependency>
<dependency>
@@ -524,7 +522,7 @@
<showDeprecations>true</showDeprecations>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -695,7 +693,7 @@
<configuration>
<aggregate>true</aggregate>
</configuration>
-
+
<executions>
<execution>
<phase>install</phase>
@@ -709,7 +707,7 @@
</plugin>
</plugins>
</build>
-
+
<modules>
<module>distribution</module>
</modules>
http://git-wip-us.apache.org/repos/asf/mina/blob/765883b7/protobuf/pom.xml
----------------------------------------------------------------------
diff --git a/protobuf/pom.xml b/protobuf/pom.xml
index b58165f..943efee 100644
--- a/protobuf/pom.xml
+++ b/protobuf/pom.xml
@@ -28,7 +28,7 @@
<artifactId>mina-protobuf</artifactId>
<name>Apache MINA Serialization::Protobuf ${project.version}</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<symbolicName>${project.groupId}.protobuf</symbolicName>
@@ -52,9 +52,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-codec</artifactId>
- <type>bundle</type>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-codec</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/765883b7/thrift/pom.xml
----------------------------------------------------------------------
diff --git a/thrift/pom.xml b/thrift/pom.xml
index a424384..aadff44 100644
--- a/thrift/pom.xml
+++ b/thrift/pom.xml
@@ -29,8 +29,8 @@
<artifactId>mina-thrift</artifactId>
<name>Apache MINA Serialization::Thrift ${project.version}</name>
- <packaging>bundle</packaging>
-
+ <packaging>jar</packaging>
+
<properties>
<symbolicName>${project.groupId}.thrift</symbolicName>
<exportedPackage>${project.groupId}</exportedPackage>
@@ -49,13 +49,12 @@
<artifactId>slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-codec</artifactId>
- <type>bundle</type>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mina-codec</artifactId>