[main] Fixing circular dependencies in `SPECS-EXTENDED`. (#2048)

* Revert "break cycle to unblock remainder of build" This reverts commit f9b9d7e49e. * Removing circular dependencies. * Removing circular dependencies in 'velocity'. * Fixing 'velocity' spec. * Addressing PR checks.
2022-01-31 17:18:41 -08:00 · 2022-01-31 17:18:41 -08:00 · daaf7a8549
--- a/SPECS-EXTENDED/javapackages-tools-meta/javapackages-tools-meta.spec
+++ b/SPECS-EXTENDED/javapackages-tools-meta/javapackages-tools-meta.spec
@ -12,7 +12,7 @@ License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://github.com/fedora-java/javapackages
-Source0:        %{name}-%{version}.tar.gz
+Source0:        https://github.com/fedora-java/javapackages/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildArch:      noarch

 %description
@ -24,7 +24,7 @@ Requires:       javapackages-tools = %{version}
 Requires:       javapackages-local = %{version}-%{release}
 Requires:       xmvn-minimal
 Requires:       xmvn-mojo
-#Requires:       xmvn-connector-aether
+Requires:       xmvn-connector-aether
 # Common Maven plugins required by almost every build. It wouldn't make
 # sense to explicitly require them in every package built with Maven.
 Requires:       mvn(org.apache.maven.plugins:maven-compiler-plugin)
@ -70,6 +70,7 @@ Requires:       python3
 This package provides non-essential macros and scripts to support Java packaging.

 %files -n javapackages-local
+%license LICENSE

 %files -n maven-local

@ -80,6 +81,7 @@ This package provides non-essential macros and scripts to support Java packaging
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Create javapackages-local-bootstrap without xmvn requires.
 - Add requires on upstream javapackages-tools.
+- License verified.

 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
--- a/SPECS-EXTENDED/velocity/velocity.spec
+++ b/SPECS-EXTENDED/velocity/velocity.spec
@ -1,29 +1,58 @@
-%bcond_with bootstrap
-
-Summary:        Java-based template engine
-Name:           velocity
-Version:        1.7
-Release:        37%{?dist}
-License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+#
+# spec file for package velocity
+#
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+Name:           velocity
+Version:        1.7
+Release:        10%{?dist}
+Summary:        Java-based template engine
+License:        ASL 2.0
+Group:          Development/Libraries/Java
 URL:            https://velocity.apache.org/
 Source0:        https://github.com/apache/%{name}-engine/archive/refs/tags/%{version}.tar.gz#/%{name}-engine-%{version}.tar.gz
 Patch1:         0001-Port-to-apache-commons-lang3.patch
 Patch2:         0002-Force-use-of-JDK-log-chute.patch
 Patch3:         0003-CVE-2020-13936.patch
-
+BuildRequires:  ant >= 1.6.5
+BuildRequires:  ant-junit
+BuildRequires:  antlr
+BuildRequires:  commons-collections
+BuildRequires:  commons-lang3
+BuildRequires:  commons-logging
+BuildRequires:  fdupes
+BuildRequires:  hsqldb
+BuildRequires:  javapackages-local-bootstrap
+BuildRequires:  jdom >= 1.0-1
+BuildRequires:  junit
+BuildRequires:  oro
+BuildRequires:  plexus-classworlds
+BuildRequires:  servletapi4
+BuildRequires:  werken-xpath
+Requires:       commons-collections
+Requires:       commons-lang3
+Requires:       java >= 1.6.0
+Requires:       jdom >= 1.0-1
+Requires:       oro
+Requires:       servletapi4
+Requires:       werken-xpath
 BuildArch:      noarch

-BuildRequires:  maven-local
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
-BuildRequires:  mvn(commons-collections:commons-collections)
-BuildRequires:  mvn(org.apache.commons:commons-lang3)
-BuildRequires:  mvn(org.apache:apache:pom:)
-%endif
-
 %description
 Velocity is a Java-based template engine. It permits anyone to use the
 simple yet powerful template language to reference objects defined in
@ -45,355 +74,230 @@ template services for the Turbine web application framework.
 Velocity+Turbine provides a template service that will allow web
 applications to be developed according to a true MVC model.

+%package        manual
+Summary:        Manual for %{name}
+Group:          Development/Libraries/Java
+
+%description    manual
+Velocity is a Java-based template engine. It permits anyone to use the
+simple yet powerful template language to reference objects defined in
+Java code.
+When Velocity is used for web development, Web designers can work in
+parallel with Java programmers to develop web sites according to the
+Model-View-Controller (MVC) model, meaning that web page designers can
+focus solely on creating a site that looks good, and programmers can
+focus solely on writing top-notch code. Velocity separates Java code
+from the web pages, making the web site more maintainable over the long
+run and providing a viable alternative to Java Server Pages (JSPs) or
+PHP.
+Velocity's capabilities reach well beyond the realm of web sites; for
+example, it can generate SQL and PostScript and XML (see Anakia for more
+information on XML transformations) from templates. It can be used
+either as a standalone utility for generating source code and reports,
+or as an integrated component of other systems. Velocity also provides
+template services for the Turbine web application framework.
+Velocity+Turbine provides a template service that will allow web
+applications to be developed according to a true MVC model.
+
 %package        javadoc
 Summary:        Javadoc for %{name}
+Group:          Documentation/HTML

 %description    javadoc
-Javadoc for %{name}.
+Velocity is a Java-based template engine. It permits anyone to use the
+simple yet powerful template language to reference objects defined in
+Java code.
+When Velocity is used for web development, Web designers can work in
+parallel with Java programmers to develop web sites according to the
+Model-View-Controller (MVC) model, meaning that web page designers can
+focus solely on creating a site that looks good, and programmers can
+focus solely on writing top-notch code. Velocity separates Java code
+from the web pages, making the web site more maintainable over the long
+run and providing a viable alternative to Java Server Pages (JSPs) or
+PHP.
+Velocity's capabilities reach well beyond the realm of web sites; for
+example, it can generate SQL and PostScript and XML (see Anakia for more
+information on XML transformations) from templates. It can be used
+either as a standalone utility for generating source code and reports,
+or as an integrated component of other systems. Velocity also provides
+template services for the Turbine web application framework.
+Velocity+Turbine provides a template service that will allow web
+applications to be developed according to a true MVC model.
+
+%package        demo
+Summary:        Demo for %{name}
+Group:          Development/Libraries/Java
+Requires:       %{name} = %{version}-%{release}
+
+%description    demo
+Velocity is a Java-based template engine. It permits anyone to use the
+simple yet powerful template language to reference objects defined in
+Java code.
+When Velocity is used for web development, Web designers can work in
+parallel with Java programmers to develop web sites according to the
+Model-View-Controller (MVC) model, meaning that web page designers can
+focus solely on creating a site that looks good, and programmers can
+focus solely on writing top-notch code. Velocity separates Java code
+from the web pages, making the web site more maintainable over the long
+run and providing a viable alternative to Java Server Pages (JSPs) or
+PHP.
+Velocity's capabilities reach well beyond the realm of web sites; for
+example, it can generate SQL and PostScript and XML (see Anakia for more
+information on XML transformations) from templates. It can be used
+either as a standalone utility for generating source code and reports,
+or as an integrated component of other systems. Velocity also provides
+template services for the Turbine web application framework.
+Velocity+Turbine provides a template service that will allow web
+applications to be developed according to a true MVC model.

 %prep
-%autosetup -p1 -n %{name}-engine-%{version}
+%autosetup -p1
+# Remove all binary libs used in compiling the package.
+# Note that velocity has some jar files containing macros under
+# examples and test that should not be removed.
+#find build -name '*.jar' -exec rm -f \{\} \;
+for j in $(find . -name "*.jar" | grep -v /test/); do
+    mv $j $j.no
+done

-find . -name '*.jar' ! -name 'test*.jar' -print -delete
-find . -name '*.class' ! -name 'Foo.class' -print -delete
-
-# Disable unneeded features
-rm -r src/java/org/apache/velocity/{anakia,texen,servlet,convert}
-rm src/java/org/apache/velocity/runtime/log/{Avalon,Log4J}Log{Chute,System}.java
-rm src/java/org/apache/velocity/runtime/log/{CommonsLog,Servlet}LogChute.java
-rm src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
+# Removing dependency on "avalong-logkit".
+rm src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
+rm src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java
 rm src/java/org/apache/velocity/runtime/log/VelocityFormatter.java
-rm src/java/org/apache/velocity/app/event/implement/Escape{Html,JavaScript,Sql,Xml,}Reference.java

-%pom_remove_dep :oro
-%pom_remove_dep :jdom
+# Removing dependency on "log4j12".
+rm src/java/org/apache/velocity/runtime/log/Log4JLogChute.java
+rm src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java
+rm src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
+
+# Removing dependency on "commons-logging".
+rm src/java/org/apache/velocity/runtime/log/CommonsLogLogChute.java
+
+# Need porting to new servlet API. We would just add a lot of empty functions.
+rm src/test/org/apache/velocity/test/VelocityServletTestCase.java
+
+# This test doesn't work with new hsqldb.
+rm src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
+
+%pom_remove_parent pom.xml
 %pom_remove_dep :commons-logging
 %pom_remove_dep :log4j
-%pom_remove_dep :servlet-api
 %pom_remove_dep :logkit
-%pom_remove_dep :ant
-%pom_remove_dep :werken-xpath
-
-%{mvn_alias} : %{name}:%{name}

 %build
-%{mvn_build} -f
+#export JAVA_HOME=%{_jvmdir}/java-1.5.0
+# Use servletapi4 instead of servletapi5 in CLASSPATH
+mkdir -p bin/test-lib
+pushd bin/test-lib
+ln -sf $(build-classpath hsqldb)
+ln -sf $(build-classpath junit)
+popd
+mkdir -p bin/lib
+pushd bin/lib
+ln -sf $(build-classpath ant)
+ln -sf $(build-classpath antlr)
+ln -sf $(build-classpath commons-collections)
+ln -sf $(build-classpath commons-lang3)
+ln -sf $(build-classpath commons-logging)
+ln -sf $(build-classpath jdom)
+ln -sf $(build-classpath oro)
+# Use servletapi4 instead of servletapi5 in CLASSPATH
+ln -sf $(build-classpath servletapi4)
+ln -sf $(build-classpath werken-xpath)
+ln -sf $(build-classpath plexus/classworlds)
+popd
+export CLASSPATH=$(build-classpath jdom commons-collections commons-lang3 werken-xpath antlr)
+CLASSPATH=$CLASSPATH:$(pwd)/test/texen-classpath/test.jar
+export OPT_JAR_LIST="ant/ant-junit junit"
+#FIXME: tests failed on CommonsExtPropTestCase
+#but resulting files seems to be same
+ant \
+  -Djavac.source=1.6 -Djavac.target=1.6 \
+  -buildfile build/build.xml \
+  jar javadocs

 %install
-%{mvn_install}
+# jars
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 bin/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+# pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml \
+    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap -a velocity:velocity
+
+# javadoc
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}
+
+rm -rf docs/api
+
+# zero-length file
+rm -r test/issues/velocity-537/compare/velocity537.vm.cmp
+# data
+install -d -m 755 %{buildroot}%{_datadir}/%{name}
+cp -pr examples test %{buildroot}%{_datadir}/%{name}
+%fdupes -s %{buildroot}%{_datadir}/%{name}

 %files -f .mfiles
 %license LICENSE NOTICE
 %doc README.txt

