SPECS/felix-gogo-runtime.spec

@@ -2,7 +2,7 @@
 
 Name:           felix-gogo-runtime
 Version:        1.1.0
-Release:        7%{?dist}
+Release:        3%{?dist}
 Summary:        Apache Felix Gogo command line shell for OSGi
 # One file is also MIT licensed:
 #  src/main/java/org/apache/felix/gogo/runtime/Expression.java
@@ -34,13 +34,10 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{bundle}-%{version}
 
-# Remove 2 failing assertions on Java 11 in TestParser.testPipe()
-sed -i '/(echoout/ d' src/test/java/org/apache/felix/gogo/runtime/TestParser.java
-
 %mvn_file : felix/%{bundle}
 
 %build
-%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dsource=1.8 -DdetectJavaApiLink=false
+%mvn_build
 
 %install
 %mvn_install
@@ -52,23 +49,9 @@ sed -i '/(echoout/ d' src/test/java/org/apache/felix/gogo/runtime/TestParser.jav
 %license LICENSE NOTICE
 
 %changelog
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.1.0-7
+* Mon Jul 01 2019 Mat Booth <mat.booth@redhat.com> - 1.1.0-3
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Fri Jun 26 2020 Roland Grunberg <rgrunber@redhat.com> - 1.1.0-6
-- Set source/target to 1.8 for Java 11 build.
-- Disable Java API link detection for javadoc generation as this fails.
-- Disable some assertions in TestParser.testPipe() that fail on Java 11.
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Dec 12 2019 Mat Booth <mat.booth@redhat.com> - 1.1.0-4
 - Fix license tag to include MIT
 
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -145,4 +128,4 @@ sed -i '/(echoout/ d' src/test/java/org/apache/felix/gogo/runtime/TestParser.jav
 - Repackaged, minor changes
 
 * Mon Nov 07 2011 Tomas Radej <tradej@redhat.com> - 0.10.0-1
-- Initial packaging
+- Initial packaging