From d2981c310a82cd361a97969b831edc2211b0f582 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Oct 30 2020 12:48:27 +0000
Subject: Remove useless parts in RPM land.


---

diff --git a/cbi-plugins.spec b/cbi-plugins.spec
index 9e280c0..ca2a886 100644
--- a/cbi-plugins.spec
+++ b/cbi-plugins.spec
@@ -1,6 +1,6 @@
 Name:           cbi-plugins
 Version:        1.1.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A set of helpers for Eclipse CBI
 License:        EPL-1.0
 URL:            https://git.eclipse.org/c/cbi/org.eclipse.cbi.git/tree/maven-plugins/README.md
@@ -8,20 +8,11 @@ URL:            https://git.eclipse.org/c/cbi/org.eclipse.cbi.git/tree/maven-plu
 Source0:        https://git.eclipse.org/c/cbi/org.eclipse.cbi.git/snapshot/org.eclipse.cbi_maven-plugin-parent_%{version}.tar.xz
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(com.google.auto.value:auto-value)
-BuildRequires:  mvn(de.pdark:decentxml)
-BuildRequires:  mvn(org.apache.commons:commons-compress)
-BuildRequires:  mvn(org.apache.httpcomponents:httpclient)
-BuildRequires:  mvn(org.apache.httpcomponents:httpmime)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.eclipse.tycho:tycho-core)
-%if %{?rhel}%{!?rhel:0} < 8
-# On RHEL 7 need the guava20 package
-BuildRequires:  mvn(com.google.guava:guava:20.0)
-%endif
 
 # Upstream Eclipse no longer supports non-64bit arches
 ExcludeArch: s390 %{arm} %{ix86}
@@ -40,34 +31,21 @@ API documentation for %{name}.
 %setup -q -n org.eclipse.cbi_maven-plugin-parent_%{version}
 %pom_disable_module eclipse-macsigner-plugin maven-plugins
 %pom_disable_module eclipse-winsigner-plugin maven-plugins
+%pom_disable_module eclipse-jarsigner-plugin maven-plugins
 %pom_disable_module eclipse-dmg-packager maven-plugins
 %pom_disable_module eclipse-flatpak-packager maven-plugins
+%pom_disable_module common maven-plugins
+%pom_remove_parent maven-plugins
+
 
 # Disable plugins not needed for RPM builds
 %pom_remove_plugin :spotbugs-maven-plugin
 %pom_remove_plugin :maven-checkstyle-plugin
 %pom_remove_plugin :maven-enforcer-plugin
 
-# Build the common module
-%pom_xpath_inject pom:modules "<module>../common/</module>" maven-plugins
-%pom_remove_dep org.eclipse.cbi:checkstyle common
-
-# Remove separate annotations requirement of auto
-%pom_remove_dep :auto-value-annotations . common maven-plugins/common
-
-# Parent pom and common module are "released" independently, but actually nothing changed yet since last releases
-sed -i -e 's/1\.0\.6-SNAPSHOT/1.0.5/' pom.xml
-sed -i -e 's/1\.2\.4-SNAPSHOT/1.2.3/' common/pom.xml
-
-# Make dep on guava more forgiving
-sed -i -e 's/>28.0-jre</>20.0</' pom.xml
-
-# Don't use static analysis annotations
-sed -i -e 's/@Nonnull//' -e '/javax.annotation.Nonnull/d' common/src/main/java/org/eclipse/cbi/common/security/*.java
-
 %build
 # Tests require jimfs which is not in Fedora
-%mvn_build -f -- -f maven-plugins/pom.xml -Dproject.build.sourceEncoding=UTF-8
+%mvn_build -f -- -f maven-plugins/pom.xml -Dproject.build.sourceEncoding=UTF-8 -Dmaven.compiler.release=8
 
 %install
 %mvn_install
@@ -77,6 +55,9 @@ sed -i -e 's/@Nonnull//' -e '/javax.annotation.Nonnull/d' common/src/main/java/o
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Fri Oct 30 2020 Alexander Kurtakov <akurtako@redhat.com> 1.1.7-8
+- Remove useless parts in RPM land.
+
 * Wed Oct 07 2020 Jie Kang <jkang@redhat.com> - 1.1.7-7
 - Make RHEL dep version explicit