-%files javadoc -f .mfiles-javadoc
-%license LICENSE NOTICE
+%files manual
+%doc docs/*
+
+%files javadoc
+%{_javadocdir}/%{name}
+
+%files demo
+%{_datadir}/%{name}

 %changelog
-* Mon Jan 24 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.7-37
- Initial CBL-Mariner import from Fedora 36 (license: MIT).
+* Mon Jan 31 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.7-10
+- Removing dependency on "avalog-logkit" and "log4j12".
+- Ported to "commons-lang3".
 - License verified.
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-35
- Bootstrap build
- Non-bootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Sep 11 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.7-33
- Default to JDK logging and drop commons-logging and log4j12 implementations.
-
-* Thu Jul 30 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.7-32
- Port to commons-lang3.
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.7-30
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Mon Jul 13 2020 Mat Booth <mat.booth@redhat.com> - 0:1.7-29
- Ignore test case that fails on Java 11
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.7-28
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Fri May 15 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-27
- Build with Maven
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-26
- Mass rebuild for javapackages-tools 201902
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-25
- Mass rebuild for javapackages-tools 201901
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:1.7-24
- Repack the tarball without binaries
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Feb 07 2017 Michael Simacek <msimacek@redhat.com> - 0:1.7-20
- Add hsqldb conditional
- Switch to glassfish-servlet-api
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jul 22 2015 gil cattaneo <puntogil@libero.it> 0:1.7-18
- fix FTBFS rhbz#1240035
- fix BR list, change log4j with log4j12
- set javac source/target to 1.6
- disable Java8doc doclint
- remove werken-xpath Import/Export refences in manifest file
- resolve some rpmlint problems
- remove zero-length file
- introduce license macro
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Nov 28 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-16
- Update to current packaging guidelines
-
-* Thu Sep  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-15
- Require hsqldb-lib instead of hsqldb
-
-* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-14
- Apply patch for log4j 1.2.17
-
-* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-13
- Use log4j 1.2 compat package
- Skip Java 8 incompatible test
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-11
- Use .mfiles generated during build
-
-* Sat Sep 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-10
- Port from werken-xpath to jdom
- Resolves: rhbz#875817
-
-* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 0:1.7-9
- Fix FTBFS (Resolves: #992852)
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Nov 21 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-6
- Install NOTICE files
- Resolves: rhbz#879021
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.7-4
- Use new tomcat-servlet-api
- Update to latest guidelines
-
-* Fri Feb 17 2012 Deepak Bhole <dbhole@redhat.com> - 0:1.7-3
- Resolved rhbz#791045
- Added patch from Omaid Majid <omajid@redhat.com> to fix build with Java 7
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.7-1
- Update to latest version
- Drop old patches
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.6.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-2
- Add compatibility depmap
-
-* Wed Nov  3 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-1
- Rebase to latest upstream
- Fix problems from bz#226525
-
-* Thu Oct 14 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.3-5
- Use apache-commons-collections instead of jakarta name
- Use tomcat6 for dependency instead of tomcat5 (bz#640660)
-
-* Mon Jun 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.6.3-4
- Fix BR/R for jakarta-commons-rename.
-
-* Sat Feb 13 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-3
- Get (Build)Requires right
-
-* Sat Feb 13 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-2
- Require all of the packages in the POM
- Add dist to version
-
-* Fri Jan 15 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-1
- Update to 1.6.3
- Remove dependency on avalon-logkit
- Add maven metadata and pom
-
-* Sun Jan 10 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.4-10.5
- Drop gcj_support.
- Fix groups and url.
- Use upstream tarball.
-
-* Mon Aug 10 2009 Ville Skyttä <ville.skytta@iki.fi> - 0:1.4-10.4
- Convert specfile to UTF-8.
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-9.4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Apr 24 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 0:1.4-8.4
- Fix FTBFS: added velocity-enum.patch (enum is a reserved keyword in java >= 1.5)
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-8.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.4-7.3
- drop repotag
-
-* Thu May 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.4-7jpp.2
- fix license tag
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.4-7jpp.1
- Autorebuild for GCC 4.3
-
-* Tue Aug 08 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-6jpp.1
- Resync with latest from JPP.
- Partially adopt new naming convention.
-
-* Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-5jpp_2fc
- Rebuilt
-
-* Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-5jpp_1fc
- Merge with latest from JPP.
- Remove fileversion and my_version macros.
- Remove notexentests patch and replace with a patch to disable
- failure on tests.
-
-* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.4-3jpp_8fc
- Rebuilt
-
-* Tue Jul 18 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.4-3jpp_7fc
- Build on all archs.
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_6fc
- rebuild
-
-* Wed Mar  8 2006 Rafael Schloming <rafaels@redhat.com> - 0:1.4-3jpp_5fc
- excluded s390[x] and ppc64 due to eclipse
-
-* Mon Mar  6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.4-3jpp_4fc
- stop scriptlet spew
-
-* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_3fc
- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_2fc
- rebuilt
-
-* Tue Nov  8 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.4-3jpp_1fc
- Converted from ISO-8859-1 to UTF-8
-
-* Wed Jun 15 2005 Gary Benson <gbenson@redhat.com> 0:1.4-3jpp_1fc
- Build into Fedora.
-
-* Thu Jun  9 2005 Gary Benson <gbenson@redhat.com>
- Remove jarfiles from the tarball.
-
-* Mon Jun  6 2005 Gary Benson <gbenson@redhat.com>
- Build with servletapi5.
- Add NOTICE file as per Apache License version 2.0.
- Skip some failing tests.
-
-* Mon Oct 18 2004 Fernando Nasser <fnasser@redhat.com> 0:1.4-3jpp_1rh
- First Red Hat build
-
-* Thu Sep 23 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-3jpp
- Adapt to jdom-1.0-1 replacing org.jdom.input.DefaultJDOMFactory
-  by org.jdom.DefaultJDOMFactory in AnakiaJDOMFactory.java
-  as well as using org.jdom.output.Format in AnakiaTask.java
- Therefore require jdom >= 0:1.0-1
-
-* Thu Sep 02 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-2jpp
- Build with ant-1.6.2
-
-* Mon Jun 07 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-1jpp
- 1.4 final
- Patch #0 is unnecessary (upstream)
- We have to build velocity against servletapi3
-
-* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.2jpp
- Fix a few jpackage related .spec typos, oops.
-
-* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.1jpp
- Added Patch #0 (velocity-1.4-rc1-ServletTest.patch) from CVS which fixes
-  build problems.
-
-* Sun May 25 2003 Ville Skyttä <ville.skytta@iki.fi> - 0:1.3.1-2jpp
- Add Epochs to dependencies.
- Add explicit defattrs.
- Add non-versioned javadoc symlinks.
- Use sed instead of bash 2 extension when symlinking jars during build.
- Use full URL in Source.
- Fix -javadoc Group tag.
- Drop patch in favour of ant options.
- BuildRequire jpackage-utils and antlr (latter needed for Anakia tests).
-
-* Sat May 24 2003 Richard Bullington-McGuire <rbulling@pkrinternet.com> 1.3.1-1jpp
- 1.3.1 stable release
-
-* Fri May 23 2003 Richard Bullington-McGuire <rbulling@pkrinternet.com> 1.3-1jpp
- 1.3 stable release
- Updated for JPackage 1.5
- Run JUnit regression tests as part of the build process
- Added patch file to fix test case classpath for JUnit standard locations
-
-* Mon May 06 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.3-0.rc1.1jpp
- 1.3.0rc1
- dropped patch
- versioned dir for javadoc
- no dependencies for manual and javadoc packages
- stricter dependency for demo package
-
-* Wed Dec 12 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-1jpp
- 1.2
- regenerated patch and corrected manifest
- requires and buildrequires jdom >= 1.0-0.b7.1
-
-* Wed Dec 5 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-4jpp
- javadoc into javadoc package
-
-* Wed Nov 21 2001 Christian Zoffoli <czoffoli@littlepenguin.org> 1.1-3jpp
- removed packager tag
- new jpp extension
-
-* Thu Nov 1 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-2jpp
- first unified release
- s/jPackage/JPackage
-
-* Fri Sep 14 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-1jpp
- first Mandrake release
+- Changes done using Fedora 33 (license: MIT) spec as guidance.
+
+* Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.7-9
+- Converting the 'Release' tag to the '[number].[distribution]' format.
+
+* Mon Nov 16 2020 Ruying Chen <v-ruyche@microsoft.com> - 1.7-8.4
+- Initial CBL-Mariner import from openSUSE Tumbleweed (license: same as "License" tag).
+- Use javapackages-local-bootstrap to avoid build cycle.
+
+* Tue Oct  1 2019 Fridrich Strba <fstrba@suse.com>
+- Build against the compatibility package log4j12
+* Mon Apr  8 2019 Fridrich Strba <fstrba@suse.com>
+- Do not depend on the apache-parent, since we are not building
+  using Maven.
+* Thu Feb 14 2019 Fridrich Strba <fstrba@suse.com>
+- Build against the new plexus-classworlds package
+* Mon Nov  5 2018 Fridrich Strba <fstrba@suse.com>
+- Add alias "velocity:velocity" to the maven artifact
+* Tue Sep 19 2017 fstrba@suse.com
+- Fix buid with jdk9: specify java source and target level 1.6
+* Fri May 19 2017 tchvatal@suse.com
+- Remove unneeded deps
+* Fri May 19 2017 dziolkowski@suse.com
+- New build dependency: javapackages-local
+* Wed Mar 18 2015 tchvatal@suse.com
+- Fix build with new javapackages-tools
+* Fri Dec  5 2014 p.drouand@gmail.com
+- Update to version 1.7
+  + No changelog available
+- Add requirement to commons-logging; new dependency
+- Remove java-devel >= 1.6.0 requirement; not needed anymore
+- Do not copy convert folder; doesn't exist anymore
+* Fri Jun 27 2014 tchvatal@suse.com
+- Fix build on SLE11
+* Wed Sep 11 2013 mvyskocil@suse.com
+- use add_maven_depmap from javapackages-tools
+* Mon Sep  9 2013 tchvatal@suse.com
+- Move from jpackage-utils to javapackage-tools
+* Mon Dec 17 2012 mvyskocil@suse.com
+- require avalon-logkit
+  * drop excalibur from Factory
+* Wed Jun  3 2009 mvyskocil@suse.cz
+- Initial SUSE packaging
--- a/SPECS-EXTENDED/xbean/xbean.spec
+++ b/SPECS-EXTENDED/xbean/xbean.spec
@ -1,345 +1,190 @@
-%bcond_with bootstrap
-
-Summary:        Java plugin based web server
-Name:           xbean
-Version:        4.18
-Release:        6%{?dist}
-License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+#
+# spec file for package xbean
+#
+# Copyright (c) 2020 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+Name:           xbean
+Version:        4.18
+Release:        1%{?dist}
+Summary:        Java plugin based web server
+License:        ASL 2.0
+Group:          Development/Libraries/Java
 URL:            https://geronimo.apache.org/xbean/
-Source0:        https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source0:        http://repo2.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Patch1:         0001-Remove-unused-import.patch
+# Fix dependency on xbean-asm4-shaded to original objectweb-asm
 Patch2:         0002-Unbundle-ASM.patch
 Patch3:         0003-Remove-dependency-on-log4j-and-commons-logging.patch

+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  javapackages-local-bootstrap
+BuildRequires:  objectweb-asm >= 5
+BuildRequires:  slf4j
+BuildRequires:  unzip
+# The code uses sun.misc.URLClassloader
+BuildConflicts: java-devel >= 9
+BuildConflicts: java-headless >= 9
+# Avoid build cycles
+BuildConflicts: java-devel-openj9
+BuildConflicts: java-headless-openj9
+Requires:       objectweb-asm >= 5
+Requires:       slf4j
 BuildArch:      noarch

-BuildRequires:  maven-local
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
-BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.osgi:org.osgi.core)
-BuildRequires:  mvn(org.ow2.asm:asm)
-BuildRequires:  mvn(org.ow2.asm:asm-commons)
-BuildRequires:  mvn(org.slf4j:slf4j-api)
-%endif
-
 %description
-The goal of XBean project is to create a plugin based server
-analogous to Eclipse being a plugin based IDE. XBean will be able to
-discover, download and install server plugins from an Internet based
-repository. In addition, we include support for multiple IoC systems,
-support for running with no IoC system, JMX without JMX code,
-lifecycle and class loader management, and a rock solid Spring
-integration.
+XBean is a plugin-based server analogous to Eclipse being a
+plugin-based IDE. XBean is able to discover, download and install
+server plugins from an Internet-based repository. Support for
+multiple IoC systems, support for running with no IoC system, JMX
+without JMX code, lifecycle and class loader management, and a Spring
+integration is included.

 %package        javadoc
 Summary:        API documentation for %{name}
+Group:          Documentation/HTML

 %description    javadoc
-This package provides %{summary}.
+This package provides API documentation for xbean.

 %prep
-%autosetup -p1
+%setup -q
+# build failing on this due to doxia-sitetools problems
+rm src/site/site.xml

-cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1

-# Parent POM is not packaged
 %pom_remove_parent
+%pom_remove_dep mx4j:mx4j

-%pom_disable_module xbean-classloader
-%pom_disable_module xbean-classpath
-%pom_disable_module xbean-bundleutils
-%pom_disable_module xbean-asm9-shaded
+%pom_remove_dep -r :xbean-asm5-shaded
+%pom_remove_dep -r :xbean-finder-shaded
+%pom_disable_module xbean-asm5-shaded
 %pom_disable_module xbean-finder-shaded
-%pom_disable_module xbean-naming
-%pom_disable_module xbean-blueprint
+
+%pom_xpath_remove pom:scope xbean-asm-util
+%pom_xpath_remove pom:optional xbean-asm-util
+
+# Prevent modules depending on springframework from building.
+%pom_remove_dep org.springframework:
+%pom_disable_module xbean-classloader
 %pom_disable_module xbean-spring
-%pom_disable_module xbean-telnet
 %pom_disable_module maven-xbean-plugin
-
-%pom_remove_dep :commons-logging-api xbean-reflect
-%pom_remove_dep :log4j xbean-reflect
-%pom_remove_dep :xbean-asm9-shaded xbean-reflect
-find -name CommonsLoggingConverter.java -delete
-find -name Log4jConverter.java -delete
-
-# Plugins useful for upstream only
-%pom_remove_plugin :apache-rat-plugin
-%pom_remove_plugin :maven-source-plugin
+rm -rf maven-xbean-plugin
+# blueprint FTBFS, disable for now
+%pom_disable_module xbean-blueprint

 %pom_remove_dep :xbean-bundleutils xbean-finder
 rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle*
+%pom_disable_module xbean-bundleutils

-# Disable one test that fails on JDK 11
-sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java
+%pom_disable_module xbean-telnet
+
+# maven-xbean-plugin invocation makes no sense as there are no namespaces
+%pom_remove_plugin :maven-xbean-plugin xbean-classloader
+
+# As auditing tool RAT is useful for upstream only.
+%pom_remove_plugin :apache-rat-plugin
+
+# disable copy of internal aries-blueprint
+sed -i "s|<Private-Package>|<!--Private-Package>|" xbean-blueprint/pom.xml
+sed -i "s|</Private-Package>|</Private-Package-->|" xbean-blueprint/pom.xml
+
+%pom_change_dep -r -f ::::: :::::
+
+# Removing dependency on Apache commons logging
+%pom_remove_dep :commons-logging-api xbean-reflect
+%pom_remove_dep :xbean-asm7-shaded xbean-reflect
+find -name CommonsLoggingConverter.java -delete
+
+# Removing dependency on log4j.
+%pom_remove_dep :log4j xbean-reflect
+find -name Log4jConverter.java -delete

 %build
-%mvn_build -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7
+for i in xbean-asm-util xbean-classpath xbean-finder xbean-naming xbean-reflect; do
+  pushd $i
+    mkdir -p build/classes
+    javac -d build/classes  -encoding utf-8 -source 6 -target 6 \
+      -cp $(build-classpath commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons):../xbean-asm-util/xbean-asm-util.jar \
+      $(find src/main/java -name *.java)
+    jar cf $i.jar -C build/classes .
+  popd
+done
+mkdir -p build/apidoc
+javadoc -d build/apidoc -source 6 -encoding utf-8 \
+  -Xdoclint:none \
+  -classpath $(build-classpath commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons) \
+  $(for i in xbean-asm-util xbean-classpath xbean-finder xbean-naming xbean-reflect; do find $i/src/main/java -name *.java; done | xargs)

 %install
-%mvn_install
+# jars && poms
+install -dm 755 %{buildroot}%{_javadir}/%{name}
+install -dm 755 %{buildroot}%{_mavenpomdir}/%{name}
+for i in xbean-asm-util xbean-classpath xbean-finder xbean-naming xbean-reflect; do
+  install -m 0644 $i/$i.jar %{buildroot}%{_javadir}/%{name}
+  %pom_remove_parent ${i}
+  %pom_xpath_inject pom:project "<groupId>org.apache.xbean</groupId><version>%{version}</version>" ${i}
+  install -m 0644 $i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$i.pom
+  %add_maven_depmap %{name}/$i.pom %{name}/$i.jar
+done
+
+# javadoc
+install -dm 755 %{buildroot}/%{_javadocdir}/%{name}
+cp -aL build/apidoc/* %{buildroot}/%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}/%{_javadocdir}/%{name}

 %files -f .mfiles
-%license LICENSE NOTICE
+%license LICENSE
+%doc NOTICE

-%files javadoc -f .mfiles-javadoc
-%license LICENSE NOTICE
+%files javadoc
+%{_javadocdir}/%{name}

 %changelog
-* Tue Jan 25 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 4.18-6
- Initial CBL-Mariner import from Fedora 36 (license: MIT).
+* Mon Jan 31 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 4.18-1
+- Updating to version 4.18.
+- Removing dependency on "log4j12".
 - License verified.

-* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-5
- Set explicit Java compiler source/target levels to 1.7
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jun 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-3
- Enable xbean-finder
- Resolves: rhbz#1969297
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-2
- Bootstrap build
- Non-bootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.15-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 4.18-1
- Update to upstream version 4.18
-
-* Wed Sep 09 2020 Fabio Valentini <decathorpe@gmail.com> - 4.15-6
- Switch from log4j 1.2 compat package to log4j 1.2 API shim.
-
-* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 4.17-1
- Update to upsteam version 4.17
-
-* Wed Jul 29 2020 Mat Booth <mat.booth@redhat.com> - 4.15-5
- Remove springframework conditionals, the deps are a long time removed from
-  Fedora and this simplifies the spec a bit
- Disable unused modules that can't build on JDK 11
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 4.15-4
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jun 25 2020 Jeff Johnston <jjohnstn@redhat.com> - 4.15-3
- Fix JVM as 1.8.0 as package cannot be built with Java 9 and above
-
-* Fri May 15 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-4
- Remove dependency on log4j and commons-logging
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Nov 13 2019 Fabio Valentini <decathorpe@gmail.com> - 4.15-1
- Update to version 4.15.
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-3
- Mass rebuild for javapackages-tools 201902
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-2
- Disable all modules except xbean-reflect
-
-* Wed Sep 18 2019 Fabio Valentini <decathorpe@gmail.com> - 4.14-2
- Migrate from the obsolete felix-osgi-core to osgi-core.
-
-* Tue Aug 20 2019 Fabio Valentini <decathorpe@gmail.com> - 4.14-1
- Update to version 4.14.
-
-* Sun Jul 28 2019 Fabio Valentini <decathorpe@gmail.com> - 4.9-5
- Disable support for spring and groovy.
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 09 2019 Fabio Valentini <decathorpe@gmail.com> - 4.9-3
- Disable eclipse equinox functionality to fix the FTBFS issue on 32bit arches.
-
-* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 4.14-1
- Update to upstream version 4.14
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.8-2
- Mass rebuild for javapackages-tools 201901
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Aug 07 2018 Michael Simacek <msimacek@redhat.com> - 4.9-1
- Update to upstream version 4.9
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Apr 19 2018 Michael Simacek <msimacek@redhat.com> - 4.8-1
- Update to upstream version 4.8
-
-* Tue Mar 13 2018 Michael Simacek <msimacek@redhat.com> - 4.6-1
- Update to upstream version 4.6
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb  1 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5-6
- Introduce groovy build conditional
-
-* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 4.5-5
- Fix build with conditionals
-
-* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 4.5-4
- Port to current QDox
-
-* Thu Jun 16 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5-3
- Add missing build-requires
-
-* Thu May 12 2016 Michael Simacek <msimacek@redhat.com> - 4.5-2
- Enable xbean-asm-util
-
-* Mon May 02 2016 Michael Simacek <msimacek@redhat.com> - 4.5-1
- Update to upstream version 4.5
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Nov 24 2015 Michael Simacek <msimacek@redhat.com> - 4.4-1
- Update to upstream version 4.4
- Rebase patches
- Remove obsolete groovy patch
-
-* Mon Jul 13 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3-1
- Update to upstream version 4.3
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Apr  1 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-1
- Update to upstream version 4.2
-
-* Thu Feb  5 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1-2
- Fix patch unshading ASM
-
-* Fri Nov 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1-1
- Update to upstream version 4.1
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon Apr 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.17-1
- Update to upstream version 3.17
- Add patch for Eclipse Luna
-
-* Thu Dec  5 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.16-1
- Update to upstream version 3.16
-
-* Thu Aug 08 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.13-4
- Update to latest packaging guidelines
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Apr 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.13-2
- Remove unneeded BR: maven-idea-plugin
-
-* Fri Mar 15 2013 Michal Srb <msrb@redhat.com> - 3.13-1
- Update to upstream version 3.13
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 3.12-5
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local
-
-* Mon Dec 17 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-4
- Enable xbean-spring, resolves rhbz#887496
- Disable xbean-blueprint due to FTBFS
-
-* Mon Oct 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-3
- Replace eclipse-rcp requires with eclipse-equinox-osgi
- Reenable Equinox
-
-* Tue Oct 16 2012 gil cattaneo <puntogil@libero.it> - 3.12-2
- Enable xbean-blueprint and xbean-classloader modules
-
-* Wed Oct 10 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-1
- Update to upstream version 3.12
-
-* Wed Oct 10 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.11.1-8
- Revert previous changes.
-
-* Wed Oct 10 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.11.1-7
- Disable parts dependent on Eclipse (for bootstraping purpose).
-
-* Wed Oct 10 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-6
- Implement equinox and spring conditionals
-
-* Mon Sep  3 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-5
- Fix eclipse requires
-
-* Mon Aug 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-4
- Fix felix-framework enabling patch
-
-* Mon Aug  6 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-3
- Enable xbean-spring
- Enable maven-xbean-plugin
- Remove RPM bug workaround
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jul 13 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-1
- Update to the upstream version 3.11.1
- Force use of Equinox instead of Felix
- Convert patch to POM macros
-
-* Thu May  3 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.8-5
- Remove mx4j from deps (javax.management provided by JDK 1.5+)
-
-* Tue Apr 24 2012 Alexander Kurtakov <akurtako@redhat.com> 3.8-4
- BR felix-framework instead of felix-osgi-core.
-
-* Tue Apr 24 2012 Alexander Kurtakov <akurtako@redhat.com> 3.8-3
- Do not build equinox specific parts for RHEL.
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec  6 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.8-1
- Update to latest upstream version
- Build with maven 3
- Packaging & guidelines fixes
-
-* Sat May 28 2011 Marek Goldmann <mgoldman@redhat.com> - 3.7-7
- Added xbean-finder and xbean-bundleutils submodules
-
-* Fri Mar  4 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-6
- Add comment for removing javadoc
- Fix maven 3 build
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Dec  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-4
- Fix pom filename (Resolves rhbz#655827)
- Add depmap for main pom file
- Fixes according to new guidelines (versionless jars, javadocs)
-
-* Fri Jul 30 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-3
- Use javadoc:aggregate to generate javadocs
-
-* Fri Jul  9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-2
- Add license to javadoc subpackage
-
-* Mon Jun 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-1
- First release
+* Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 4.5-6
+- Converting the 'Release' tag to the '[number].[distribution]' format.
+
+* Fri Nov 13 2020 Ruying Chen <v-ruyche@microsoft.com> - 4.5-5.5
+- Initial CBL-Mariner import from openSUSE Tumbleweed (license: same as "License" tag).
+- Use javapackages-local-bootstrap to avoid build cycle.
+- Disable javadoc Xdoclint.
+
+* Mon Jan 27 2020 Fridrich Strba <fstrba@suse.com>
+- On supported platforms, avoid building with OpenJ9, in order to
+  prevent build cycles
+* Sat Oct  5 2019 Fridrich Strba <fstrba@suse.com>
+- Remove references to parent from all pom files
+- Avoid version-less dependencies
+* Tue Oct  1 2019 Fridrich Strba <fstrba@suse.com>
+- Build against the new log4j12 compat package
+* Thu Apr  4 2019 Fridrich Strba <fstrba@suse.com>
+- Do not require optional dependencies
+* Thu Feb  7 2019 Jan Engelhardt <jengelh@inai.de>
+- Trim future goals from description.
+- Avoid double-shipping documentation.
+* Thu Oct 25 2018 Fridrich Strba <fstrba@suse.com>
+- Initial packaging of xbean version 4.5
+- Spec file inspired by Fedora rpm package
--- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
+++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
--- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json
+++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json
@ -2204,7 +2204,6 @@
                "v4l-utils",
                "varnish",
                "varnish-modules",
-                "velocity",
                "vhostmd",
                "vino",
                "virglrenderer",
@ -2244,7 +2243,6 @@
                "x3270",
                "xapian-core",
                "Xaw3d",
-                "xbean",
                "xcb-proto",
                "xcb-util",
                "xcb-util-image",
@ -2656,8 +2654,10 @@
                "snakeyaml",
                "testng",
                "trilead-ssh2",
+                "velocity",
                "werken-xpath",
                "xalan-j2",
+                "xbean",
                "xcursor-themes",
                "xerces-j2",
                "xml-commons-apis",
--- a/cgmanifest.json
+++ b/cgmanifest.json
@ -7976,6 +7976,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "javapackages-tools-meta",
+          "version": "5.3.0",
+          "downloadUrl": "https://github.com/fedora-java/javapackages/archive/refs/tags/5.3.0.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",