rpms/protobuf
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Re-enable java"

Browse Source 
This reverts commit 08e46e3afb.
This commit is contained in:
Adrian Reber 2021-11-05 15:48:07 +01:00
parent 3b4dc1e6a5
commit 0a195a154c
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
protobuf.spec
View File

@ -1,7 +1,7 @@
# Build -python subpackage # Build -python subpackage
%bcond_without python %bcond_without python
# Build -java subpackage # Build -java subpackage
%bcond_without java %bcond_with java
#global rcver rc2 #global rcver rc2
@ -139,8 +139,6 @@ BuildArch: noarch
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(com.google.code.gson:gson) BuildRequires: mvn(com.google.code.gson:gson)
BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(com.google.guava:guava)
BuildRequires: mvn(com.google.guava:guava-testlib)
BuildRequires: mvn(com.google.truth:truth)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
@ -216,18 +214,19 @@ find -name \*.cc -o -name \*.h | xargs chmod -x
chmod 644 examples/* chmod 644 examples/*
%if %{with java} %if %{with java}
%pom_remove_dep org.easymock:easymockclassextension java/pom.xml java/core/pom.xml java/lite/pom.xml java/util/pom.xml %pom_remove_dep org.easymock:easymockclassextension java/pom.xml java/core/pom.xml java/lite/pom.xml java/util/pom.xml
%pom_remove_dep com.google.truth:truth java/pom.xml java/core/pom.xml java/lite/pom.xml java/util/pom.xml
%pom_remove_dep com.google.errorprone:error_prone_annotations java/util/pom.xml %pom_remove_dep com.google.errorprone:error_prone_annotations java/util/pom.xml
%pom_remove_dep com.google.guava:guava-testlib java/pom.xml java/util/pom.xml
# These use easymockclassextension # These use easymockclassextension
rm java/core/src/test/java/com/google/protobuf/ServiceTest.java rm java/core/src/test/java/com/google/protobuf/ServiceTest.java
# These use truth or error_prone_annotations or guava-testlib
# Remove annotation libraries we don't have rm java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java
annotations=$( rm java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java
find -name '*.java' | rm java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java
xargs grep -h -e '^import com\.google\.errorprone\.annotation' | rm java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
sort -u | sed 's/.*\.\([^.]*\);/\1/' | paste -sd\| rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java
) rm -r java/util/src/test/java/com/google/protobuf/util
find -name '*.java' | xargs sed -ri \ rm -r java/util/src/main/java/com/google/protobuf/util
"s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g'
# Make OSGi dependency on sun.misc package optional # Make OSGi dependency on sun.misc package optional
%pom_xpath_inject "pom:configuration/pom:instructions" "<Import-Package>sun.misc;resolution:=optional,*</Import-Package>" java/core %pom_xpath_inject "pom:configuration/pom:instructions" "<Import-Package>sun.misc;resolution:=optional,*</Import-Package>" java/core