You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2014/10/17 10:10:23 UTC
[1/2] git commit: Clean the poms a bit
Repository: mina-sshd
Updated Branches:
refs/heads/master c828c9b5c -> a7a15ba15
Clean the poms a bit
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/5ae81311
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/5ae81311
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/5ae81311
Branch: refs/heads/master
Commit: 5ae81311b69e37850e196e71d55308ad10e5845c
Parents: c828c9b
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Oct 17 10:03:05 2014 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Oct 17 10:03:05 2014 +0200
----------------------------------------------------------------------
pom.xml | 57 +++++++++++++++++++++++++++++++++-----------------
sshd-core/pom.xml | 46 +++++-----------------------------------
sshd-git/pom.xml | 40 +----------------------------------
sshd-pam/pom.xml | 28 -------------------------
sshd-sftp/pom.xml | 50 -------------------------------------------
5 files changed, 44 insertions(+), 177 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5ae81311/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 13fbd14..1b05c72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>7</version>
+ <version>14</version>
</parent>
<groupId>org.apache.sshd</groupId>
@@ -68,18 +68,10 @@
</mailingList>
</mailingLists>
- <repositories>
- <repository>
- <id>servicemix</id>
- <name>Apache ServiceMix Repository</name>
- <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
- </repository>
- <repository>
- <id>jgit</id>
- <name>Eclipse JGit repository</name>
- <url>http://repo.eclipse.org/content/groups/jgit</url>
- </repository>
- </repositories>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/SSHD</url>
+ </issueManagement>
<scm>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/mina-sshd.git</connection>
@@ -207,11 +199,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.0</version>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
@@ -256,7 +243,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.9</version>
<executions>
<execution>
<goals>
@@ -285,6 +271,39 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.3</version>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5ae81311/sshd-core/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
index 54109d8..bed7903 100644
--- a/sshd-core/pom.xml
+++ b/sshd-core/pom.xml
@@ -27,7 +27,6 @@
<version>0.13.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>0.13.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: Core</name>
@@ -40,8 +39,13 @@
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>tomcat</groupId>
@@ -109,46 +113,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.sshd.core</Bundle-SymbolicName>
- <Import-Package>
- org.apache.mina*;version="[2,3)";resolution:=optional,
- com.jcraft.jzlib*;resolution:=optional,
- org.bouncycastle*;resolution:=optional,
- org.apache.tomcat.jni*;resolution:=optional,
- *
- </Import-Package>
- <Export-Package>
- org.apache.sshd*;version=${project.version};-noimport:=true
- </Export-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- </instructions>
- <unpackBundle>true</unpackBundle>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5ae81311/sshd-git/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-git/pom.xml b/sshd-git/pom.xml
index 07c3cb9..b0fed0a 100644
--- a/sshd-git/pom.xml
+++ b/sshd-git/pom.xml
@@ -27,7 +27,6 @@
<version>0.13.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.sshd</groupId>
<artifactId>sshd-git</artifactId>
<version>0.13.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: Git</name>
@@ -50,6 +49,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -88,44 +88,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.sshd.git</Bundle-SymbolicName>
- <Import-Package>
- org.eclipse.jgit.pgm;resolution:=optional,
- *
- </Import-Package>
- <Export-Package>
- org.apache.sshd.git*;version=${project.version};-noimport:=true
- </Export-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- </instructions>
- <unpackBundle>true</unpackBundle>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5ae81311/sshd-pam/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-pam/pom.xml b/sshd-pam/pom.xml
index bbc3871..15ff731 100644
--- a/sshd-pam/pom.xml
+++ b/sshd-pam/pom.xml
@@ -27,7 +27,6 @@
<version>0.13.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.sshd</groupId>
<artifactId>sshd-pam</artifactId>
<version>0.13.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: PAM</name>
@@ -50,31 +49,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <!--
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.sshd.pam</Bundle-SymbolicName>
- <Import-Package>
- com.jcraft.jzlib*;resolution:=optional,
- net.sf.jpam*;resolution:=optional,
- org.bouncycastle*;resolution:=optional,
- *
- </Import-Package>
- <Export-Package>
- org.apache.sshd*;version=${version};-noimport:=true
- </Export-Package>
- </instructions>
- <unpackBundle>true</unpackBundle>
- </configuration>
- </plugin>
- -->
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5ae81311/sshd-sftp/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-sftp/pom.xml b/sshd-sftp/pom.xml
index c99dd50..50cb5b4 100644
--- a/sshd-sftp/pom.xml
+++ b/sshd-sftp/pom.xml
@@ -27,7 +27,6 @@
<version>0.13.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
<version>0.13.0-SNAPSHOT</version>
<name>Apache Mina SSHD :: SFTP</name>
@@ -78,55 +77,6 @@
<filtering>true</filtering>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.sshd.core</Bundle-SymbolicName>
- <Import-Package>
- org.apache.mina*;version="[2,3)",
- com.jcraft.jzlib*;resolution:=optional,
- org.bouncycastle*;resolution:=optional,
- org.apache.tomcat.jni*;resolution:=optional,
- *
- </Import-Package>
- <Export-Package>
- org.apache.sshd*;version=${project.version};-noimport:=true
- </Export-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- </instructions>
- <unpackBundle>true</unpackBundle>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
[2/2] git commit: [SSHD-361][SSHD-362][SSHD-363] Upgrade to mina
2.0.8, bouncycastle 1.51 and jgit 3.4.1
Posted by gn...@apache.org.
[SSHD-361][SSHD-362][SSHD-363] Upgrade to mina 2.0.8, bouncycastle 1.51 and jgit 3.4.1
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/a7a15ba1
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/a7a15ba1
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/a7a15ba1
Branch: refs/heads/master
Commit: a7a15ba15d63e6c354faf6b18f8b92735fbd9cf0
Parents: 5ae8131
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Oct 17 10:03:13 2014 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Oct 17 10:03:13 2014 +0200
----------------------------------------------------------------------
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/a7a15ba1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1b05c72..7a496bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>2.0.7</version>
+ <version>2.0.8</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
@@ -114,12 +114,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk15on</artifactId>
- <version>1.49</version>
+ <version>1.51</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.49</version>
+ <version>1.51</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -185,12 +185,12 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>3.4.0.201405281120-rc2</version>
+ <version>3.4.1.201406201815-r</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm</artifactId>
- <version>3.4.0.201405281120-rc2</version>
+ <version>3.4.1.201406201815-r</version>
</dependency>
</dependencies>
</dependencyManagement>