Accepting request 975892 from Java:packages

netty3 does not have compat version any more

OBS-URL: https://build.opensuse.org/request/show/975892
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/akka?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2022-05-10 13:11:44 +00:00 committed by Git OBS Bridge
commit f522d139d4
2 changed files with 9 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Apr 30 16:08:34 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build against io.netty:netty, since the compat versions do not
exist any more
-------------------------------------------------------------------
Fri Apr 29 14:39:47 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -48,7 +48,7 @@ BuildRequires: javapackages-tools
BuildRequires: mvn(com.google.protobuf:protobuf-java)
# typesafe-config
BuildRequires: mvn(com.typesafe:config)
BuildRequires: mvn(io.netty:netty:3)
BuildRequires: mvn(io.netty:netty)
BuildRequires: mvn(org.osgi:osgi.cmpn)
BuildRequires: mvn(org.osgi:osgi.core)
BuildRequires: mvn(org.scala-lang:scala-compiler)
@ -88,9 +88,7 @@ sed -i "s|@VERSION@|%{namedversion}|" build.xml
%endif
# handle compatibility netty jar
sed -i -e "s|netty[.]jar|$(basename %{_javadir}/netty3-*.jar)|" build.xml
cp -p %{SOURCE8} remote-pom.xml
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='netty']/pom:version" 3 remote-pom.xml
sed -i -e "s|netty[.]jar|$(basename %{_javadir}/netty3.jar)|" build.xml
# use osgi 7.x apis
cp -p %{SOURCE7} osgi-pom.xml
@ -110,7 +108,7 @@ chmod 644 LICENSE
%{mvn_artifact} %{SOURCE5} target/%{name}-dataflow.jar
%{mvn_artifact} %{SOURCE6} target/%{name}-kernel.jar
%{mvn_artifact} osgi-pom.xml target/%{name}-osgi.jar
%{mvn_artifact} remote-pom.xml target/%{name}-remote.jar
%{mvn_artifact} %{SOURCE8} target/%{name}-remote.jar
%{mvn_artifact} %{SOURCE9} target/%{name}-slf4j.jar
%{mvn_artifact} %{SOURCE10} target/%{name}-transactor.jar