Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aqute-bnd for openSUSE:Factory checked in at 2023-09-20 13:29:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aqute-bnd (Old) and /work/SRC/openSUSE:Factory/.aqute-bnd.new.16627 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aqute-bnd" Wed Sep 20 13:29:19 2023 rev:10 rq:1112225 version:6.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/aqute-bnd/aqute-bnd.changes 2023-05-05 15:57:47.344258369 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.16627/aqute-bnd.changes 2023-09-20 13:32:07.276947153 +0200 @@ -1,0 +2,32 @@ +Mon Sep 18 05:23:18 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Update to aqute-bnd 6.3.1 + * https://github.com/bndtools/bnd/wiki/Changes-in-6.3.1 + * https://github.com/bndtools/bnd/wiki/Changes-in-6.3.0 + * https://github.com/bndtools/bnd/wiki/Changes-in-6.2.0 + * https://github.com/bndtools/bnd/wiki/Changes-in-6.1.0 + * https://github.com/bndtools/bnd/wiki/Changes-in-6.0.0 + * https://github.com/bndtools/bnd/wiki/Changes-in-5.3.0 +- Modified patches: + * 0001-Disable-removed-commands.patch + * 0003-Port-to-OSGI-7.0.0.patch -> 0002-Port-to-OSGI-7.0.0.patch + * 0004-maven-plugin-dependencies.patch -> + 0003-Remove-unmet-dependencies.patch + * reproducible-timestamps.patch + * reproducible-packages-list.patch + + rediff to changed context +- Removed patch: + * aqute-bnd-java8compat.patch + + handled by release=8 in ant javac task + +------------------------------------------------------------------- +Sat Sep 16 10:08:36 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Added patches: + * reproducible-timestamps.patch + + set "-reproducible" option to true by default + + use SOURCE_DATE_EPOCH for timestamp if available + * reproducible-packages-list.patch + + make the order of packages to import/export deterministic + +------------------------------------------------------------------- bnd-maven-plugin.changes: same change Old: ---- 0003-Port-to-OSGI-7.0.0.patch 0004-maven-plugin-dependencies.patch aQute.libg-5.2.0.pom aqute-bnd-java8compat.patch biz.aQute.bnd-5.2.0.pom biz.aQute.bnd.annotation-5.2.0.pom biz.aQute.bnd.ant-5.2.0.pom biz.aQute.bnd.exporters-5.2.0.pom biz.aQute.bndlib-5.2.0.pom bnd-5.2.0-build_xml.tar.xz bnd-5.2.0.tar.xz New: ---- 0002-Port-to-OSGI-7.0.0.patch 0003-Remove-unmet-dependencies.patch aQute.libg-6.3.1.pom biz.aQute.bnd-6.3.1.pom biz.aQute.bnd.annotation-6.3.1.pom biz.aQute.bnd.ant-6.3.1.pom biz.aQute.bnd.exporters-6.3.1.pom biz.aQute.bnd.util-6.3.1.pom biz.aQute.bndlib-6.3.1.pom bnd-6.3.1-build_xml.tar.xz bnd-6.3.1.tar.xz reproducible-packages-list.patch reproducible-timestamps.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aqute-bnd.spec ++++++ --- /var/tmp/diff_new_pack.dkcTcr/_old 2023-09-20 13:32:10.005044889 +0200 +++ /var/tmp/diff_new_pack.dkcTcr/_new 2023-09-20 13:32:10.005044889 +0200 @@ -17,7 +17,7 @@ Name: aqute-bnd -Version: 5.2.0 +Version: 6.3.1 Release: 0 Summary: BND Tool # Part of jpm is under BSD, but jpm is not included in binary RPM @@ -26,27 +26,29 @@ URL: https://bnd.bndtools.org/ Source0: bnd-%{version}.tar.xz Source1: bnd-%{version}-build_xml.tar.xz -Source2: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.ant/%{version}/biz.aQute.bnd.ant-%{version}.pom +Source2: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.exporters/%{version}/biz.aQute.bnd.exporters-%{version}.pom Source3: https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom Source4: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom Source5: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{version}/biz.aQute.bndlib-%{version}.pom Source6: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/%{version}/biz.aQute.bnd.annotation-%{version}.pom -Source7: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.exporters/%{version}/biz.aQute.bnd.exporters-%{version}.pom -Patch0: 0001-Disable-removed-commands.patch -Patch2: 0003-Port-to-OSGI-7.0.0.patch -Patch3: aqute-bnd-java8compat.patch -Patch4: 0004-maven-plugin-dependencies.patch +Source7: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.ant/%{version}/biz.aQute.bnd.ant-%{version}.pom +Source8: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/%{version}/biz.aQute.bnd.util-%{version}.pom +Patch1: 0001-Disable-removed-commands.patch +Patch2: 0002-Port-to-OSGI-7.0.0.patch +Patch3: 0003-Remove-unmet-dependencies.patch +Patch4: reproducible-timestamps.patch +Patch5: reproducible-packages-list.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: jline BuildRequires: osgi-annotation BuildRequires: osgi-compendium BuildRequires: osgi-core BuildRequires: slf4j +Requires: %{name}lib = %{version}-%{release} # Explicit javapackages-tools requires since bnd script uses # /usr/share/java-utils/java-functions -Requires: %{name}lib = %{version}-%{release} Requires: javapackages-tools BuildArch: noarch @@ -66,13 +68,6 @@ %package -n aqute-bndlib Summary: BND library Group: Development/Libraries/Java -Requires: mvn(biz.aQute.bnd:aQute.libg) -Requires: mvn(biz.aQute.bnd:biz.aQute.bnd.annotation) -Requires: mvn(org.osgi:osgi.annotation) -Requires: mvn(org.osgi:osgi.cmpn) -Requires: mvn(org.osgi:osgi.core) -Requires: mvn(org.slf4j:slf4j-api) -Requires: mvn(org.slf4j:slf4j-simple) %description -n aqute-bndlib %{summary}. @@ -91,89 +86,102 @@ build-jar-repository -s lib \ slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium ant jline -%patch0 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 -# the commands pull in more dependencies than we want (felix-resolver, jetty, jtwig, javapackager) -rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand,ExportReportCommand,MbrCommand,ReporterLogger}.java +# the commands pull in more dependencies than we want (felix-resolver, jetty) +rm biz.aQute.bnd/src/aQute/bnd/main/{ExportReportCommand,MbrCommand,RemoteCommand,ReporterLogger,ResolveCommand,Shell}.java sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info # libg pushd aQute.libg cp -p %{SOURCE3} pom.xml -%pom_remove_dep :::provided:: -%pom_remove_dep -r org.osgi:org.osgi.util.function -%pom_remove_dep -r org.osgi:org.osgi.util.promise -%pom_add_dep org.osgi:osgi.cmpn -%pom_add_dep org.slf4j:slf4j-api +%pom_add_dep org.osgi:osgi.cmpn:7 +%pom_remove_dep org.osgi:org.osgi.dto +%pom_remove_dep org.osgi:org.osgi.framework +%pom_remove_dep org.osgi:org.osgi.resource +%pom_remove_dep org.osgi:org.osgi.util.function +%pom_remove_dep org.osgi:org.osgi.util.promise +%pom_xpath_remove pom:dependency/pom:scope popd -# bndlib.annotations +# bnd.annotation pushd biz.aQute.bnd.annotation cp -p %{SOURCE6} pom.xml -%pom_remove_dep -r org.osgi:org.osgi.namespace.extender -%pom_remove_dep -r org.osgi:org.osgi.namespace.service -%pom_remove_dep -r org.osgi:org.osgi.resource -%pom_remove_dep -r org.osgi:org.osgi.service.serviceloader +%pom_add_dep org.osgi:osgi.core:7 +%pom_add_dep org.osgi:osgi.cmpn:7 +%pom_remove_dep org.osgi:org.osgi.namespace.extender +%pom_remove_dep org.osgi:org.osgi.namespace.service +%pom_remove_dep org.osgi:org.osgi.resource +%pom_remove_dep org.osgi:org.osgi.service.serviceloader +%pom_xpath_remove pom:dependency/pom:scope popd # bndlib pushd biz.aQute.bndlib cp -p %{SOURCE5} pom.xml -%pom_remove_dep :::provided:: -%pom_add_dep org.osgi:osgi.cmpn +%pom_add_dep org.osgi:osgi.cmpn:7 %pom_add_dep biz.aQute.bnd:aQute.libg:%{version} %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version} +%pom_remove_dep org.osgi:org.osgi.dto +%pom_remove_dep org.osgi:org.osgi.framework +%pom_remove_dep org.osgi:org.osgi.namespace.contract +%pom_remove_dep org.osgi:org.osgi.namespace.extender +%pom_remove_dep org.osgi:org.osgi.namespace.implementation +%pom_remove_dep org.osgi:org.osgi.namespace.service +%pom_remove_dep org.osgi:org.osgi.resource +%pom_remove_dep org.osgi:org.osgi.service.log +%pom_remove_dep org.osgi:org.osgi.service.repository +%pom_remove_dep org.osgi:org.osgi.util.function +%pom_remove_dep org.osgi:org.osgi.util.promise +%pom_remove_dep org.osgi:org.osgi.util.tracker +%pom_xpath_remove pom:dependency/pom:scope +popd + +# bnd.ant +pushd biz.aQute.bnd.ant +cp -p %{SOURCE7} pom.xml +%pom_xpath_remove pom:dependency/pom:scope popd # bnd.exporters pushd biz.aQute.bnd.exporters -cp -p %{SOURCE7} pom.xml -%pom_remove_dep :::provided:: -%pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version} -%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version} +cp -p %{SOURCE2} pom.xml +%pom_remove_dep org.osgi:org.osgi.service.subsystem +%pom_xpath_remove pom:dependency/pom:scope popd # bnd pushd biz.aQute.bnd cp -p %{SOURCE4} pom.xml -%pom_remove_dep :::provided:: -%pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version} +%pom_remove_dep :biz.aQute.resolve +%pom_remove_dep :biz.aQute.repository +%pom_remove_dep :biz.aQute.bnd.reporter +%pom_remove_dep :biz.aQute.remote.api +%pom_remove_dep :snakeyaml +%pom_remove_dep :jline +%pom_remove_dep org.osgi:org.osgi.service.coordinator +%pom_remove_dep org.osgi:org.osgi.service.resolver +%pom_remove_dep org.osgi:org.osgi.dto +%pom_remove_dep org.osgi:org.osgi.framework +%pom_remove_dep org.osgi:org.osgi.resource +%pom_remove_dep org.osgi:org.osgi.service.log +%pom_remove_dep org.osgi:org.osgi.service.repository +%pom_remove_dep org.osgi:org.osgi.util.function +%pom_remove_dep org.osgi:org.osgi.util.promise +%pom_remove_dep org.osgi:org.osgi.util.tracker +%pom_xpath_remove pom:dependency/pom:scope +popd + +# bnd.util +pushd biz.aQute.bnd.util +cp -p %{SOURCE8} pom.xml %pom_add_dep biz.aQute.bnd:aQute.libg:%{version} -%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version} -%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.ant:%{version} -%pom_add_dep org.osgi:osgi.annotation -%pom_add_dep org.osgi:osgi.core -%pom_add_dep org.osgi:osgi.cmpn -%pom_add_dep org.slf4j:slf4j-api -%pom_add_dep org.slf4j:slf4j-simple::runtime -popd - -# bndlib.ant -pushd biz.aQute.bnd.ant -cp -p %{SOURCE2} pom.xml -%pom_remove_dep :::provided:: -%pom_add_dep org.osgi:osgi.annotation -popd - -# maven-plugins -pushd maven -#rm bnd-shared-maven-lib/src/main/java/aQute/bnd/maven/lib/resolve/DependencyResolver.java -%pom_remove_dep -r :biz.aQute.resolve -%pom_remove_dep -r :biz.aQute.repository -# Unavailable reactor dependency - org.osgi.impl.bundle.repoindex.cli -%pom_disable_module bnd-indexer-maven-plugin -# Requires unbuilt parts of bnd -%pom_disable_module bnd-export-maven-plugin -%pom_disable_module bnd-resolver-maven-plugin -%pom_disable_module bnd-testing-maven-plugin -# Integration tests require Internet access -%pom_remove_plugin -r :maven-invoker-plugin -%pom_remove_plugin -r :maven-javadoc-plugin -%pom_remove_plugin -r :flatten-maven-plugin +%pom_xpath_remove pom:dependency/pom:scope popd %build @@ -184,6 +192,7 @@ # jars install -dm 0755 %{buildroot}%{_javadir}/%{name} install -pm 0644 biz.aQute.bnd.exporters/target/biz.aQute.bnd.exporters-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bnd.exporters.jar +install -pm 0644 biz.aQute.bnd.util/target/biz.aQute.bnd.util-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bnd.util.jar install -pm 0644 biz.aQute.bnd.annotation/target/biz.aQute.bnd.annotation-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bnd.annotation.jar install -pm 0644 aQute.libg/target/aQute.libg-%{version}.jar %{buildroot}%{_javadir}/%{name}/aQute.libg.jar install -pm 0644 biz.aQute.bndlib/target/biz.aQute.bndlib-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bndlib.jar @@ -191,21 +200,24 @@ install -pm 0644 biz.aQute.bnd.ant/target/biz.aQute.bnd.ant-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bnd.ant.jar # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 biz.aQute.bnd.exporters/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.exporters.pom +%{mvn_install_pom} biz.aQute.bnd.exporters/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.exporters.pom %add_maven_depmap %{name}/biz.aQute.bnd.exporters.pom %{name}/biz.aQute.bnd.exporters.jar -f bndlib -install -pm 0644 biz.aQute.bnd.annotation/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.annotation.pom +%{mvn_install_pom} biz.aQute.bnd.util/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.util.pom +%add_maven_depmap %{name}/biz.aQute.bnd.util.pom %{name}/biz.aQute.bnd.util.jar -f bndlib +%{mvn_install_pom} biz.aQute.bnd.annotation/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.annotation.pom %add_maven_depmap %{name}/biz.aQute.bnd.annotation.pom %{name}/biz.aQute.bnd.annotation.jar -f bndlib -install -pm 0644 aQute.libg/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/aQute.libg.pom +%{mvn_install_pom} aQute.libg/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/aQute.libg.pom %add_maven_depmap %{name}/aQute.libg.pom %{name}/aQute.libg.jar -f bndlib -install -pm 0644 biz.aQute.bndlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bndlib.pom +%{mvn_install_pom} biz.aQute.bndlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bndlib.pom %add_maven_depmap %{name}/biz.aQute.bndlib.pom %{name}/biz.aQute.bndlib.jar -f bndlib -a biz.aQute.bnd:bndlib,biz.aQute:bndlib -install -pm 0644 biz.aQute.bnd/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.pom +%{mvn_install_pom} biz.aQute.bnd/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.pom %add_maven_depmap %{name}/biz.aQute.bnd.pom %{name}/biz.aQute.bnd.jar -a biz.aQute.bnd:bnd,biz.aQute:bnd -install -pm 0644 biz.aQute.bnd.ant/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.ant.pom +%{mvn_install_pom} biz.aQute.bnd.ant/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/biz.aQute.bnd.ant.pom %add_maven_depmap %{name}/biz.aQute.bnd.ant.pom %{name}/biz.aQute.bnd.ant.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} mv biz.aQute.bnd.exporters/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bnd.exporters +mv biz.aQute.bnd.util/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bnd.util mv biz.aQute.bnd.annotation/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bnd.annotation mv aQute.libg/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/aQute.libg mv biz.aQute.bndlib/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bndlib ++++++ bnd-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.dkcTcr/_old 2023-09-20 13:32:10.045046322 +0200 +++ /var/tmp/diff_new_pack.dkcTcr/_new 2023-09-20 13:32:10.049046466 +0200 @@ -17,7 +17,7 @@ Name: bnd-maven-plugin -Version: 5.2.0 +Version: 6.3.1 Release: 0 Summary: BND Maven plugin # Part of jpm is under BSD, but jpm is not included in binary RPM @@ -25,24 +25,17 @@ Group: Development/Libraries/Java URL: https://bnd.bndtools.org/ Source0: bnd-%{version}.tar.xz -Patch0: 0001-Disable-removed-commands.patch -Patch2: 0003-Port-to-OSGI-7.0.0.patch -Patch3: aqute-bnd-java8compat.patch -Patch4: 0004-maven-plugin-dependencies.patch +Patch1: 0001-Disable-removed-commands.patch +Patch2: 0002-Port-to-OSGI-7.0.0.patch +Patch3: 0003-Remove-unmet-dependencies.patch +Patch4: reproducible-timestamps.patch +Patch5: reproducible-packages-list.patch BuildRequires: fdupes BuildRequires: maven-local -BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) >= %{version} BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.shared:maven-mapping) -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-compat) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.eclipse.aether:aether-api) -BuildRequires: mvn(org.osgi:osgi.cmpn) -BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildArch: noarch %description @@ -58,21 +51,19 @@ %prep %setup -q -n bnd-%{version} -%patch0 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/configuration maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib +cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/executions maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib pushd maven %pom_remove_dep -r :biz.aQute.bnd.maven -%pom_remove_dep -r :biz.aQute.resolve -%pom_remove_dep -r :biz.aQute.repository -%pom_remove_dep -r :biz.aQute.bnd.embedded-repo - # Unavailable reactor dependency - org.osgi.impl.bundle.repoindex.cli %pom_disable_module bnd-indexer-maven-plugin # Requires unbuilt parts of bnd -%pom_disable_module bnd-baseline-maven-plugin %pom_disable_module bnd-export-maven-plugin %pom_disable_module bnd-reporter-maven-plugin %pom_disable_module bnd-resolver-maven-plugin @@ -81,11 +72,13 @@ # Integration tests require Internet access %pom_remove_plugin -r :maven-invoker-plugin %pom_remove_plugin -r :maven-javadoc-plugin + %pom_remove_plugin -r :flatten-maven-plugin -%pom_remove_plugin -r :maven-source-plugin -popd + +%pom_remove_dep -r org.junit:junit-bom %{mvn_package} biz.aQute.bnd:bnd-plugin-parent __noinstall +popd %build pushd maven ++++++ 0001-Disable-removed-commands.patch ++++++ --- /var/tmp/diff_new_pack.dkcTcr/_old 2023-09-20 13:32:10.069047182 +0200 +++ /var/tmp/diff_new_pack.dkcTcr/_new 2023-09-20 13:32:10.073047325 +0200 @@ -1,18 +1,20 @@ -diff -Napur bnd-5.1.1.REL.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java bnd-5.1.1.REL/biz.aQute.bnd/src/aQute/bnd/main/bnd.java ---- bnd-5.1.1.REL.orig/biz.aQute.bnd/src/aQute/bnd/main/bnd.java 2020-06-16 23:03:04.000000000 +0200 -+++ bnd-5.1.1.REL/biz.aQute.bnd/src/aQute/bnd/main/bnd.java 2021-02-17 12:56:39.434022335 +0100 -@@ -104,7 +104,6 @@ import aQute.bnd.osgi.Resource; +diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java +index a787c32..fc241a2 100644 +--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java ++++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java +@@ -110,7 +110,6 @@ import aQute.bnd.osgi.Resource; import aQute.bnd.osgi.Verifier; import aQute.bnd.osgi.eclipse.EclipseClasspath; import aQute.bnd.print.JarPrinter; -import aQute.bnd.repository.maven.provider.NexusCommand; + import aQute.bnd.result.Result; import aQute.bnd.service.Actionable; import aQute.bnd.service.RepositoryPlugin; - import aQute.bnd.service.action.Action; -@@ -3905,54 +3904,6 @@ public class bnd extends Processor { +@@ -3921,54 +3920,6 @@ public class bnd extends Processor { + getInfo(profiles); } - /** +- /** - * Resolve command - * - * @throws Exception @@ -60,11 +62,26 @@ - rc.close(); - } - -- /** + /** * Export a bndrun file */ - interface ExportOptions extends ProjectWorkspaceOptions { -@@ -4462,24 +4413,6 @@ public class bnd extends Processor { +@@ -4424,15 +4375,6 @@ public class bnd extends Processor { + } + } + +- @Description("Start an interactive shell") +- public void _shell(Shell.ShellOptions options) throws Exception { +- try (Shell shell = new Shell(this, options)) { +- shell.loop(); +- } finally { +- out.println("done"); +- } +- } +- + public Workspace getWorkspace() { + return workspace; + } +@@ -4479,24 +4421,6 @@ public class bnd extends Processor { } @@ -86,7 +103,7 @@ - getInfo(c); - } - - @Description("Generate source code") - interface GenerateOptions extends ProjectWorkspaceOptions { - + @Description("Shows the differences between two XML resource repositories") + public void _xmlrepodiff(XmlRepoDiffOptions options) throws Exception { + try (XmlRepoDiffCommand cmd = new XmlRepoDiffCommand(this)) { ++++++ 0003-Port-to-OSGI-7.0.0.patch -> 0002-Port-to-OSGI-7.0.0.patch ++++++ ++++++ 0003-Remove-unmet-dependencies.patch ++++++ ++++ 1404 lines (skipped) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.dkcTcr/_old 2023-09-20 13:32:10.129049332 +0200 +++ /var/tmp/diff_new_pack.dkcTcr/_new 2023-09-20 13:32:10.133049475 +0200 @@ -2,10 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/bndtools/bnd.git</param> - <param name="revision">5.2.0.REL</param> - <param name="match-tag">*.REL</param> + <param name="revision">6.3.1</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="versionrewrite-pattern">(.*).REL</param> <param name="exclude">gradlew*</param> <param name="exclude">docs</param> <param name="exclude">**.jar</param> ++++++ aQute.libg-5.2.0.pom -> aQute.libg-6.3.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/aQute.libg-5.2.0.pom 2021-11-10 21:47:18.083833761 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.16627/aQute.libg-6.3.1.pom 2023-09-20 13:32:07.268946866 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>aQute.libg</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <description>A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only.</description> <name>aQute.libg</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:g...@github.com:bndtools/bnd.git</developerConnection> - <tag>5.2.0.REL</tag> + <tag>6.3.1</tag> </scm> <developers> <developer> @@ -41,7 +41,7 @@ <developer> <id>bjhargrave</id> <name>BJ Hargrave</name> - <email>b...@bjhargrave.com</email> + <email>b...@hargrave.dev</email> <url>https://github.com/bjhargrave</url> <organization>IBM</organization> <organizationUrl>https://developer.ibm.com</organizationUrl> @@ -67,7 +67,7 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.annotation</artifactId> - <version>7.0.0</version> + <version>8.1.0</version> <scope>provided</scope> </dependency> <dependency> @@ -78,20 +78,32 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.util.function</artifactId> - <version>1.1.0</version> + <artifactId>org.osgi.dto</artifactId> + <version>1.0.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.util.promise</artifactId> - <version>1.1.1</version> + <artifactId>org.osgi.resource</artifactId> + <version>1.0.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.framework</artifactId> + <version>1.8.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> - <version>6.0.0</version> + <artifactId>org.osgi.util.function</artifactId> + <version>1.2.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.promise</artifactId> + <version>1.2.0</version> <scope>compile</scope> </dependency> </dependencies> ++++++ biz.aQute.bnd-5.2.0.pom -> biz.aQute.bnd-6.3.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd-5.2.0.pom 2021-11-10 21:47:18.111833774 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.16627/biz.aQute.bnd-6.3.1.pom 2023-09-20 13:32:07.296947870 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <description>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.</description> <name>biz.aQute.bnd</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:g...@github.com:bndtools/bnd.git</developerConnection> - <tag>5.2.0.REL</tag> + <tag>6.3.1</tag> </scm> <developers> <developer> @@ -41,7 +41,7 @@ <developer> <id>bjhargrave</id> <name>BJ Hargrave</name> - <email>b...@bjhargrave.com</email> + <email>b...@hargrave.dev</email> <url>https://github.com/bjhargrave</url> <organization>IBM</organization> <organizationUrl>https://developer.ibm.com</organizationUrl> @@ -66,8 +66,32 @@ <dependencies> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> - <version>6.0.0</version> + <artifactId>org.osgi.dto</artifactId> + <version>1.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.resource</artifactId> + <version>1.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.framework</artifactId> + <version>1.8.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.tracker</artifactId> + <version>1.5.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.coordinator</artifactId> + <version>1.0.2</version> <scope>provided</scope> </dependency> <dependency> @@ -83,45 +107,69 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.resolver</artifactId> + <version>1.1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.function</artifactId> + <version>1.2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.promise</artifactId> + <version>1.2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.bnd.util</artifactId> + <version>6.3.1</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.ant</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.resolve</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.repository</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.exporters</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.reporter</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.remote.api</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <scope>provided</scope> </dependency> <dependency> ++++++ biz.aQute.bnd.annotation-5.2.0.pom -> biz.aQute.bnd.annotation-6.3.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd.annotation-5.2.0.pom 2021-11-10 21:47:18.123833779 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.16627/biz.aQute.bnd.annotation-6.3.1.pom 2023-09-20 13:32:07.304948156 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.annotation</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <description>bnd Annotations Library</description> <name>biz.aQute.bnd.annotation</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:g...@github.com:bndtools/bnd.git</developerConnection> - <tag>5.2.0.REL</tag> + <tag>6.3.1</tag> </scm> <developers> <developer> @@ -41,7 +41,7 @@ <developer> <id>bjhargrave</id> <name>BJ Hargrave</name> - <email>b...@bjhargrave.com</email> + <email>b...@hargrave.dev</email> <url>https://github.com/bjhargrave</url> <organization>IBM</organization> <organizationUrl>https://developer.ibm.com</organizationUrl> @@ -67,20 +67,20 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.annotation</artifactId> - <version>7.0.0</version> - <scope>compile</scope> + <version>8.1.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.namespace.extender</artifactId> <version>1.0.1</version> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.namespace.service</artifactId> <version>1.0.0</version> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> ++++++ biz.aQute.bnd.ant-5.2.0.pom -> biz.aQute.bnd.ant-6.3.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd.ant-5.2.0.pom 2021-11-10 21:47:18.131833782 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.16627/biz.aQute.bnd.ant-6.3.1.pom 2023-09-20 13:32:07.316948586 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.ant</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <description>Bnd Ant Tasks</description> <name>biz.aQute.bnd.ant</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:g...@github.com:bndtools/bnd.git</developerConnection> - <tag>5.2.0.REL</tag> + <tag>6.3.1</tag> </scm> <developers> <developer> @@ -41,7 +41,7 @@ <developer> <id>bjhargrave</id> <name>BJ Hargrave</name> - <email>b...@bjhargrave.com</email> + <email>b...@hargrave.dev</email> <url>https://github.com/bjhargrave</url> <organization>IBM</organization> <organizationUrl>https://developer.ibm.com</organizationUrl> @@ -67,13 +67,19 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.annotation</artifactId> - <version>7.0.0</version> + <version>8.1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.bnd.util</artifactId> + <version>6.3.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <scope>compile</scope> </dependency> <dependency> @@ -85,7 +91,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.8</version> + <version>1.10.12</version> <scope>compile</scope> </dependency> </dependencies> ++++++ biz.aQute.bnd.exporters-5.2.0.pom -> biz.aQute.bnd.exporters-6.3.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd.exporters-5.2.0.pom 2021-11-10 21:47:18.143833788 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.16627/biz.aQute.bnd.exporters-6.3.1.pom 2023-09-20 13:32:07.328949016 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.exporters</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <description>biz.aQute.bnd.exporters</description> <name>biz.aQute.bnd.exporters</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:g...@github.com:bndtools/bnd.git</developerConnection> - <tag>5.2.0.REL</tag> + <tag>6.3.1</tag> </scm> <developers> <developer> @@ -41,7 +41,7 @@ <developer> <id>bjhargrave</id> <name>BJ Hargrave</name> - <email>b...@bjhargrave.com</email> + <email>b...@hargrave.dev</email> <url>https://github.com/bjhargrave</url> <organization>IBM</organization> <organizationUrl>https://developer.ibm.com</organizationUrl> @@ -78,8 +78,14 @@ </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.bnd.util</artifactId> + <version>6.3.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <scope>compile</scope> </dependency> <dependency> ++++++ biz.aQute.bnd.util-6.3.1.pom ++++++ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.util</artifactId> <version>6.3.1</version> <description>Util classes</description> <name>biz.aQute.bnd.util</name> <url>https://bnd.bndtools.org/</url> <organization> <name>Bndtools</name> <url>https://bndtools.org/</url> </organization> <licenses> <license> <name>(Apache-2.0 OR EPL-2.0)</name> <url>https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0</url> <distribution>repo</distribution> <comments>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.</comments> </license> </licenses> <scm> <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:g...@github.com:bndtools/bnd.git</developerConnection> <tag>6.3.1</tag> </scm> <developers> <developer> <id>pkriens</id> <email>peter.kri...@aqute.biz</email> <name>Peter Kriens</name> <organization>Bndtools</organization> <organizationUrl>https://github.com/bndtools</organizationUrl> <roles> <role>architect</role> <role>developer</role> </roles> <timezone>1</timezone> </developer> <developer> <id>bjhargrave</id> <name>BJ Hargrave</name> <email>b...@hargrave.dev</email> <url>https://github.com/bjhargrave</url> <organization>IBM</organization> <organizationUrl>https://developer.ibm.com</organizationUrl> <roles> <role>developer</role> </roles> <timezone>America/New_York</timezone> </developer> <developer> <id>rotty3000</id> <name>Ray Augé</name> <email>raymond.a...@liferay.com</email> <url>https://rotty3000.github.io</url> <organization>Liferay Inc.</organization> <organizationUrl>https://www.liferay.com</organizationUrl> <roles> <role>developer</role> </roles> <timezone>America/New_York</timezone> </developer> </developers> <dependencies> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.annotation</artifactId> <version>8.1.0</version> <scope>provided</scope> </dependency> </dependencies> </project> ++++++ biz.aQute.bndlib-5.2.0.pom -> biz.aQute.bndlib-6.3.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bndlib-5.2.0.pom 2021-11-10 21:47:18.151833791 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.16627/biz.aQute.bndlib-6.3.1.pom 2023-09-20 13:32:07.356950019 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>5.2.0</version> + <version>6.3.1</version> <description>bndlib: A Swiss Army Knife for OSGi</description> <name>biz.aQute.bndlib</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:g...@github.com:bndtools/bnd.git</developerConnection> - <tag>5.2.0.REL</tag> + <tag>6.3.1</tag> </scm> <developers> <developer> @@ -41,7 +41,7 @@ <developer> <id>bjhargrave</id> <name>BJ Hargrave</name> - <email>b...@bjhargrave.com</email> + <email>b...@hargrave.dev</email> <url>https://github.com/bjhargrave</url> <organization>IBM</organization> <organizationUrl>https://developer.ibm.com</organizationUrl> @@ -67,14 +67,32 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.annotation</artifactId> - <version>7.0.0</version> + <version>8.1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> - <version>6.0.0</version> - <scope>provided</scope> + <artifactId>org.osgi.dto</artifactId> + <version>1.0.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.resource</artifactId> + <version>1.0.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.framework</artifactId> + <version>1.8.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.util.tracker</artifactId> + <version>1.5.4</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -104,25 +122,31 @@ <groupId>org.osgi</groupId> <artifactId>org.osgi.service.log</artifactId> <version>1.3.0</version> - <scope>provided</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.repository</artifactId> <version>1.1.0</version> - <scope>provided</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.function</artifactId> - <version>1.1.0</version> - <scope>provided</scope> + <version>1.2.0</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.promise</artifactId> - <version>1.1.1</version> - <scope>provided</scope> + <version>1.2.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.bnd.util</artifactId> + <version>6.3.1</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> ++++++ bnd-5.2.0-build_xml.tar.xz -> bnd-6.3.1-build_xml.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aQute.libg/build.xml new/aQute.libg/build.xml --- old/aQute.libg/build.xml 2019-02-11 17:31:19.000000000 +0100 +++ new/aQute.libg/build.xml 2023-09-18 08:54:34.646281774 +0200 @@ -58,6 +58,7 @@ deprecation="true" encoding="UTF-8" target="${compiler.target}" + release="${compiler.release}" verbose="false" fork="false" source="${compiler.source}"> @@ -113,11 +114,11 @@ index="false" basedir="${build.outputDir}" excludes="**/package.html"> - <manifest> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - </manifest> + <manifest> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + </manifest> </jar> </target> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biz.aQute.bnd/build.xml new/biz.aQute.bnd/build.xml --- old/biz.aQute.bnd/build.xml 2021-02-17 10:56:06.000000000 +0100 +++ new/biz.aQute.bnd/build.xml 2023-09-18 08:53:57.956036110 +0200 @@ -28,10 +28,12 @@ <fileset dir="${libdir}"> <include name="**/*.jar"/> </fileset> - <pathelement location="../biz.aQute.bnd.exporters/target/biz.aQute.bnd.exporters-${project.version}.jar"/> - <pathelement location="../biz.aQute.bnd.annotation/target/biz.aQute.bnd.annotation-${project.version}.jar"/> - <pathelement location="../aQute.libg/target/aQute.libg-${project.version}.jar"/> - <pathelement location="../biz.aQute.bndlib/target/biz.aQute.bndlib-${project.version}.jar"/> + <pathelement location="../biz.aQute.bnd.util/target/classes"/> + <pathelement location="../biz.aQute.bnd.annotation/target/classes"/> + <pathelement location="../aQute.libg/target/classes"/> + <pathelement location="../biz.aQute.bndlib/target/classes"/> + <pathelement location="../biz.aQute.bnd.exporters/target/classes"/> + <pathelement location="../biz.aQute.bnd.ant/target/classes"/> </path> <!-- ====================================================================== --> @@ -55,6 +57,7 @@ deprecation="true" encoding="UTF-8" target="${compiler.target}" + release="${compiler.release}" verbose="false" fork="false" source="${compiler.source}"> @@ -110,11 +113,11 @@ index="false" basedir="${build.outputDir}" excludes="**/package.html"> - <manifest> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - </manifest> + <manifest> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + </manifest> </jar> </target> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biz.aQute.bnd.annotation/build.xml new/biz.aQute.bnd.annotation/build.xml --- old/biz.aQute.bnd.annotation/build.xml 2021-02-18 01:47:17.000000000 +0100 +++ new/biz.aQute.bnd.annotation/build.xml 2023-09-18 08:54:21.526193925 +0200 @@ -51,6 +51,7 @@ deprecation="true" encoding="UTF-8" target="${compiler.target}" + release="${compiler.release}" verbose="false" fork="false" source="${compiler.source}"> @@ -106,11 +107,11 @@ index="false" basedir="${build.outputDir}" excludes="**/package.html"> - <manifest> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - </manifest> + <manifest> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + </manifest> </jar> </target> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biz.aQute.bnd.ant/build.xml new/biz.aQute.bnd.ant/build.xml --- old/biz.aQute.bnd.ant/build.xml 2021-11-10 07:36:01.794697647 +0100 +++ new/biz.aQute.bnd.ant/build.xml 2023-09-18 08:54:09.052777077 +0200 @@ -28,9 +28,10 @@ <fileset dir="${libdir}"> <include name="**/*.jar"/> </fileset> - <pathelement location="../biz.aQute.bnd.annotation/target/biz.aQute.bnd.annotation-${project.version}.jar"/> - <pathelement location="../aQute.libg/target/aQute.libg-${project.version}.jar"/> - <pathelement location="../biz.aQute.bndlib/target/biz.aQute.bndlib-${project.version}.jar"/> + <pathelement location="../biz.aQute.bnd.annotation/target/classes"/> + <pathelement location="../aQute.libg/target/classes"/> + <pathelement location="../biz.aQute.bndlib/target/classes"/> + <pathelement location="../biz.aQute.bnd.util/target/classes"/> </path> <!-- ====================================================================== --> @@ -54,6 +55,7 @@ deprecation="true" encoding="UTF-8" target="${compiler.target}" + release="${compiler.release}" verbose="false" fork="false" source="${compiler.source}"> @@ -109,11 +111,11 @@ index="false" basedir="${build.outputDir}" excludes="**/package.html"> - <manifest> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - </manifest> + <manifest> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + </manifest> </jar> </target> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biz.aQute.bnd.exporters/build.xml new/biz.aQute.bnd.exporters/build.xml --- old/biz.aQute.bnd.exporters/build.xml 2021-02-18 01:47:30.000000000 +0100 +++ new/biz.aQute.bnd.exporters/build.xml 2023-09-18 08:53:47.885968686 +0200 @@ -54,6 +54,7 @@ deprecation="true" encoding="UTF-8" target="${compiler.target}" + release="${compiler.release}" verbose="false" fork="false" source="${compiler.source}"> @@ -109,11 +110,11 @@ index="false" basedir="${build.outputDir}" excludes="**/package.html"> - <manifest> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - </manifest> + <manifest> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + </manifest> </jar> </target> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biz.aQute.bnd.reporter/build.xml new/biz.aQute.bnd.reporter/build.xml --- old/biz.aQute.bnd.reporter/build.xml 2021-02-17 11:16:13.000000000 +0100 +++ new/biz.aQute.bnd.reporter/build.xml 2023-09-18 08:53:19.989115233 +0200 @@ -54,6 +54,7 @@ deprecation="true" encoding="UTF-8" target="${compiler.target}" + release="${compiler.release}" verbose="false" fork="false" source="${compiler.source}"> @@ -107,11 +108,11 @@ index="false" basedir="${build.outputDir}" excludes="**/package.html"> - <manifest> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - </manifest> + <manifest> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + </manifest> </jar> </target> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biz.aQute.bnd.util/build.xml new/biz.aQute.bnd.util/build.xml --- old/biz.aQute.bnd.util/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/biz.aQute.bnd.util/build.xml 2023-09-18 08:52:58.452304371 +0200 @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="biz.aQute.bnd.util" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="build.properties"/> + + <property name="libdir" value="../lib"/> + + <property name="project.artifactId" value="biz.aQute.bnd.util"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src"/> + <property name="build.resourceDir" value="src"/> + + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <fileset dir="${libdir}"> + <include name="**/*.jar"/> + </fileset> + <pathelement location="../aQute.libg/target/classes"/> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + encoding="UTF-8" + target="${compiler.target}" + release="${compiler.release}" + verbose="false" + fork="false" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <copy todir="${build.outputDir}"> + <fileset dir="${build.resourceDir}"> + <exclude name="**/*.java"/> + <exclude name="**/packageinfo"/> + </fileset> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + source="${compiler.source}" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + encoding="UTF-8" + linksource="false" + breakiterator="false"> + <classpath refid="build.classpath"/> + </javadoc> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biz.aQute.bndlib/build.xml new/biz.aQute.bndlib/build.xml --- old/biz.aQute.bndlib/build.xml 2019-02-11 17:32:48.000000000 +0100 +++ new/biz.aQute.bndlib/build.xml 2023-09-18 08:53:31.612526392 +0200 @@ -28,8 +28,9 @@ <fileset dir="${libdir}"> <include name="**/*.jar"/> </fileset> - <pathelement location="../biz.aQute.bnd.annotation/target/biz.aQute.bnd.annotation-${project.version}.jar"/> - <pathelement location="../aQute.libg/target/aQute.libg-${project.version}.jar"/> + <pathelement location="../biz.aQute.bnd.annotation/target/classes"/> + <pathelement location="../aQute.libg/target/classes"/> + <pathelement location="../biz.aQute.bnd.util/target/classes"/> </path> <!-- ====================================================================== --> @@ -53,6 +54,7 @@ deprecation="true" encoding="UTF-8" target="${compiler.target}" + release="${compiler.release}" verbose="false" fork="false" source="${compiler.source}"> @@ -108,11 +110,11 @@ index="false" basedir="${build.outputDir}" excludes="**/package.html"> - <manifest> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - </manifest> + <manifest> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + </manifest> </jar> </target> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.xml new/build.xml --- old/build.xml 2021-11-10 07:19:18.100153667 +0100 +++ new/build.xml 2023-09-18 08:51:49.668510499 +0200 @@ -2,9 +2,10 @@ <project name="parent" default="package" basedir="."> - <property name="project.version" value="5.2.0"/> - <property name="compiler.source" value="1.8"/> + <property name="project.version" value="6.3.1"/> + <property name="compiler.source" value="8"/> <property name="compiler.target" value="${compiler.source}"/> + <property name="compiler.release" value="${compiler.source}"/> <property name="project.groupId" value="biz.aQute.bnd"/> <!-- ====================================================================== --> @@ -12,12 +13,13 @@ <!-- ====================================================================== --> <target name="clean" description="Clean the output directory"> - <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="clean"/> <ant antfile="build.xml" dir="aQute.libg" target="clean"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="clean"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.util" target="clean"/> <ant antfile="build.xml" dir="biz.aQute.bndlib" target="clean"/> - <ant antfile="build.xml" dir="biz.aQute.bnd.exporters" target="clean"/> - <ant antfile="build.xml" dir="biz.aQute.bnd" target="clean"/> <ant antfile="build.xml" dir="biz.aQute.bnd.ant" target="clean"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.exporters" target="compile"/> + <ant antfile="build.xml" dir="biz.aQute.bnd" target="compile"/> </target> <!-- ====================================================================== --> @@ -25,12 +27,41 @@ <!-- ====================================================================== --> <target name="compile" description="Compile the code"> - <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="compile"/> <ant antfile="build.xml" dir="aQute.libg" target="compile"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="compile"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.util" target="compile"/> <ant antfile="build.xml" dir="biz.aQute.bndlib" target="compile"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.ant" target="compile"/> <ant antfile="build.xml" dir="biz.aQute.bnd.exporters" target="compile"/> <ant antfile="build.xml" dir="biz.aQute.bnd" target="compile"/> - <ant antfile="build.xml" dir="biz.aQute.bnd.ant" target="compile"/> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" description="Compile the test code"> + <ant antfile="build.xml" dir="aQute.libg" target="compile-tests"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="compile-tests"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.util" target="compile-tests"/> + <ant antfile="build.xml" dir="biz.aQute.bndlib" target="compile-tests"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.ant" target="compile-tests"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.exporters" target="compile-tests"/> + <ant antfile="build.xml" dir="biz.aQute.bnd" target="compile-tests"/> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" description="Run the test cases"> + <ant antfile="build.xml" dir="aQute.libg" target="test"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="test"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.util" target="test"/> + <ant antfile="build.xml" dir="biz.aQute.bndlib" target="test"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.ant" target="test"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.exporters" target="test"/> + <ant antfile="build.xml" dir="biz.aQute.bnd" target="test"/> </target> <!-- ====================================================================== --> @@ -38,12 +69,13 @@ <!-- ====================================================================== --> <target name="javadoc" description="Generates the Javadoc of the application"> - <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="javadoc"/> <ant antfile="build.xml" dir="aQute.libg" target="javadoc"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="javadoc"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.util" target="javadoc"/> <ant antfile="build.xml" dir="biz.aQute.bndlib" target="javadoc"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.ant" target="javadoc"/> <ant antfile="build.xml" dir="biz.aQute.bnd.exporters" target="javadoc"/> <ant antfile="build.xml" dir="biz.aQute.bnd" target="javadoc"/> - <ant antfile="build.xml" dir="biz.aQute.bnd.ant" target="javadoc"/> </target> <!-- ====================================================================== --> @@ -51,18 +83,13 @@ <!-- ====================================================================== --> <target name="package" description="Package the application"> - <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="package"/> <ant antfile="build.xml" dir="aQute.libg" target="package"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.annotation" target="package"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.util" target="package"/> <ant antfile="build.xml" dir="biz.aQute.bndlib" target="package"/> + <ant antfile="build.xml" dir="biz.aQute.bnd.ant" target="package"/> <ant antfile="build.xml" dir="biz.aQute.bnd.exporters" target="package"/> <ant antfile="build.xml" dir="biz.aQute.bnd" target="package"/> - <ant antfile="build.xml" dir="biz.aQute.bnd.ant" target="package"/> </target> - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - </project> ++++++ bnd-5.2.0-build_xml.tar.xz -> bnd-6.3.1.tar.xz ++++++ ++++ 657596 lines of diff (skipped) ++++++ reproducible-packages-list.patch ++++++ diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java index b127fc68..679a1051 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java @@ -1,9 +1,9 @@ package aQute.bnd.osgi; import java.util.Collection; -import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import aQute.bnd.header.Attrs; import aQute.bnd.osgi.Descriptors.PackageRef; @@ -21,11 +21,11 @@ public class Packages implements Map<PackageRef, Attrs> { } public Packages(Packages other) { - map = new LinkedHashMap<>(other.map); + map = new TreeMap<>(other.map); } public Packages() { - map = new LinkedHashMap<>(); + map = new TreeMap<>(); } @Override ++++++ reproducible-timestamps.patch ++++++ diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java index 10ec3fd0..7dd75418 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java @@ -114,7 +114,7 @@ public class Jar implements Closeable { private String lastModifiedReason; private boolean doNotTouchManifest; private boolean nomanifest; - private boolean reproducible; + private boolean reproducible = true; private Compression compression = Compression.DEFLATE; private boolean closed; private String[] algorithms; diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java index e9ecd39e..f7f83d83 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java @@ -904,6 +904,10 @@ public class Macro { reporter.warning("Too many arguments for tstamp: %s", Arrays.toString(args)); } + if (System.getenv("SOURCE_DATE_EPOCH") != null) { + now = 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")); + } + SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.US); sdf.setTimeZone(tz); return sdf.format(new Date(now)); @@ -922,6 +926,11 @@ public class Macro { } else { now = System.currentTimeMillis(); } + + if (System.getenv("SOURCE_DATE_EPOCH") != null) { + now = 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")); + } + return now; }
