diff --git a/LICENSE-1.1.txt b/LICENSE-1.1.txt new file mode 100644 index 0000000..de6706f --- /dev/null +++ b/LICENSE-1.1.txt @@ -0,0 +1,58 @@ +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2000 The Apache Software Foundation. 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. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR + * ITS 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. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + * Portions of this software are based upon public domain software + * originally written at the National Center for Supercomputing Applications, + * University of Illinois, Urbana-Champaign. + */ + diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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 KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/javahl-1.8.1.tar.gz b/javahl-1.8.1.tar.gz new file mode 100644 index 0000000..0d68427 Binary files /dev/null and b/javahl-1.8.1.tar.gz differ diff --git a/org.tmatesoft.svn_1.8.12.src.zip b/org.tmatesoft.svn_1.8.12.src.zip new file mode 100644 index 0000000..51fb331 Binary files /dev/null and b/org.tmatesoft.svn_1.8.12.src.zip differ diff --git a/svnkit-1.8.12.pom b/svnkit-1.8.12.pom new file mode 100644 index 0000000..86a836a --- /dev/null +++ b/svnkit-1.8.12.pom @@ -0,0 +1,77 @@ + + + 4.0.0 + org.tmatesoft.svnkit + svnkit + 1.8.12 + SVNKit Library + Pure Java Subversion Library + http://www.svnkit.com/ + + + TMate Open Source License (with dual licensing option) + http://www.svnkit.com/license.html + + + + + tmate + TMate Software + + + + scm:svn:http://svn.svnkit.com/repos/svnkit + http://svn.svnkit.com/repos/svnkit + + + + com.jcraft + jsch.agentproxy.svnkit-trilead-ssh2 + 0.0.7 + compile + + + com.trilead + trilead-ssh2 + 1.0.0-build220 + compile + + + net.java.dev.jna + jna-platform + 4.1.0 + compile + + + net.java.dev.jna + jna + 4.1.0 + compile + + + com.jcraft + jsch.agentproxy.connector-factory + 0.0.7 + compile + + + junit + junit + 4.8 + test + + + de.regnis.q.sequence + sequence-library + 1.0.3 + compile + + + org.tmatesoft.sqljet + sqljet + 1.1.10 + compile + + + diff --git a/svnkit-1.8.5-SshSession-unreported-exception.patch b/svnkit-1.8.5-SshSession-unreported-exception.patch new file mode 100644 index 0000000..d7f1fe0 --- /dev/null +++ b/svnkit-1.8.5-SshSession-unreported-exception.patch @@ -0,0 +1,18 @@ +diff -ruN svnkit-1.8.5.origin/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshSession.java svnkit-1.8.5.ssh2fix/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshSession.java +--- svnkit-1.8.5.origin/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshSession.java 2014-06-11 12:40:54.643251610 +0200 ++++ svnkit-1.8.5.ssh2fix/svnkit/src/main/java/org/tmatesoft/svn/core/internal/io/svn/ssh/SshSession.java 2014-06-12 09:31:36.714009852 +0200 +@@ -44,7 +44,13 @@ + } + + public void waitForCondition(int code, long timeout) { +- mySession.waitForCondition(code, timeout); ++ try { ++ mySession.waitForCondition(code, timeout); ++ } ++ catch (InterruptedException ex) { ++ /* I applogize myself for doing such a terrible hack, ++ * but this is the best approach in this particular case. */ ++ } + } + + public void execCommand(String command) throws IOException { diff --git a/svnkit-cli-1.8.12.pom b/svnkit-cli-1.8.12.pom new file mode 100644 index 0000000..691b6ce --- /dev/null +++ b/svnkit-cli-1.8.12.pom @@ -0,0 +1,35 @@ + + + 4.0.0 + org.tmatesoft.svnkit + svnkit-cli + 1.8.12 + SVNKit Library + Pure Java Subversion Library + http://www.svnkit.com/ + + + TMate Open Source License (with dual licensing option) + http://www.svnkit.com/license.html + + + + + tmate + TMate Software + + + + scm:svn:http://svn.svnkit.com/repos/svnkit + http://svn.svnkit.com/repos/svnkit + + + + org.tmatesoft.svnkit + svnkit + 1.8.12 + compile + + + diff --git a/svnkit-javahl16-1.8.12.pom b/svnkit-javahl16-1.8.12.pom new file mode 100644 index 0000000..f7353e3 --- /dev/null +++ b/svnkit-javahl16-1.8.12.pom @@ -0,0 +1,47 @@ + + + 4.0.0 + org.tmatesoft.svnkit + svnkit-javahl16 + 1.8.12 + SVNKit Library + Pure Java Subversion Library + http://www.svnkit.com/ + + + TMate Open Source License (with dual licensing option) + http://www.svnkit.com/license.html + + + + + tmate + TMate Software + + + + scm:svn:http://svn.svnkit.com/repos/svnkit + http://svn.svnkit.com/repos/svnkit + + + + org.tmatesoft.svnkit + svnkit + 1.8.12 + compile + + + org.apache.subversion + svn-javahl-api + 1.8.1 + compile + + + org.apache.subversion + svn-javahl-tests + 1.8.1 + test + + + diff --git a/svnkit-parent.pom b/svnkit-parent.pom new file mode 100644 index 0000000..e032e91 --- /dev/null +++ b/svnkit-parent.pom @@ -0,0 +1,15 @@ + + + 4.0.0 + org.tmatesoft.svnkit + parent + 1 + Parent POM + pom + + svnkit + svnkit-cli + svnkit-javahl16 + + diff --git a/svnkit.spec b/svnkit.spec new file mode 100644 index 0000000..8848cf2 --- /dev/null +++ b/svnkit.spec @@ -0,0 +1,136 @@ +# The version of Subversion that we are compatible with +%global svn_version 1.8.1 + +Epoch: 1 +Name: svnkit +Version: 1.8.12 +Release: 1 +Summary: Pure Java library to manage Subversion working copies and repositories + +# License located at https://svnkit.com/license.html +License: TMate and ASL 2.0 +URL: https://www.svnkit.com/ +Source0: https://www.svnkit.com/org.tmatesoft.svn_%{version}.src.zip + +# POMs +Source1: https://repo1.maven.org/maven2/org/tmatesoft/svnkit/svnkit/%{version}/svnkit-%{version}.pom +Source2: https://repo1.maven.org/maven2/org/tmatesoft/svnkit/svnkit-cli/%{version}/svnkit-cli-%{version}.pom +Source3: https://repo1.maven.org/maven2/org/tmatesoft/svnkit/svnkit-javahl16/%{version}/svnkit-javahl16-%{version}.pom + +# Custom aggregator pom to avoid reliance on gradle +Source4: svnkit-parent.pom + +# SVNKit provides a pure-Java implementation of the Subversion JavaHL API, but it only provides an older +# Subversion JavaHL API, so we need an old version of the JavaHL source to build against. This is that: +# $ svn export https://svn.apache.org/repos/asf/subversion/tags/1.8.1/subversion/bindings/javahl/src/ javahl-1.8.1 +Source5: javahl-%{svn_version}.tar.gz + +# Just in SRPM due to nailgun comes included in svnkit upstream sources: +Source10: https://www.apache.org/licenses/LICENSE-2.0.txt +Source11: https://www.apache.org/licenses/LICENSE-1.1.txt + +# svnkit's trilead-ssh2 does not throw InterruptedException from Session.waitForCondition() +Patch1: svnkit-1.8.5-SshSession-unreported-exception.patch + +BuildArch: noarch + +BuildRequires: maven-local mvn(com.jcraft:jsch.agentproxy.connector-factory) +BuildRequires: mvn(com.jcraft:jsch.agentproxy.svnkit-trilead-ssh2) +BuildRequires: mvn(com.trilead:trilead-ssh2) +BuildRequires: mvn(de.regnis.q.sequence:sequence-library) >= 1.0.3 mvn(net.java.dev.jna:jna) +BuildRequires: mvn(net.java.dev.jna:jna-platform) mvn(org.tmatesoft.sqljet:sqljet) + +%description +SVNKit is a pure java Subversion client library. You would like to use SVNKit +when you need to access or modify Subversion repository from your Java +application, as a standalone program and plugin or web application. Being a +pure java program, SVNKit doesn't need any additional configuration or native +binaries to work on any OS that runs java. + +%package cli +Summary: SVNKit based Subversion command line client +# Explicit requires for javapackages-tools since scripts +# use /usr/share/java-utils/java-functions +Requires: javapackages-tools + +%description cli +%{summary}. + +%package javahl +Summary: SVNKit based Subversion JavaHL API implementation + +%description javahl +%{summary}. + +%package javadoc +Summary: Javadoc for SVNKit + +%description javadoc +API documentation for SVNKit. + +%prep +%setup -q -n %{name}-%{version} + +%patch1 -p1 + +# Delete all pre-built binaries, except for "template.jar" which is important +# for the function of svnkit and contains no actual bytecode: +find -name *.class -delete +find -name *.jar -a ! -name template.jar -delete + +cp -pr %{SOURCE1} svnkit/pom.xml +cp -pr %{SOURCE2} svnkit-cli/pom.xml +cp -pr %{SOURCE3} svnkit-javahl16/pom.xml +cp -pr %{SOURCE4} pom.xml + +# Build against the bundled version of the JavaHL API source +(cd svnkit-javahl16/src/main/java/ && tar xf %{SOURCE5} --strip-components=1 --skip-old-files) +%pom_remove_dep ":svn-javahl-api" svnkit-javahl16 +%pom_remove_dep ":svn-javahl-tests" svnkit-javahl16 + +rev="t$(date -u +%Y%m%d%H%M)" +cat > svnkit/src/main/resources/svnkit.build.properties < - 1.8.12-1 +- package init diff --git a/svnkit.yaml b/svnkit.yaml new file mode 100644 index 0000000..b6d4362 --- /dev/null +++ b/svnkit.yaml @@ -0,0 +1,4 @@ +version_control: svn +src_repo: https://svn.svnkit.com/repos/svnkit/tags +tag_prefix: "" +seperator: "."