OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=5

jetty-minimal.spec

@@ -26,13 +26,21 @@ Summary:        Java Webserver and Servlet Container
 License:        Apache-2.0 OR EPL-1.0
 URL:            https://www.eclipse.org/jetty/
 Source0:        https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz
+Patch0:         jetty-annotations-asm6.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  mvn(javax.servlet:javax.servlet-api)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(javax.transaction:javax.transaction-api)
+BuildRequires:  mvn(javax.annotation:javax.annotation-api)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
+BuildRequires:  mvn(org.ow2.asm:asm)
+BuildRequires:  mvn(org.ow2.asm:asm-commons)
+BuildRequires:  mvn(org.apache.tomcat:tomcat-jasper)
+BuildRequires:  mvn(org.apache.tomcat:tomcat-util-scan)
+BuildRequires:  mvn(org.eclipse.jetty.toolchain:jetty-schemas)
 BuildArch:      noarch
 
 %description
@@ -52,6 +60,13 @@ Jetty is available on all Java supported platforms.
 This package contains
 %{desc}
 
+%package        -n %{base_name}-annotations
+Summary:        annotations module for Jetty
+License:        Apache-2.0 OR EPL-1.0
+
+%description    -n %{base_name}-annotations
+%{extdesc} %{summary}.
+
 %package        -n %{base_name}-client
 Summary:        client module for Jetty
 License:        Apache-2.0 OR EPL-1.0
@@ -94,6 +109,14 @@ License:        Apache-2.0 OR EPL-1.0
 %description    -n %{base_name}-jaas
 %{extdesc} %{summary}.
 
+%package        -n %{base_name}-jndi
+Summary:        jndi module for Jetty
+License:        Apache-2.0 OR EPL-1.0
+
+%description    -n %{base_name}-jndi
+%{extdesc} %{summary}.
+
+
 %package        -n %{base_name}-jsp
 Summary:        jsp module for Jetty
 License:        Apache-2.0 OR EPL-1.0
@@ -151,6 +174,13 @@ License:        Apache-2.0 OR EPL-1.0
 %description    -n %{base_name}-xml
 %{extdesc} %{summary}.
 
+%package        -n %{base_name}-plus
+Summary:        plus module for Jetty
+License:        Apache-2.0 OR EPL-1.0
+
+%description    -n %{base_name}-plus
+%{extdesc} %{summary}.
+
 %package        -n %{base_name}-proxy
 Summary:        proxy module for Jetty
 License:        Apache-2.0 OR EPL-1.0
@@ -168,6 +198,8 @@ License:        Apache-2.0 OR EPL-1.0
 %prep
 %setup -q -n %{base_name}.project-%{base_name}-%{version}%{addver}
 
+%patch0 -p1
+
 find . -name "*.?ar" -exec rm {} \;
 find . -name "*.class" -exec rm {} \;
 
@@ -276,7 +308,7 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 # remote-resources only copies about.html
 %pom_remove_plugin :maven-remote-resources-plugin
 # packages module configs, we don't need those in minimal
-%pom_remove_plugin :maven-assembly-plugin
+%pom_remove_plugin -r :maven-assembly-plugin
 # only useful when tests are enabled (copies test deps)
 %pom_remove_plugin :maven-dependency-plugin jetty-client
 
@@ -286,15 +318,11 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-websocket
 %pom_disable_module jetty-servlets
 %pom_disable_module jetty-util-ajax
-%pom_disable_module apache-jsp
 %pom_disable_module apache-jstl
 %pom_disable_module jetty-maven-plugin
 %pom_disable_module jetty-jspc-maven-plugin
 %pom_disable_module jetty-deploy
 %pom_disable_module jetty-start
-%pom_disable_module jetty-plus
-%pom_disable_module jetty-annotations
-%pom_disable_module jetty-jndi
 %pom_disable_module jetty-cdi
 %pom_disable_module jetty-spring
 %pom_disable_module jetty-jaspi
@@ -349,12 +377,18 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %mvn_install
 %fdupes -s %{buildroot}%{_javadocdir}
 
+%files -n %{base_name}-annotations -f .mfiles-jetty-annotations
+
 %files -n %{base_name}-client -f .mfiles-jetty-client
 
 %files -n %{base_name}-continuation -f .mfiles-jetty-continuation
 
 %files -n %{base_name}-jaas -f .mfiles-jetty-jaas
 
+%files -n %{base_name}-jndi -f .mfiles-jetty-jndi
+
+%files -n %{base_name}-jsp -f .mfiles-jetty-jsp
+
 %files -n %{base_name}-io -f .mfiles-jetty-io
 
 %files -n %{base_name}-server -f .mfiles-jetty-server
@@ -375,6 +409,8 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 
 %files -n %{base_name}-proxy -f .mfiles-jetty-proxy
 
+%files -n %{base_name}-plus -f .mfiles-jetty-plus
+
 %files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE.txt