From 87e918a64c1e1d98f7faa28875585ccc1cdd1b10 Mon Sep 17 00:00:00 2001 From: Marc Bernard Date: Thu, 30 Jan 2025 18:43:24 +0100 Subject: [PATCH 1/3] chore: update template files --- .gitattributes | 21 ++++++++ .github/FUNDING.yml | 3 ++ CHANGELOG.md | 7 ++- LICENSES/CC0-1.0.txt | 121 +++++++++++++++++++++++++++++++++++++++++++ README.md | 29 +++++------ REUSE.toml | 6 +++ package.abap.json | 42 +++++++++++++++ 7 files changed, 210 insertions(+), 19 deletions(-) create mode 100644 .gitattributes create mode 100644 .github/FUNDING.yml create mode 100644 LICENSES/CC0-1.0.txt create mode 100644 REUSE.toml create mode 100644 package.abap.json diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..faf7ed3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,21 @@ +# newlines +* text=auto eol=lf + +*.abap text eol=lf +*.css text eol=lf +*.html text eol=lf +*.js text eol=lf +*.json text eol=lf +*.md text eol=lf +*.svg text eol=lf +*.sh text eol=lf +*.txt text eol=lf +*.xml text eol=lf +*.yaml text eol=lf +*.yml text eol=lf + +*.gif binary +*.jpeg binary +*.jpg binary +*.png binary +*.webp binary diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..55e4dcb --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# All contributions are important small and big +github: abappm +github: mbtools diff --git a/CHANGELOG.md b/CHANGELOG.md index b4b644e..bc347a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and [ISO Date Format](https://www.iso.org/iso-8601-date-and-time-format.html). -## [Unreleased] +See [unreleased changes] for the latest updates. ## Version [1.0.0] - 2022-06-02 Initial Release. - -[Unreleased]: https://github.com/Marc-Bernard-Tools/ABAP-Diff3/compare/1.0.0...main -[1.0.0]: https://github.com/Marc-Bernard-Tools/ABAP-Diff3/releases/tag/1.0.0 +[unreleased changes]: https://github.com/abapPM/ABAP-Diff3/compare/1.0.0...main +[1.0.0]: https://github.com/abapPM/ABAP-Diff3/releases/tag/1.0.0 diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt new file mode 100644 index 0000000..1625c17 --- /dev/null +++ b/LICENSES/CC0-1.0.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/README.md b/README.md index 49dcc42..6777d51 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,15 @@ -![Version](https://img.shields.io/endpoint?url=https://shield.abap.space/version-shield-json/github/Marc-Bernard-Tools/ABAP-Diff3/src/zcl_diff3.clas.abap/c_version&label=Version&color=blue) +![Version](https://img.shields.io/endpoint?url=https://shield.abappm.com/github/abapPM/ABAP-Diff3/src/zcl_diff3.clas.abap/c_version&label=Version&color=blue) -[![License](https://img.shields.io/github/license/Marc-Bernard-Tools/ABAP-Diff3?label=License&color=success)](LICENSE) -[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg?color=success)](https://github.com/Marc-Bernard-Tools/.github/blob/main/CODE_OF_CONDUCT.md) -[![REUSE Status](https://api.reuse.software/badge/github.com/Marc-Bernard-Tools/ABAP-Diff3)](https://api.reuse.software/info/github.com/Marc-Bernard-Tools/ABAP-Diff3) +[![License](https://img.shields.io/github/license/abapPM/ABAP-Diff3?label=License&color=success)](LICENSE) +[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg?color=success)](https://github.com/abapPM/.github/blob/main/CODE_OF_CONDUCT.md) +[![REUSE Status](https://api.reuse.software/badge/github.com/abapPM/ABAP-Diff3)](https://api.reuse.software/info/github.com/abapPM/ABAP-Diff3) # ABAP Diff3 Library to highlight the content difference between two or three string-tables (diff3). -Made by [Marc Bernard Tools](https://marcbernardtools.com/) giving back to the [SAP Community](https://community.sap.com/) - NO WARRANTIES, [MIT License](LICENSE) -The implementation is a port of node-diff3 (https://github.com/bhousel/node-diff3, MIT license) - ## Diff3 Utils This is a library to find differences between two string tables, generate and apply patches, and perform 3-way merging between an original and two changed string tables. It contains similar functionality to the [GNU Diffutils](https://www.gnu.org/software/diffutils/manual/diffutils.html) tools. @@ -24,24 +20,27 @@ SAP Basis 7.4 or higher ## Installation -You can install ABAP Diff3 using [abapGit](https://github.com/abapGit/abapGit) either creating a new online repository for https://github.com/Marc-Bernard-Tools/ABAP-Diff3 or downloading the repository [ZIP file](https://github.com/Marc-Bernard-Tools/ABAP-Diff3/archive/main.zip) and creating a new offline repository. +You can install ABAP Diff3 using [abapGit](https://github.com/abapGit/abapGit) either creating a new online repository for `https://github.com/abapPM/ABAP-Diff3` or downloading the repository [ZIP file](https://github.com/abapPM/ABAP-Diff3/archive/main.zip) and creating a new offline repository. -Recommend SAP package: `$DIFF3`. +Recommended SAP package: `$DIFF3`. ## Usage -The [test classes](https://github.com/Marc-Bernard-Tools/ABAP-Diff3/blob/main/src/zcl_diff3.clas.testclasses.abap) contain examples for all interface methods. +The [test classes](https://github.com/abapPM/ABAP-Diff3/blob/main/src/zcl_diff3.clas.testclasses.abap) contain examples for all interface methods. ## Contributions All contributions are welcome! Read our [Contribution Guidelines](CONTRIBUTING.md), fork this repo, and create a pull request. +## Attribution + +The implementation is a port of node-diff3 (https://github.com/bhousel/node-diff3, MIT license). + ## About -Made with :heart: in Canada +Made with ❤ in Canada -Copyright 2021 Marc Bernard +Copyright 2025 apm.to Inc. -Follow [@marcfbe](https://twitter.com/marcfbe) on Twitter +Follow [@marcf.be](https://bsky.app/profile/marcf.be) on Blueksy and [@marcfbe](https://linkedin.com/in/marcfbe) or LinkedIn -

