diff --git a/.gitignore b/.gitignore
index e2e4a09..87a45ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ jsch-0.1.48.zip
/jsch-0.1.50
/jsch-0.1.51.zip
/jsch-0.1.52.zip
+/jsch-0.1.53.zip
diff --git a/jsch-0.1.52.pom b/jsch-0.1.52.pom
deleted file mode 100644
index 31ac76c..0000000
--- a/jsch-0.1.52.pom
+++ /dev/null
@@ -1,111 +0,0 @@
-
- 4.0.0
- com.jcraft
- jsch
- jar
- 0.1.52
- JSch
- http://www.jcraft.com/jsch/
- JSch is a pure Java implementation of SSH2
-
- JCraft,Inc.
- http://www.jcraft.com/
-
-
- scm:git:http://git.jcraft.com/jsch.git
- scm:git:http://git.jcraft.com/jsch.git
- http://git.jcraft.com/jsch.git
-
-
-
- ymnk
- Atsuhiko Yamanaka
- ymnk at jcraft D0t com
- http://github.com/ymnk
- JCraft,Inc.
- http://www.jcraft.com/
-
- architect
- developer
-
- +9
-
-
-
-
- Revised BSD
- http://www.jcraft.com/jsch/LICENSE.txt
-
-
-
-
- com.jcraft
- jzlib
- 1.0.7
- true
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
- attach-sources
-
- jar
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 1.5
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
- attach-javadocs
-
- jar
-
-
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
-
-
- sign-artifacts
- verify
-
- sign
-
-
-
-
-
-
-
- org.apache.maven.wagon
- wagon-ssh-external
- 1.0-alpha-5
-
-
-
-
-
- org.sonatype.oss
- oss-parent
- 6
-
-
diff --git a/jsch.spec b/jsch.spec
index 8b0e64b..35a887a 100644
--- a/jsch.spec
+++ b/jsch.spec
@@ -1,35 +1,5 @@
-# Copyright (c) 2000-2005, JPackage Project
-# 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. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT
-# OWNER OR CONTRIBUTORS 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.
-#
-
Name: jsch
-Version: 0.1.52
+Version: 0.1.53
Release: 1%{?dist}
Summary: Pure Java implementation of SSH2
Group: Development/Libraries
@@ -49,15 +19,14 @@ Source0: http://download.sourceforge.net/sourceforge/jsch/jsch-%{version}
# unix2dos MANIFEST.MF
Source1: MANIFEST.MF
Source2: plugin.properties
-Source3: http://repo1.maven.org/maven2/com/jcraft/%{name}/%{version}/%{name}-%{version}.pom
-BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: java-devel >= 1.4.2
+BuildRequires: java-devel
BuildRequires: jzlib >= 0:1.0.5
-BuildRequires: ant
+BuildRequires: maven-local
BuildRequires: zip
Requires: jzlib >= 0:1.0.5
+Obsoletes: %{name}-demo < %{version}
%description
JSch allows you to connect to an sshd server and use port forwarding,
@@ -70,235 +39,34 @@ Summary: Javadoc for %{name}
%description javadoc
%{summary}.
-%package demo
-Summary: Examples for %{name}
-
-%description demo
-%{summary}.
-
%prep
%setup -q
+%pom_xpath_remove pom:project/pom:build/pom:extensions
+
%build
-export CLASSPATH=$(build-classpath jzlib)
-ant dist javadoc
+%mvn_build
# inject the OSGi Manifest
mkdir META-INF
cp %{SOURCE1} META-INF
cp %{SOURCE2} plugin.properties
-zip dist/lib/%{name}-*.jar META-INF/MANIFEST.MF
-zip dist/lib/%{name}-*.jar plugin.properties
+touch META-INF/MANIFEST.MF
+touch plugin.properties
+zip target/%{name}-%{version}.jar META-INF/MANIFEST.MF
+zip target/%{name}-%{version}.jar plugin.properties
%install
-# jars
-install -Dpm 644 dist/lib/%{name}-*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# javadoc
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# examples
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-cp -pr examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-# POM and depmap
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+%mvn_install
%files -f .mfiles
-%doc LICENSE.txt
-
-%files javadoc
-%doc %{_javadocdir}/%{name}
-%doc LICENSE.txt
-
-%files demo
-%doc %{_datadir}/%{name}*
-%doc LICENSE.txt
+%license LICENSE.txt
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt
%changelog
-* Fri Mar 20 2015 Mikolaj Izdebski - 0.1.52-1
-- Update to upstream version 0.1.52
+* Fri Jun 5 2015 Alexander Kurtakov 0.1.53-1
+- Update to 0.1.53
+- Build with xmvn.
-* Sun Jun 08 2014 Fedora Release Engineering - 0.1.51-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed May 21 2014 Mikolaj Izdebski - 0.1.51-2
-- Update to current packaging guidelines
-
-* Tue Mar 18 2014 Alexander Kurtakov 0:0.1.51-1
-- Update to latest upstream 0.1.51.
-
-* Sat Aug 03 2013 Fedora Release Engineering - 0:0.1.50-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri May 10 2013 Krzysztof Daniel 0:0.1.50-1
-- Update to latest upstream.
-
-* Thu Feb 14 2013 Fedora Release Engineering - 0:0.1.49-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Jan 15 2013 Alexander Kurtakov 0:0.1.49-1
-- Update to latest upstream.
-
-* Thu Nov 1 2012 Mikolaj Izdebski - 0:0.1.48-3
-- Add maven POM
-
-* Thu Jul 19 2012 Fedora Release Engineering - 0:0.1.48-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed May 2 2012 Alexander Kurtakov 0:0.1.48-1
-- Update to latest upstream 0.1.48.
-
-* Thu Mar 15 2012 Krzysztof Daniel 0:0.1.46-2
-- Updated MANIFEST.MF to match the actual upstream version.
-- Added plugin.properties to get proper vendor name in Eclipse.
-
-* Wed Feb 15 2012 Alexander Kurtakov 0:0.1.46-1
-- Update to latest upstream version 0.1.46.
-
-* Fri Jan 13 2012 Fedora Release Engineering - 0:0.1.45-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Nov 2 2011 Alexander Kurtakov 0:0.1.45-1
-- Update to new upstream version.
-
-* Thu Sep 15 2011 Alexander Kurtakov 0:0.1.44-4
-- Guidelines fixes.
-
-* Wed Feb 09 2011 Fedora Release Engineering - 0:0.1.44-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Dec 8 2010 Alexander Kurtakov 0:0.1.44-2
-- BR zip.
-- Don't install versioned jar.
-
-* Tue Nov 2 2010 Alexander Kurtakov 0:0.1.44-1
-- New upstream version.
-
-* Fri Sep 24 2010 Alexander Kurtakov 0:0.1.43-2
-- Fix merge review comments (#225953).
-
-* Mon Aug 16 2010 Alexander Kurtakov 0:0.1.43-1
-- Update to new upstream version.
-
-* Mon Jan 11 2010 Andrew Overholt 0:0.1.41-4
-- Fix changelog formatting error
-
-* Mon Jan 11 2010 Andrew Overholt 0:0.1.41-3
-- Update URL in comment for MANIFEST.MF
-- Fix Groups
-- Remove ghost symlinking
-
-* Fri Jul 24 2009 Fedora Release Engineering - 0:0.1.41-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Apr 8 2009 Alexander Kurtakov 0:0.1.41-1
-- Update to new version 0.1.41.
-
-* Wed Feb 25 2009 Fedora Release Engineering - 0:0.1.39-2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Jul 11 2008 Andrew Overholt 0:0.1.39-1.1
-- 0.1.39
-
-* Wed Jul 9 2008 Tom "spot" Callaway - 0:0.1.31-2.5
-- drop repotag
-
-* Thu May 29 2008 Tom "spot" Callaway - 0:0.1.31-2jpp.4
-- fix license tag
-
-* Mon Apr 07 2008 Deepak Bhole - 0:0.1.31-2jpp.3
-- Fix bz# 441071: Add backward compatibility patch from mwringe at redhat
-
-* Mon Feb 18 2008 Fedora Release Engineering - 0:0.1.31-2jpp.2
-- Autorebuild for GCC 4.3
-
-* Thu Sep 20 2007 Deepak Bhole - 0:0.1.31-1jpp.2
-- Added %%{?dist} as per new policy
-
-* Tue Jun 5 2007 Ben Konrath - 0:0.1.31-1jpp.1
-- 0.1.31.
-
-* Tue Apr 3 2007 Ben Konrath - 0:0.1.28-1jpp.6
-- Add OSGi Manifest to jar.
-- Disable aot-compile-rpm on ia64.
-
-* Thu Aug 10 2006 Deepak Bhole - 0:0.1.28-1jpp.5
-- Updated changelog entries in spec.
-
-* Fri Aug 04 2006 Deepak Bhole - 0:0.1.28-1jpp.4
-- Added conditional compiling support.
-- Added missing requirements.
-- Additionally, for synchronizaion between logs:
-- From r.apel@r-apel.de:
- - 0.1.26
-- From fnasser@redhat.com:
- - 0.1.20
-
-* Sat Jul 22 2006 Jakub Jelinek - 0:0.1.28-1jpp_3fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating - 0:0.1.28-1jpp_2fc
-- rebuild
-
-* Thu Jun 1 2006 Ben Konrath - 0:0.1.28-1jpp_1fc
-- 0.1.28
-- Add BuildRequires ant.
-
-* Mon Mar 6 2006 Jeremy Katz - 0:0.1.18-1jpp_7fc
-- stop scriptlet spew
-
-* Fri Feb 10 2006 Jesse Keating - 0:0.1.18-1jpp_6fc
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating - 0:0.1.18-1jpp_5fc
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Dec 21 2005 Andrew Overholt 0.1.18-1jpp_4fc
-- Rebuild again
-
-* Tue Dec 13 2005 Andrew Overholt 0.1.18-1jpp_3fc
-- Rebuild with gcc 4.1.
-
-* Fri Dec 09 2005 Jesse Keating
-- rebuilt
-
-* Fri Jul 15 2005 Gary Benson 0.1.18-1jpp_2fc
-- Build on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm.
-
-* Fri Apr 22 2005 Andrew Overholt 0.1.18-1jpp_1fc
-- Build into Fedora.
-- Natively-compile.
-
-* Fri Apr 22 2005 Fernando Nasser 0:0.1.18-1jpp_1rh
-- Merge with upstream for 0.1.18 upgrade
-
-* Fri Apr 22 2005 Fernando Nasser 0:0.1.18-1jpp
-- 0.1.18
-
-* Fri Mar 18 2005 Andrew Overholt 0.1.17-2jpp_1fc
-- Build into Fedora.
-- Remove Distribution and Vendor tags.
-- Add BuildRequires: java-devel for javadoc requirement.
-
-* Tue Nov 02 2004 David Walluck 0:0.1.17-2jpp
-- rebuild with jdk 1.4.2
-
-* Tue Oct 19 2004 David Walluck 0:0.1.17-1jpp
-- 0.1.17
-
-* Mon Aug 23 2004 Randy Watler - 0:0.1.13-2jpp
-- Rebuild with ant-1.6.2
-
-* Sat Feb 14 2004 David Walluck 0:0.1.13-1jpp
-- 0.1.13
-
-* Wed Jan 14 2004 Ralph Apel - 0:0.1.12-1jpp
-- First JPackage build.
diff --git a/prexmvn.changelog b/prexmvn.changelog
new file mode 100644
index 0000000..8f4e868
--- /dev/null
+++ b/prexmvn.changelog
@@ -0,0 +1,180 @@
+* Fri Mar 20 2015 Mikolaj Izdebski - 0.1.52-1
+- Update to upstream version 0.1.52
+
+* Sun Jun 08 2014 Fedora Release Engineering - 0.1.51-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed May 21 2014 Mikolaj Izdebski - 0.1.51-2
+- Update to current packaging guidelines
+
+* Tue Mar 18 2014 Alexander Kurtakov 0:0.1.51-1
+- Update to latest upstream 0.1.51.
+
+* Sat Aug 03 2013 Fedora Release Engineering - 0:0.1.50-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri May 10 2013 Krzysztof Daniel 0:0.1.50-1
+- Update to latest upstream.
+
+* Thu Feb 14 2013 Fedora Release Engineering - 0:0.1.49-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Jan 15 2013 Alexander Kurtakov 0:0.1.49-1
+- Update to latest upstream.
+
+* Thu Nov 1 2012 Mikolaj Izdebski - 0:0.1.48-3
+- Add maven POM
+
+* Thu Jul 19 2012 Fedora Release Engineering - 0:0.1.48-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed May 2 2012 Alexander Kurtakov 0:0.1.48-1
+- Update to latest upstream 0.1.48.
+
+* Thu Mar 15 2012 Krzysztof Daniel 0:0.1.46-2
+- Updated MANIFEST.MF to match the actual upstream version.
+- Added plugin.properties to get proper vendor name in Eclipse.
+
+* Wed Feb 15 2012 Alexander Kurtakov 0:0.1.46-1
+- Update to latest upstream version 0.1.46.
+
+* Fri Jan 13 2012 Fedora Release Engineering - 0:0.1.45-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Nov 2 2011 Alexander Kurtakov 0:0.1.45-1
+- Update to new upstream version.
+
+* Thu Sep 15 2011 Alexander Kurtakov 0:0.1.44-4
+- Guidelines fixes.
+
+* Wed Feb 09 2011 Fedora Release Engineering - 0:0.1.44-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Dec 8 2010 Alexander Kurtakov 0:0.1.44-2
+- BR zip.
+- Don't install versioned jar.
+
+* Tue Nov 2 2010 Alexander Kurtakov 0:0.1.44-1
+- New upstream version.
+
+* Fri Sep 24 2010 Alexander Kurtakov 0:0.1.43-2
+- Fix merge review comments (#225953).
+
+* Mon Aug 16 2010 Alexander Kurtakov 0:0.1.43-1
+- Update to new upstream version.
+
+* Mon Jan 11 2010 Andrew Overholt 0:0.1.41-4
+- Fix changelog formatting error
+
+* Mon Jan 11 2010 Andrew Overholt 0:0.1.41-3
+- Update URL in comment for MANIFEST.MF
+- Fix Groups
+- Remove ghost symlinking
+
+* Fri Jul 24 2009 Fedora Release Engineering - 0:0.1.41-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Apr 8 2009 Alexander Kurtakov 0:0.1.41-1
+- Update to new version 0.1.41.
+
+* Wed Feb 25 2009 Fedora Release Engineering - 0:0.1.39-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Jul 11 2008 Andrew Overholt 0:0.1.39-1.1
+- 0.1.39
+
+* Wed Jul 9 2008 Tom "spot" Callaway - 0:0.1.31-2.5
+- drop repotag
+
+* Thu May 29 2008 Tom "spot" Callaway - 0:0.1.31-2jpp.4
+- fix license tag
+
+* Mon Apr 07 2008 Deepak Bhole - 0:0.1.31-2jpp.3
+- Fix bz# 441071: Add backward compatibility patch from mwringe at redhat
+
+* Mon Feb 18 2008 Fedora Release Engineering - 0:0.1.31-2jpp.2
+- Autorebuild for GCC 4.3
+
+* Thu Sep 20 2007 Deepak Bhole - 0:0.1.31-1jpp.2
+- Added %%{?dist} as per new policy
+
+* Tue Jun 5 2007 Ben Konrath - 0:0.1.31-1jpp.1
+- 0.1.31.
+
+* Tue Apr 3 2007 Ben Konrath - 0:0.1.28-1jpp.6
+- Add OSGi Manifest to jar.
+- Disable aot-compile-rpm on ia64.
+
+* Thu Aug 10 2006 Deepak Bhole - 0:0.1.28-1jpp.5
+- Updated changelog entries in spec.
+
+* Fri Aug 04 2006 Deepak Bhole - 0:0.1.28-1jpp.4
+- Added conditional compiling support.
+- Added missing requirements.
+- Additionally, for synchronizaion between logs:
+- From r.apel@r-apel.de:
+ - 0.1.26
+- From fnasser@redhat.com:
+ - 0.1.20
+
+* Sat Jul 22 2006 Jakub Jelinek - 0:0.1.28-1jpp_3fc
+- Rebuilt
+
+* Wed Jul 12 2006 Jesse Keating - 0:0.1.28-1jpp_2fc
+- rebuild
+
+* Thu Jun 1 2006 Ben Konrath - 0:0.1.28-1jpp_1fc
+- 0.1.28
+- Add BuildRequires ant.
+
+* Mon Mar 6 2006 Jeremy Katz - 0:0.1.18-1jpp_7fc
+- stop scriptlet spew
+
+* Fri Feb 10 2006 Jesse Keating - 0:0.1.18-1jpp_6fc
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating - 0:0.1.18-1jpp_5fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Wed Dec 21 2005 Andrew Overholt 0.1.18-1jpp_4fc
+- Rebuild again
+
+* Tue Dec 13 2005 Andrew Overholt 0.1.18-1jpp_3fc
+- Rebuild with gcc 4.1.
+
+* Fri Dec 09 2005 Jesse Keating
+- rebuilt
+
+* Fri Jul 15 2005 Gary Benson 0.1.18-1jpp_2fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
+* Fri Apr 22 2005 Andrew Overholt 0.1.18-1jpp_1fc
+- Build into Fedora.
+- Natively-compile.
+
+* Fri Apr 22 2005 Fernando Nasser 0:0.1.18-1jpp_1rh
+- Merge with upstream for 0.1.18 upgrade
+
+* Fri Apr 22 2005 Fernando Nasser 0:0.1.18-1jpp
+- 0.1.18
+
+* Fri Mar 18 2005 Andrew Overholt 0.1.17-2jpp_1fc
+- Build into Fedora.
+- Remove Distribution and Vendor tags.
+- Add BuildRequires: java-devel for javadoc requirement.
+
+* Tue Nov 02 2004 David Walluck 0:0.1.17-2jpp
+- rebuild with jdk 1.4.2
+
+* Tue Oct 19 2004 David Walluck 0:0.1.17-1jpp
+- 0.1.17
+
+* Mon Aug 23 2004 Randy Watler - 0:0.1.13-2jpp
+- Rebuild with ant-1.6.2
+
+* Sat Feb 14 2004 David Walluck 0:0.1.13-1jpp
+- 0.1.13
+
+* Wed Jan 14 2004 Ralph Apel - 0:0.1.12-1jpp
+- First JPackage build.
diff --git a/sources b/sources
index 75a1327..01f4489 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-654ae66cc34e32187f8b0bd988ef601a jsch-0.1.52.zip
+5c37c1fe15ee6690fcc18b305f2d2659 jsch-0.1.53.zip