From d25a6552fdb9828fdb882b8b632c68731387c597 Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Thu, 29 Jun 2023 11:16:56 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .fmf/version | 1 + .gitignore | 45 +++++++ aQute.libg-6.2.0.pom | 98 -------------- biz.aQute.bnd-6.2.0.pom | 200 ----------------------------- biz.aQute.bnd.annotation-6.2.0.pom | 98 -------------- biz.aQute.bnd.ant-6.2.0.pom | 98 -------------- biz.aQute.bnd.util-6.2.0.pom | 74 ----------- biz.aQute.bndlib-6.2.0.pom | 158 ----------------------- ci.fmf | 1 + gating.yaml | 9 ++ generate-tarball.sh | 0 plans/javapackages.fmf | 7 + plans/smoke.fmf | 10 ++ sources | 6 + 14 files changed, 79 insertions(+), 726 deletions(-) create mode 100644 .fmf/version delete mode 100644 aQute.libg-6.2.0.pom delete mode 100644 biz.aQute.bnd-6.2.0.pom delete mode 100644 biz.aQute.bnd.annotation-6.2.0.pom delete mode 100644 biz.aQute.bnd.ant-6.2.0.pom delete mode 100644 biz.aQute.bnd.util-6.2.0.pom delete mode 100644 biz.aQute.bndlib-6.2.0.pom create mode 100644 ci.fmf create mode 100644 gating.yaml mode change 100755 => 100644 generate-tarball.sh create mode 100644 plans/javapackages.fmf create mode 100644 plans/smoke.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index ab839a0..3496aad 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,46 @@ +/results_* +/*.src.rpm +/*.noarch.rpm +/2.4.1.REL.tar.gz +/3.2.0.REL.tar.gz +/3.3.0.REL.tar.gz +/3.4.0.REL.tar.gz +/3.5.0.REL.tar.gz +/4.3.0.REL.tar.gz +/4.3.1.REL.tar.gz +/*.pom +/aQute.libg-3.5.0.pom +/biz.aQute.bnd-3.5.0.pom +/biz.aQute.bndlib-3.5.0.pom +/biz.aQute.bnd.annotation-3.5.0.pom +/4.2.0.REL.tar.gz +/aQute.libg-4.2.0.pom +/biz.aQute.bnd-4.2.0.pom +/biz.aQute.bndlib-4.2.0.pom +/biz.aQute.bnd.annotation-4.2.0.pom +/4.3.0.REL.tar.gz +/aQute.libg-4.3.0.pom +/biz.aQute.bnd-4.3.0.pom +/biz.aQute.bndlib-4.3.0.pom +/biz.aQute.bnd.annotation-4.3.0.pom +/5.0.0.REL.tar.gz +/aQute.libg-5.0.0.pom +/biz.aQute.bnd-5.0.0.pom +/biz.aQute.bnd.annotation-5.0.0.pom +/biz.aQute.bndlib-5.0.0.pom +/aqute-bnd-5.1.1.tar.gz +/aQute.libg-5.1.1.pom +/biz.aQute.bnd-5.1.1.pom +/biz.aQute.bnd.annotation-5.1.1.pom +/biz.aQute.bndlib-5.1.1.pom +/aqute-bnd-5.1.2.tar.gz +/aQute.libg-5.1.2.pom +/biz.aQute.bnd-5.1.2.pom +/biz.aQute.bnd.annotation-5.1.2.pom +/biz.aQute.bndlib-5.1.2.pom +/aqute-bnd-5.2.0.tar.gz +/aQute.libg-5.2.0.pom +/biz.aQute.bnd-5.2.0.pom +/biz.aQute.bnd.annotation-5.2.0.pom +/biz.aQute.bndlib-5.2.0.pom /aqute-bnd-6.2.0.tar.gz diff --git a/aQute.libg-6.2.0.pom b/aQute.libg-6.2.0.pom deleted file mode 100644 index 16b30c6..0000000 --- a/aQute.libg-6.2.0.pom +++ /dev/null @@ -1,98 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - aQute.libg - 6.2.0 - A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only. - aQute.libg - https://bnd.bndtools.org/ - - Bndtools - https://bndtools.org/ - - - - (Apache-2.0 OR EPL-2.0) - https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 - repo - This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0. - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 6.2.0 - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - bjhargrave - BJ Hargrave - bj@hargrave.dev - https://github.com/bjhargrave - IBM - https://developer.ibm.com - - developer - - America/New_York - - - rotty3000 - Ray Augé - raymond.auge@liferay.com - https://rotty3000.github.io - Liferay Inc. - https://www.liferay.com - - developer - - America/New_York - - - - - org.osgi - osgi.annotation - 8.1.0 - provided - - - org.slf4j - slf4j-api - 1.7.25 - compile - - - org.osgi - org.osgi.util.function - 1.2.0 - compile - - - org.osgi - org.osgi.util.promise - 1.2.0 - compile - - - org.osgi - osgi.core - 6.0.0 - compile - - - diff --git a/biz.aQute.bnd-6.2.0.pom b/biz.aQute.bnd-6.2.0.pom deleted file mode 100644 index 339305c..0000000 --- a/biz.aQute.bnd-6.2.0.pom +++ /dev/null @@ -1,200 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - biz.aQute.bnd - 6.2.0 - This command line utility is the Swiss army knife of OSGi. It provides you with a breadth of tools to understand and manage OSGi based systems. This project basically uses bndlib. - biz.aQute.bnd - https://bnd.bndtools.org/ - - Bndtools - https://bndtools.org/ - - - - (Apache-2.0 OR EPL-2.0) - https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 - repo - This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0. - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 6.2.0 - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - bjhargrave - BJ Hargrave - bj@hargrave.dev - https://github.com/bjhargrave - IBM - https://developer.ibm.com - - developer - - America/New_York - - - rotty3000 - Ray Augé - raymond.auge@liferay.com - https://rotty3000.github.io - Liferay Inc. - https://www.liferay.com - - developer - - America/New_York - - - - - org.osgi - org.osgi.dto - 1.0.0 - provided - - - org.osgi - org.osgi.resource - 1.0.0 - provided - - - org.osgi - org.osgi.framework - 1.8.0 - provided - - - org.osgi - org.osgi.util.tracker - 1.5.4 - provided - - - org.osgi - org.osgi.service.coordinator - 1.0.2 - provided - - - org.osgi - org.osgi.service.log - 1.3.0 - provided - - - org.osgi - org.osgi.service.repository - 1.1.0 - provided - - - org.osgi - org.osgi.service.resolver - 1.1.1 - provided - - - org.osgi - org.osgi.util.function - 1.2.0 - provided - - - org.osgi - org.osgi.util.promise - 1.2.0 - provided - - - biz.aQute.bnd - biz.aQute.bnd.util - 6.2.0 - provided - - - biz.aQute.bnd - biz.aQute.bndlib - 6.2.0 - provided - - - biz.aQute.bnd - biz.aQute.bnd.ant - 6.2.0 - provided - - - biz.aQute.bnd - biz.aQute.resolve - 6.2.0 - provided - - - biz.aQute.bnd - biz.aQute.repository - 6.2.0 - provided - - - biz.aQute.bnd - biz.aQute.bnd.exporters - 6.2.0 - provided - - - biz.aQute.bnd - biz.aQute.bnd.reporter - 6.2.0 - provided - - - biz.aQute.bnd - biz.aQute.remote.api - 6.2.0 - provided - - - org.yaml - snakeyaml - 1.15 - provided - - - org.slf4j - slf4j-api - 1.7.25 - provided - - - org.slf4j - slf4j-simple - 1.7.25 - provided - - - jline - jline - 2.14.6 - provided - - - diff --git a/biz.aQute.bnd.annotation-6.2.0.pom b/biz.aQute.bnd.annotation-6.2.0.pom deleted file mode 100644 index 97df85d..0000000 --- a/biz.aQute.bnd.annotation-6.2.0.pom +++ /dev/null @@ -1,98 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - biz.aQute.bnd.annotation - 6.2.0 - bnd Annotations Library - biz.aQute.bnd.annotation - https://bnd.bndtools.org/ - - Bndtools - https://bndtools.org/ - - - - (Apache-2.0 OR EPL-2.0) - https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 - repo - This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0. - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 6.2.0 - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - bjhargrave - BJ Hargrave - bj@hargrave.dev - https://github.com/bjhargrave - IBM - https://developer.ibm.com - - developer - - America/New_York - - - rotty3000 - Ray Augé - raymond.auge@liferay.com - https://rotty3000.github.io - Liferay Inc. - https://www.liferay.com - - developer - - America/New_York - - - - - org.osgi - osgi.annotation - 8.1.0 - compile - - - org.osgi - org.osgi.namespace.extender - 1.0.1 - compile - - - org.osgi - org.osgi.namespace.service - 1.0.0 - compile - - - org.osgi - org.osgi.resource - 1.0.0 - compile - - - org.osgi - org.osgi.service.serviceloader - 1.0.0 - compile - - - diff --git a/biz.aQute.bnd.ant-6.2.0.pom b/biz.aQute.bnd.ant-6.2.0.pom deleted file mode 100644 index 4938ec6..0000000 --- a/biz.aQute.bnd.ant-6.2.0.pom +++ /dev/null @@ -1,98 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - biz.aQute.bnd.ant - 6.2.0 - Bnd Ant Tasks - biz.aQute.bnd.ant - https://bnd.bndtools.org/ - - Bndtools - https://bndtools.org/ - - - - (Apache-2.0 OR EPL-2.0) - https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 - repo - This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0. - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 6.2.0 - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - bjhargrave - BJ Hargrave - bj@hargrave.dev - https://github.com/bjhargrave - IBM - https://developer.ibm.com - - developer - - America/New_York - - - rotty3000 - Ray Augé - raymond.auge@liferay.com - https://rotty3000.github.io - Liferay Inc. - https://www.liferay.com - - developer - - America/New_York - - - - - org.osgi - osgi.annotation - 8.1.0 - provided - - - biz.aQute.bnd - biz.aQute.bnd.util - 6.2.0 - compile - - - biz.aQute.bnd - biz.aQute.bndlib - 6.2.0 - compile - - - org.slf4j - slf4j-api - 1.7.25 - compile - - - org.apache.ant - ant - 1.10.12 - compile - - - diff --git a/biz.aQute.bnd.util-6.2.0.pom b/biz.aQute.bnd.util-6.2.0.pom deleted file mode 100644 index f364b90..0000000 --- a/biz.aQute.bnd.util-6.2.0.pom +++ /dev/null @@ -1,74 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - biz.aQute.bnd.util - 6.2.0 - Util classes - biz.aQute.bnd.util - https://bnd.bndtools.org/ - - Bndtools - https://bndtools.org/ - - - - (Apache-2.0 OR EPL-2.0) - https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 - repo - This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0. - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 6.2.0 - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - bjhargrave - BJ Hargrave - bj@hargrave.dev - https://github.com/bjhargrave - IBM - https://developer.ibm.com - - developer - - America/New_York - - - rotty3000 - Ray Augé - raymond.auge@liferay.com - https://rotty3000.github.io - Liferay Inc. - https://www.liferay.com - - developer - - America/New_York - - - - - org.osgi - osgi.annotation - 8.1.0 - provided - - - diff --git a/biz.aQute.bndlib-6.2.0.pom b/biz.aQute.bndlib-6.2.0.pom deleted file mode 100644 index 5797e45..0000000 --- a/biz.aQute.bndlib-6.2.0.pom +++ /dev/null @@ -1,158 +0,0 @@ - - - 4.0.0 - biz.aQute.bnd - biz.aQute.bndlib - 6.2.0 - bndlib: A Swiss Army Knife for OSGi - biz.aQute.bndlib - https://bnd.bndtools.org/ - - Bndtools - https://bndtools.org/ - - - - (Apache-2.0 OR EPL-2.0) - https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0 - repo - This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0, or the Eclipse Public License 2.0. - - - - https://github.com/bndtools/bnd - scm:git:https://github.com/bndtools/bnd.git - scm:git:git@github.com:bndtools/bnd.git - 6.2.0 - - - - pkriens - Peter.Kriens@aQute.biz - Peter Kriens - Bndtools - https://github.com/bndtools - - architect - developer - - 1 - - - bjhargrave - BJ Hargrave - bj@hargrave.dev - https://github.com/bjhargrave - IBM - https://developer.ibm.com - - developer - - America/New_York - - - rotty3000 - Ray Augé - raymond.auge@liferay.com - https://rotty3000.github.io - Liferay Inc. - https://www.liferay.com - - developer - - America/New_York - - - - - org.osgi - osgi.annotation - 8.1.0 - provided - - - org.osgi - org.osgi.dto - 1.0.0 - compile - - - org.osgi - org.osgi.resource - 1.0.0 - compile - - - org.osgi - org.osgi.framework - 1.8.0 - compile - - - org.osgi - org.osgi.util.tracker - 1.5.4 - compile - - - org.osgi - org.osgi.namespace.contract - 1.0.0 - provided - - - org.osgi - org.osgi.namespace.extender - 1.0.1 - provided - - - org.osgi - org.osgi.namespace.implementation - 1.0.0 - provided - - - org.osgi - org.osgi.namespace.service - 1.0.0 - provided - - - org.osgi - org.osgi.service.log - 1.3.0 - compile - - - org.osgi - org.osgi.service.repository - 1.1.0 - compile - - - org.osgi - org.osgi.util.function - 1.2.0 - compile - - - org.osgi - org.osgi.util.promise - 1.2.0 - compile - - - biz.aQute.bnd - biz.aQute.bnd.util - 6.2.0 - compile - - - org.slf4j - slf4j-api - 1.7.25 - compile - - - diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..7b6e38f --- /dev/null +++ b/gating.yaml @@ -0,0 +1,9 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/generate-tarball.sh b/generate-tarball.sh old mode 100755 new mode 100644 diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..def0914 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: + Run javapackages-specific tests +discover: + how: fmf + url: https://pagure.io/javapackages-validator-tests +execute: + how: tmt diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..3db056a --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,10 @@ +summary: Basic smoke test +prepare: + how: install + package: unzip +execute: + script: | + bnd wrap -b foo -v 1.2.3 /usr/share/java/ant/ant-bootstrap.jar + unzip ant-bootstrap.jar META-INF/MANIFEST.MF + grep ^Bundle-SymbolicName:.foo META-INF/MANIFEST.MF + grep ^Bundle-Version:.1.2.3 META-INF/MANIFEST.MF diff --git a/sources b/sources index d38f4f6..db42e51 100644 --- a/sources +++ b/sources @@ -1 +1,7 @@ SHA512 (aqute-bnd-6.2.0.tar.gz) = 4d475b98c51e538ea5dfc362012b98d3f0207cf954b5046bb2072455831a92ee98e7fd27f990ac9ff3eb0f7d9cd2e2227a830a9afc4cb19e409a96a5f56ad2af +SHA512 (aQute.libg-6.2.0.pom) = d7237813eba88e3497e19b3672f7371fcf0f80c80999b0339b173273e7e84a03438b83700b399deaf0422d3cb3ab447e0a2fef38a44224967ab9263f90faf782 +SHA512 (biz.aQute.bnd-6.2.0.pom) = e17460422144a86741401e8c1eb238590271f4f6141f03b73c904098336b36830c8003e2abea1fc025f04006ff82866581f66951e1a0d271835dc423fe655721 +SHA512 (biz.aQute.bnd.annotation-6.2.0.pom) = 8fa670018b656f020987b1f0187b13313dcda7f35310a1a7419d0a1737a3de37d74b50560ee138bf4412cad4cd1fd97557d61f5625df811c5621c6b631050e82 +SHA512 (biz.aQute.bnd.ant-6.2.0.pom) = 54926d8dfd4977ab105b4f0cc077a88ecda8aa46ab3f8b26198947600075bcff51719f1f03f2980a546140694a8bd5c9c9aa2eb203f1453d62c2f02cc3a32d98 +SHA512 (biz.aQute.bnd.util-6.2.0.pom) = 5fcdf1f863565187dc55ed821893a0cdb05fc061ff0eccecdd717ea28ee20804bf7640f48ac057a326d5924101bb0f149c9a3673deb396feca626f81b5656a80 +SHA512 (biz.aQute.bndlib-6.2.0.pom) = 06d2863c7bec5b420d1660122cf33b9ca5d6e25683e3e6bd25ea579155ece3c3d309b183588918dc8541169813d8a59155036c0a3d177dd19e35fb4fde4ffaa8