MBT Logo

diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..3ab830b --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,6 @@ +version = 1 + +[[annotations]] +path = "**/*" +SPDX-FileCopyrightText = "2025 apm.to Inc. " +SPDX-License-Identifier = "MIT" diff --git a/package.abap.json b/package.abap.json new file mode 100644 index 0000000..c792774 --- /dev/null +++ b/package.abap.json @@ -0,0 +1,42 @@ +{ + "name": "xxx", + "version": "1.0.0", + "description": "XXX", + "type": "module", + "keywords": [ + "abap", + "apm", + "module" + ], + "homepage": "https://abappm.com", + "bugs": { + "url": "https://github.com/abapPM/ABAP-XXX" + }, + "license": "MIT", + "author": { + "name": "Marc Bernard", + "url": "https://abappm.com", + "email": "marc@abappm.com" + }, + "maintainers": [ + { + "name": "Marc Bernard", + "url": "https://github.com/mbtools", + "email": "marc@abappm.com" + } + ], + "repository": { + "url": "https://github.com/abapPM/ABAP-XXX" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/abapPM" + }, + "dependencies": { + "error": "^1.0.0" + }, + "engines": { + "abap": ">=7.50", + "apm": ">=1" + } +} From c3636f5a357f66ac9bce36351186b2a3a294fd58 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Fri, 31 Jan 2025 10:06:27 +0100 Subject: [PATCH 2/3] Delete .reuse directory --- .reuse/dep5 | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .reuse/dep5 diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index 74ae613..0000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,8 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: ABAP Diff3 -Upstream-Contact: Marc Bernard -Source: https://github.com/Marc-Bernard-Tools/ABAP-Diff3 - -Files: * -Copyright: 2022 Marc Bernard -License: MIT From e69b350c675990f1f73b05be5270ca8fc3579e2b Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Fri, 31 Jan 2025 10:07:14 +0100 Subject: [PATCH 3/3] Update reuse.yml --- .github/workflows/reuse.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index 0ddfc58..7bc1392 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -1,11 +1,20 @@ +# SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. +# +# SPDX-License-Identifier: CC0-1.0 + name: REUSE Compliance Check -on: [push, pull_request,workflow_dispatch] +on: [push, pull_request, workflow_dispatch] + +permissions: + contents: read jobs: - test: + Reuse-Compliance-Check: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: REUSE Compliance Check - uses: fsfe/reuse-action@v1 + uses: fsfe/reuse-action@694eabb15673ec601ea19d4cd949969141372512 # v5.0.0