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 2014/10/21 10:30:15 UTC
[1/2] git commit: Added META-INF to teh ignored files
Repository: mina
Updated Branches:
refs/heads/2.0 c17923315 -> b6683a86c
Added META-INF to teh ignored files
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/5c48170e
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/5c48170e
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/5c48170e
Branch: refs/heads/2.0
Commit: 5c48170e57e35d0e08b2125112c463d1582de8ff
Parents: c179233
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue Oct 21 07:46:24 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Oct 21 07:46:24 2014 +0200
----------------------------------------------------------------------
.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/5c48170e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ca7d13f..35d796e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@ bin/
*.log
.deployables
.clover
-
+META-INF/
[2/2] git commit: Reverted to 2.0.9,
fix some pom content (separate the maven site generation from the
release profile), explicitely define the bundle generation for mina-core
Posted by el...@apache.org.
Reverted to 2.0.9, fix some pom content (separate the maven site generation from the release profile), explicitely define the bundle generation for mina-core
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/b6683a86
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/b6683a86
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/b6683a86
Branch: refs/heads/2.0
Commit: b6683a86c813580166bc485f9a0845c3332dc31b
Parents: 5c48170
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue Oct 21 10:30:01 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Oct 21 10:30:01 2014 +0200
----------------------------------------------------------------------
distribution/pom.xml | 2 +-
mina-core/pom.xml | 68 +++++++++++++++++-
mina-example/pom.xml | 2 +-
mina-filter-compression/pom.xml | 2 +-
mina-http/pom.xml | 4 +-
mina-integration-beans/pom.xml | 2 +-
mina-integration-jmx/pom.xml | 2 +-
mina-integration-ognl/pom.xml | 2 +-
mina-integration-xbean/pom.xml | 2 +-
mina-legal/pom.xml | 2 +-
mina-statemachine/pom.xml | 2 +-
mina-transport-apr/pom.xml | 2 +-
mina-transport-serial/pom.xml | 2 +-
pom.xml | 129 +++++++++++++++++++++++++++++------
14 files changed, 186 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index ad7abd0..075b391 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>mina-parent</artifactId>
<groupId>org.apache.mina</groupId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-core/pom.xml
----------------------------------------------------------------------
diff --git a/mina-core/pom.xml b/mina-core/pom.xml
index 3ac676e..8f0edcf 100644
--- a/mina-core/pom.xml
+++ b/mina-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>mina-core</artifactId>
@@ -48,5 +48,71 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.core</Bundle-SymbolicName>
+ <Export-Package>
+ org.apache.mina.core;version=${project.version};-noimport:=true,
+ org.apache.mina.core.buffer;version=${project.version};-noimport:=true,
+ org.apache.mina.core.file;version=${project.version};-noimport:=true,
+ org.apache.mina.core.filterchain;version=${project.version};-noimport:=true,
+ org.apache.mina.core.future;version=${project.version};-noimport:=true,
+ org.apache.mina.core.polling;version=${project.version};-noimport:=true,
+ org.apache.mina.core.service;version=${project.version};-noimport:=true,
+ org.apache.mina.core.session;version=${project.version};-noimport:=true,
+ org.apache.mina.core.write;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.buffer;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.codec;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.codec.demux;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.codec.prefixedstring;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.codec.serialization;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.codec.statemachine;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.codec.textline;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.errorgenerating;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.executor;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.firewall;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.keepalive;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.logging;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.ssl;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.statistic;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.stream;version=${project.version};-noimport:=true,
+ org.apache.mina.filter.util;version=${project.version};-noimport:=true,
+ org.apache.mina.handler.chain;version=${project.version};-noimport:=true,
+ org.apache.mina.handler.demux;version=${project.version};-noimport:=true,
+ org.apache.mina.handler.multiton;version=${project.version};-noimport:=true,
+ org.apache.mina.handler.stream;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy.event;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy.filter;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy.handlers;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy.handlers.http;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy.handlers.http.basic;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy.handlers.http.digest;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy.handlers.http.ntlm;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy.handlers.socks;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy.session;version=${project.version};-noimport:=true,
+ org.apache.mina.proxy.utils;version=${project.version};-noimport:=true,
+ org.apache.mina.transport.socket;version=${project.version};-noimport:=true,
+ org.apache.mina.transport.socket.nio;version=${project.version};-noimport:=true,
+ org.apache.mina.transport.vmpipe;version=${project.version};-noimport:=true,
+ org.apache.mina.util;version=${project.version};-noimport:=true,
+ org.apache.mina.util.byteaccess;version=${project.version};-noimport:=true,
+ </Export-Package>
+ <Import-Package>
+ org.slf4j;version=${version.slf4j.api}
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-example/pom.xml
----------------------------------------------------------------------
diff --git a/mina-example/pom.xml b/mina-example/pom.xml
index e6b6b39..c9a4d0b 100644
--- a/mina-example/pom.xml
+++ b/mina-example/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>mina-example</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-filter-compression/pom.xml
----------------------------------------------------------------------
diff --git a/mina-filter-compression/pom.xml b/mina-filter-compression/pom.xml
index 25f8d6f..6a2ef97 100644
--- a/mina-filter-compression/pom.xml
+++ b/mina-filter-compression/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>mina-filter-compression</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-http/pom.xml
----------------------------------------------------------------------
diff --git a/mina-http/pom.xml b/mina-http/pom.xml
index e6914bf..4e75a8e 100644
--- a/mina-http/pom.xml
+++ b/mina-http/pom.xml
@@ -24,12 +24,10 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>mina-http</artifactId>
- <groupId>org.apache.mina</groupId>
- <version>2.0.10-SNAPSHOT</version>
<name>Apache MINA HTTP client and server codec</name>
<packaging>bundle</packaging>
<properties>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-integration-beans/pom.xml
----------------------------------------------------------------------
diff --git a/mina-integration-beans/pom.xml b/mina-integration-beans/pom.xml
index 3fe94a8..633e03c 100644
--- a/mina-integration-beans/pom.xml
+++ b/mina-integration-beans/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-beans</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-integration-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/mina-integration-jmx/pom.xml b/mina-integration-jmx/pom.xml
index b59f645..7ebe207 100644
--- a/mina-integration-jmx/pom.xml
+++ b/mina-integration-jmx/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-jmx</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-integration-ognl/pom.xml
----------------------------------------------------------------------
diff --git a/mina-integration-ognl/pom.xml b/mina-integration-ognl/pom.xml
index 30f5240..fff75e4 100644
--- a/mina-integration-ognl/pom.xml
+++ b/mina-integration-ognl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-ognl</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-integration-xbean/pom.xml
----------------------------------------------------------------------
diff --git a/mina-integration-xbean/pom.xml b/mina-integration-xbean/pom.xml
index 6e58b0a..d9e818a 100644
--- a/mina-integration-xbean/pom.xml
+++ b/mina-integration-xbean/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-legal/pom.xml
----------------------------------------------------------------------
diff --git a/mina-legal/pom.xml b/mina-legal/pom.xml
index 59d1246..e333ad2 100644
--- a/mina-legal/pom.xml
+++ b/mina-legal/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>mina-legal</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-statemachine/pom.xml
----------------------------------------------------------------------
diff --git a/mina-statemachine/pom.xml b/mina-statemachine/pom.xml
index 6540bd9..e0ed58b 100644
--- a/mina-statemachine/pom.xml
+++ b/mina-statemachine/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>mina-statemachine</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-transport-apr/pom.xml
----------------------------------------------------------------------
diff --git a/mina-transport-apr/pom.xml b/mina-transport-apr/pom.xml
index 71d5d63..d516604 100644
--- a/mina-transport-apr/pom.xml
+++ b/mina-transport-apr/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-apr</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/mina-transport-serial/pom.xml
----------------------------------------------------------------------
diff --git a/mina-transport-serial/pom.xml b/mina-transport-serial/pom.xml
index 9bfd179..01a2e89 100644
--- a/mina-transport-serial/pom.xml
+++ b/mina-transport-serial/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-serial</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/b6683a86/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7be6122..075486d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>14</version>
+ <relativePath />
</parent>
<prerequisites>
@@ -37,7 +38,7 @@
</organization>
<groupId>org.apache.mina</groupId>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
<artifactId>mina-parent</artifactId>
<name>Apache MINA</name>
<packaging>pom</packaging>
@@ -404,7 +405,7 @@
<build>
<plugins>
- <plugin>
+ <!--plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
@@ -418,25 +419,7 @@
</configuration>
</execution>
</executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
-
- <executions>
- <execution>
- <phase>install</phase>
-
- <goals>
- <goal>jxr</goal>
- <goal>test-jxr</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ </plugin-->
</plugins>
</build>
@@ -602,7 +585,6 @@
<version>${version.project.info.report.plugin}</version>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -831,6 +813,7 @@
<goals>clean deploy</goals>
<mavenExecutorId>forked-path</mavenExecutorId>
<autoVersionSubmodules>true</autoVersionSubmodules>
+ <tagNameFormat>@{project.version}</tagNameFormat>
</configuration>
</plugin>
@@ -847,6 +830,108 @@
</instructions>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <dependencies>
+ <!-- Add support for 'scp'/'sftp' -->
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <!-- Add support for 'scpexe' -->
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <configuration>
+ <tags>
+ <tag>TODO</tag>
+ <tag>@todo</tag>
+ <tag>@deprecated</tag>
+ <tag>FIXME</tag>
+ </tags>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <minmemory>512m</minmemory>
+ <maxmemory>1g</maxmemory>
+ <linksource>true</linksource>
+ <tags>
+ <tag>
+ <name>todo</name>
+ <!-- todo tag for all places -->
+ <placement>a</placement>
+ <head>To do:</head>
+ </tag>
+ </tags>
+ <source>1.6</source>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>aggregate</report>
+ <report>test-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>jxr</goal>
+ <goal>test-jxr</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>
</plugins>
</build>