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 2021-11-10 21:46:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aqute-bnd (Old) and /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aqute-bnd" Wed Nov 10 21:46:38 2021 rev:7 rq:930610 version:5.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/aqute-bnd/aqute-bnd.changes 2021-10-19 23:04:20.833287112 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/aqute-bnd.changes 2021-11-10 21:47:18.091833765 +0100 @@ -1,0 +2,9 @@ +Wed Nov 10 08:13:30 UTC 2021 - Fridrich Strba <fst...@suse.com> + +- Update to aqute-bnd 5.1.1 + * ant plugin is in separate artifact +- Removed patch: + * 0002-Fix-ant-compatibility.patch + + fixed by upstream + +------------------------------------------------------------------- bnd-maven-plugin.changes: same change Old: ---- 0002-Fix-ant-compatibility.patch 5.1.1.REL.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.bnd.exporters-5.1.1.pom biz.aQute.bndlib-5.1.1.pom bnd-5.1.1.REL-build_xml.tar.xz New: ---- 5.2.0.REL.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.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.REL-build_xml.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aqute-bnd.spec ++++++ --- /var/tmp/diff_new_pack.Q5EXXQ/_old 2021-11-10 21:47:20.139834657 +0100 +++ /var/tmp/diff_new_pack.Q5EXXQ/_new 2021-11-10 21:47:20.143834659 +0100 @@ -17,7 +17,7 @@ Name: aqute-bnd -Version: 5.1.1 +Version: 5.2.0 Release: 0 Summary: BND Tool # Part of jpm is under BSD, but jpm is not included in binary RPM @@ -26,13 +26,13 @@ URL: https://bnd.bndtools.org/ Source0: https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz Source1: bnd-%{version}.REL-build_xml.tar.xz +Source2: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.ant/%{version}/biz.aQute.bnd.ant-%{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 -Patch1: 0002-Fix-ant-compatibility.patch Patch2: 0003-Port-to-OSGI-7.0.0.patch Patch3: aqute-bnd-java8compat.patch Patch4: 0004-maven-plugin-dependencies.patch @@ -95,7 +95,6 @@ slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium ant jline %patch0 -p1 -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -148,7 +147,7 @@ %pom_add_dep biz.aQute.bnd:biz.aQute.bndlib:%{version} %pom_add_dep biz.aQute.bnd:aQute.libg:%{version} %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version} -%pom_add_dep org.apache.ant:ant +%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 @@ -156,6 +155,13 @@ %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 @@ -185,6 +191,7 @@ 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 install -pm 0644 biz.aQute.bnd/target/biz.aQute.bnd-%{version}.jar %{buildroot}%{_javadir}/%{name}/biz.aQute.bnd.jar +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 @@ -197,6 +204,8 @@ %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 %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 +%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 @@ -204,6 +213,7 @@ mv aQute.libg/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/aQute.libg mv biz.aQute.bndlib/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bndlib mv biz.aQute.bnd/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bnd +mv biz.aQute.bnd.ant/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/biz.aQute.bnd.ant %fdupes -s %{buildroot}%{_javadocdir} install -d -m 755 %{buildroot}%{_sysconfdir}/ant.d ++++++ bnd-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.Q5EXXQ/_old 2021-11-10 21:47:20.175834673 +0100 +++ /var/tmp/diff_new_pack.Q5EXXQ/_new 2021-11-10 21:47:20.179834675 +0100 @@ -17,7 +17,7 @@ Name: bnd-maven-plugin -Version: 5.1.1 +Version: 5.2.0 Release: 0 Summary: BND Maven plugin # Part of jpm is under BSD, but jpm is not included in binary RPM @@ -26,7 +26,6 @@ URL: https://bnd.bndtools.org/ Source0: https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz Patch0: 0001-Disable-removed-commands.patch -Patch1: 0002-Fix-ant-compatibility.patch Patch2: 0003-Port-to-OSGI-7.0.0.patch Patch3: aqute-bnd-java8compat.patch Patch4: 0004-maven-plugin-dependencies.patch @@ -60,7 +59,6 @@ %setup -q -n bnd-%{version}.REL %patch0 -p1 -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 ++++++ 5.1.1.REL.tar.gz -> 5.2.0.REL.tar.gz ++++++ /work/SRC/openSUSE:Factory/aqute-bnd/5.1.1.REL.tar.gz /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/5.2.0.REL.tar.gz differ: char 12, line 1 ++++++ aQute.libg-5.1.1.pom -> aQute.libg-5.2.0.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/aQute.libg-5.1.1.pom 2021-10-19 23:04:20.813287103 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/aQute.libg-5.2.0.pom 2021-11-10 21:47:18.083833761 +0100 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>aQute.libg</artifactId> - <version>5.1.1</version> + <version>5.2.0</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.1.1.REL</tag> + <tag>5.2.0.REL</tag> </scm> <developers> <developer> @@ -48,6 +48,18 @@ <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> ++++++ biz.aQute.bnd-5.1.1.pom -> biz.aQute.bnd-5.2.0.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd-5.1.1.pom 2021-10-19 23:04:20.853287121 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/biz.aQute.bnd-5.2.0.pom 2021-11-10 21:47:18.111833774 +0100 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd</artifactId> - <version>5.1.1</version> + <version>5.2.0</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.1.1.REL</tag> + <tag>5.2.0.REL</tag> </scm> <developers> <developer> @@ -50,6 +50,18 @@ </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> @@ -73,43 +85,43 @@ <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>5.1.1</version> + <version>5.2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.bnd.ant</artifactId> + <version>5.2.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.resolve</artifactId> - <version>5.1.1</version> + <version>5.2.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.repository</artifactId> - <version>5.1.1</version> + <version>5.2.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.exporters</artifactId> - <version>5.1.1</version> + <version>5.2.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.reporter</artifactId> - <version>5.1.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.7.1</version> + <version>5.2.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.remote.api</artifactId> - <version>5.1.1</version> + <version>5.2.0</version> <scope>provided</scope> </dependency> <dependency> ++++++ biz.aQute.bnd.annotation-5.1.1.pom -> biz.aQute.bnd.annotation-5.2.0.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd.annotation-5.1.1.pom 2021-10-19 23:04:20.861287125 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/biz.aQute.bnd.annotation-5.2.0.pom 2021-11-10 21:47:18.123833779 +0100 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.annotation</artifactId> - <version>5.1.1</version> + <version>5.2.0</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.1.1.REL</tag> + <tag>5.2.0.REL</tag> </scm> <developers> <developer> @@ -48,6 +48,18 @@ <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> ++++++ biz.aQute.bnd.ant-5.2.0.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.ant</artifactId> <version>5.2.0</version> <description>Bnd Ant Tasks</description> <name>biz.aQute.bnd.ant</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>5.2.0.REL</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...@bjhargrave.com</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>7.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> <version>5.2.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>1.7.25</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>1.10.8</version> <scope>compile</scope> </dependency> </dependencies> </project> ++++++ biz.aQute.bnd.exporters-5.1.1.pom -> biz.aQute.bnd.exporters-5.2.0.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd.exporters-5.1.1.pom 2021-10-19 23:04:20.873287130 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/biz.aQute.bnd.exporters-5.2.0.pom 2021-11-10 21:47:18.143833788 +0100 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.exporters</artifactId> - <version>5.1.1</version> + <version>5.2.0</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.1.1.REL</tag> + <tag>5.2.0.REL</tag> </scm> <developers> <developer> @@ -50,6 +50,18 @@ </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> @@ -67,7 +79,7 @@ <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>5.1.1</version> + <version>5.2.0</version> <scope>compile</scope> </dependency> <dependency> ++++++ biz.aQute.bndlib-5.1.1.pom -> biz.aQute.bndlib-5.2.0.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bndlib-5.1.1.pom 2021-10-19 23:04:20.881287134 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.1890/biz.aQute.bndlib-5.2.0.pom 2021-11-10 21:47:18.151833791 +0100 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>5.1.1</version> + <version>5.2.0</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.1.1.REL</tag> + <tag>5.2.0.REL</tag> </scm> <developers> <developer> @@ -48,6 +48,18 @@ <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> ++++++ bnd-5.1.1.REL-build_xml.tar.xz -> bnd-5.2.0.REL-build_xml.tar.xz ++++++ 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 1970-01-01 01:00:00.000000000 +0100 +++ new/biz.aQute.bnd.ant/build.xml 2021-11-10 07:36:01.794697647 +0100 @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="biz.aQute.bnd.ant" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="build.properties"/> + + <property name="libdir" value="../lib"/> + + <property name="project.artifactId" value="biz.aQute.bnd.ant"/> + + <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="../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"/> + </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}" + 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/build.xml new/build.xml --- old/build.xml 2021-02-17 11:26:32.000000000 +0100 +++ new/build.xml 2021-11-10 07:19:18.100153667 +0100 @@ -2,7 +2,7 @@ <project name="parent" default="package" basedir="."> - <property name="project.version" value="5.1.1"/> + <property name="project.version" value="5.2.0"/> <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> <property name="project.groupId" value="biz.aQute.bnd"/> @@ -17,6 +17,7 @@ <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"/> </target> <!-- ====================================================================== --> @@ -29,6 +30,7 @@ <ant antfile="build.xml" dir="biz.aQute.bndlib" 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> <!-- ====================================================================== --> @@ -41,6 +43,7 @@ <ant antfile="build.xml" dir="biz.aQute.bndlib" 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> <!-- ====================================================================== --> @@ -53,6 +56,7 @@ <ant antfile="build.xml" dir="biz.aQute.bndlib" 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> <!-- ====================================================================== -->
