PR#2: disable spring and groovy support, enable test suite - rpms/xbean

rpms / xbean

#2 disable spring and groovy support, enable test suite

Merged 4 years ago by decathorpe. Opened 4 years ago by decathorpe.

Unknown source master into master

disable spring and groovy support

Fabio Valentini • 4 years ago

0f0d3fb

.gitignore

file modified

+4 -1

		`@@ -1,4 +1,7 @@`
		`- xbean-3.7.tar.xz`
		`+ /results_*`
		`+ /*.src.rpm`
		`+`
		`+ /xbean-3.7.tar.xz`
		`/xbean-3.8.tar.xz`
		`/xbean-3.11.1.tar.xz`
		`/xbean-3.13-source-release.zip`

xbean.spec

file modified

+22 -15

		`@@ -1,25 +1,25 @@`
		`- # Conditionals to help breaking eclipse <-> xbean dependency cycle`
		`- # when bootstrapping for new architectures`
		`- %bcond_with equinox`
		`- %bcond_without groovy`
		`- %bcond_without spring`
		`+ %bcond_with equinox`
		`+ %bcond_with groovy`
		`+ %bcond_with spring`

		`Name: xbean`
		`- Version: 4.9`
		`- Release: 4%{?dist}`
		`Summary: Java plugin based web server`
		`+ Version: 4.9`
		`+ Release: 5%{?dist}`
		`License: ASL 2.0`
		`- URL: http://geronimo.apache.org/xbean/`
		`- BuildArch: noarch`

		`+ URL: http://geronimo.apache.org/xbean/`
		`Source0: http://repo2.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip`

		`# Compatibility with Eclipse Luna (rhbz#1087461)`
		`Patch1: 0002-Port-to-Eclipse-Luna-OSGi.patch`
		`Patch2: 0003-Port-to-QDox-2.0.patch`

		`+ BuildArch: noarch`
		`+`
		`BuildRequires: maven-local`
		`BuildRequires: mvn(commons-logging:commons-logging-api)`
		`+ BuildRequires: mvn(junit:junit)`
		`BuildRequires: mvn(log4j:log4j:1.2.12)`
		`BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)`
		`BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)`
		`@@ -63,15 +63,14 @@`
		`lifecycle and class loader management, and a rock solid Spring`
		`integration.`

		`+`
		`%if %{with spring}`
		`- # For now blueprint module fails to compile. Disable it.`
		`- %if 0`
		`+ # blueprint module fails to compile`
		`%package blueprint`
		`Summary: Schema-driven namespace handler for Apache Aries Blueprint`

		`%description blueprint`
		`This package provides %{summary}.`
		`- %endif`

		`%package classloader`
		`Summary: A flexibie multi-parent classloader`
		`@@ -93,12 +92,14 @@`
		`This package provides %{summary}.`
		`%endif`

		`+`
		`%package javadoc`
		`Summary: API documentation for %{name}`

		`%description javadoc`
		`This package provides %{summary}.`

		`+`
		`%prep`
		`%setup -q`
		`# build failing on this due to doxia-sitetools problems`
		`@@ -157,21 +158,22 @@`
		`sed -i "s\|<Private-Package>\|<!--Private-Package>\|" xbean-blueprint/pom.xml`
		`sed -i "s\|</Private-Package>\|</Private-Package-->\|" xbean-blueprint/pom.xml`

		`+`
		`%build`
		`- %mvn_build -f`
		`+ %mvn_build`
churchyard commented 4 years ago what does the -f flag actually do and why was it removed?
		`+`

		`%install`
		`%mvn_install`

		`+`
		`%files -f .mfiles`
		`%doc LICENSE NOTICE`
		`%dir %{_javadir}/%{name}`

		`%if %{with spring}`
		`- %if 0`
		`%files blueprint -f .mfiles-blueprint`
		`%doc LICENSE NOTICE %{name}-blueprint/target/restaurant.xsd*`
		`- %endif`

		`%files classloader -f .mfiles-classloader`
		`%doc LICENSE NOTICE`
		`@@ -186,7 +188,11 @@`
		`%files javadoc -f .mfiles-javadoc`
		`%doc LICENSE NOTICE`

		`+`
		`%changelog`
		`+ * 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`

		`@@ -369,3 +375,4 @@`

		`* Mon Jun 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-1`
		`- First release`
		`+`

decathorpe commented 4 years ago

Disable dependency on both groovy and spring by dropping three sub-packages. Also enable running the test suite again.

Only two packages depend on the removed maven-xbean-plugin:

xbean
    ↑ maven-xbean-plugin
        ← activemq (orphan, already broken)
            ← springframework-integration (orphan, already broken, leaf package)

Test rebuilds of other dependent packages in COPR succeeded, with the following expected failures:

hystrix (flaky test suite)
java-uuid-generator (test suite broken in COPR)
openhft-affinity (test suite broken in COPR)

Unexpected / unrelated build failures are:

antlr3 (unrelated build failure, missing BR: ant?)
paranamer (unrelated build failure, missing BR: ant?)
svgsalamander (unrelated build failure, missing BR: ant?)

churchyard commented 4 years ago

release bump?

rebased onto 099e519

4 years ago

rebased onto 0f0d3fb

4 years ago

decathorpe commented 4 years ago

@churchyard whoops, thanks for pointing that out. looks like I didn't adapt to the mass rebuild bump correctly. now it should be fixed.

churchyard commented on line 76 of xbean.spec 4 years ago

what does the -f flag actually do and why was it removed?

churchyard commented 4 years ago

One curious question, but otherwise looks good. +1, ship it!

decathorpe commented 4 years ago

will do!

the -f flag in %mvn_build disables unit tests. I had to look it up too, since it's rather counter-intuitive.

       -f, --force
           Skip compilation and execution of unit and integration tests, as
           well as resolution of build dependencies with scope test. This
           option causes Maven phase package to be executed instead of default
           phase verify, defines property maven.test.skip=true which disables
           compilation and execution of tests and causes XMvn to remove any
           project dependencies with scope test.

from the mvn_build man page. as it turns out, most macros from javapackages-tools have pretty good documentation.

Pull-Request has been merged by decathorpe

4 years ago