Update resteasy upstream version 3.0.26
Signed-off-by: Alexander Scheel <alexander.m.scheel@gmail.com> Signed-off-by: Fabio Valentini <decathorpe@gmail.com>
This commit is contained in:
Alexander Scheel
Fabio Valentini
parent
3dd3280ec6
commit
4d90c0b0f6
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
||||
/3.0.6.Final.tar.gz
|
||||
/3.0.17.Final.tar.gz
|
||||
/resteasy-3.0.19.Final.tar.gz
|
||||
/resteasy-3.0.26.Final.tar.gz
|
||||
|
||||
@ -1,241 +0,0 @@
|
||||
diff -Nru Resteasy-3.0.19.Final/jaxrs/pom.xml Resteasy-3.0.19.Final.mime4j/jaxrs/pom.xml
|
||||
--- Resteasy-3.0.19.Final/jaxrs/pom.xml 2016-08-02 16:26:27.000000000 +0200
|
||||
+++ Resteasy-3.0.19.Final.mime4j/jaxrs/pom.xml 2016-08-21 13:34:08.110158700 +0200
|
||||
@@ -456,8 +456,18 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.james</groupId>
|
||||
- <artifactId>apache-mime4j</artifactId>
|
||||
- <version>0.6</version>
|
||||
+ <artifactId>apache-mime4j-core</artifactId>
|
||||
+ <version>0.7.2</version>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.james</groupId>
|
||||
+ <artifactId>apache-mime4j-dom</artifactId>
|
||||
+ <version>0.7.2</version>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.james</groupId>
|
||||
+ <artifactId>apache-mime4j-storage</artifactId>
|
||||
+ <version>0.7.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
diff -Nru Resteasy-3.0.19.Final/jaxrs/providers/multipart/pom.xml Resteasy-3.0.19.Final.mime4j/jaxrs/providers/multipart/pom.xml
|
||||
--- Resteasy-3.0.19.Final/jaxrs/providers/multipart/pom.xml 2016-08-02 16:26:27.000000000 +0200
|
||||
+++ Resteasy-3.0.19.Final.mime4j/jaxrs/providers/multipart/pom.xml 2016-08-21 13:34:08.110158700 +0200
|
||||
@@ -39,7 +39,15 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.james</groupId>
|
||||
- <artifactId>apache-mime4j</artifactId>
|
||||
+ <artifactId>apache-mime4j-core</artifactId>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.james</groupId>
|
||||
+ <artifactId>apache-mime4j-dom</artifactId>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.james</groupId>
|
||||
+ <artifactId>apache-mime4j-storage</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jboss.spec.javax.servlet</groupId>
|
||||
@@ -180,4 +188,4 @@
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
-</project>
|
||||
\ Manca newline alla fine del file
|
||||
+</project>
|
||||
diff -Nru Resteasy-3.0.19.Final/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/i18n/Messages.java Resteasy-3.0.19.Final.mime4j/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/i18n/Messages.java
|
||||
--- Resteasy-3.0.19.Final/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/i18n/Messages.java 2016-08-02 16:26:27.000000000 +0200
|
||||
+++ Resteasy-3.0.19.Final.mime4j/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/i18n/Messages.java 2016-08-21 13:34:08.111158649 +0200
|
||||
@@ -5,7 +5,7 @@
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.ext.MessageBodyReader;
|
||||
|
||||
-import org.apache.james.mime4j.parser.Field;
|
||||
+import org.apache.james.mime4j.stream.Field;
|
||||
import org.jboss.logging.annotations.Message;
|
||||
import org.jboss.logging.annotations.Message.Format;
|
||||
import org.jboss.logging.annotations.MessageBundle;
|
||||
diff -Nru Resteasy-3.0.19.Final/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java Resteasy-3.0.19.Final.mime4j/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java
|
||||
--- Resteasy-3.0.19.Final/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java 2016-08-02 16:26:27.000000000 +0200
|
||||
+++ Resteasy-3.0.19.Final.mime4j/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartFormDataInputImpl.java 2016-08-21 13:34:08.112158597 +0200
|
||||
@@ -1,9 +1,9 @@
|
||||
package org.jboss.resteasy.plugins.providers.multipart;
|
||||
|
||||
-import org.apache.james.mime4j.field.ContentDispositionField;
|
||||
-import org.apache.james.mime4j.field.FieldName;
|
||||
+import org.apache.james.mime4j.dom.field.ContentDispositionField;
|
||||
+import org.apache.james.mime4j.dom.field.FieldName;
|
||||
import org.apache.james.mime4j.message.BodyPart;
|
||||
-import org.apache.james.mime4j.parser.Field;
|
||||
+import org.apache.james.mime4j.stream.Field;
|
||||
import org.jboss.resteasy.plugins.providers.multipart.i18n.Messages;
|
||||
|
||||
import javax.ws.rs.core.GenericType;
|
||||
diff -Nru Resteasy-3.0.19.Final/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java Resteasy-3.0.19.Final.mime4j/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java
|
||||
--- Resteasy-3.0.19.Final/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java 2016-08-02 16:26:27.000000000 +0200
|
||||
+++ Resteasy-3.0.19.Final.mime4j/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartInputImpl.java 2016-08-21 13:34:08.113158546 +0200
|
||||
@@ -4,22 +4,22 @@
|
||||
import org.apache.james.mime4j.MimeIOException;
|
||||
import org.apache.james.mime4j.codec.Base64InputStream;
|
||||
import org.apache.james.mime4j.codec.QuotedPrintableInputStream;
|
||||
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
|
||||
-import org.apache.james.mime4j.field.ContentTypeField;
|
||||
-import org.apache.james.mime4j.message.BinaryBody;
|
||||
-import org.apache.james.mime4j.message.Body;
|
||||
+import org.apache.james.mime4j.dom.BinaryBody;
|
||||
+import org.apache.james.mime4j.dom.Body;
|
||||
+import org.apache.james.mime4j.dom.Entity;
|
||||
+import org.apache.james.mime4j.dom.Message;
|
||||
+import org.apache.james.mime4j.dom.Multipart;
|
||||
+import org.apache.james.mime4j.dom.TextBody;
|
||||
+import org.apache.james.mime4j.dom.MessageBuilder;
|
||||
+import org.apache.james.mime4j.dom.MessageServiceFactory;
|
||||
+import org.apache.james.mime4j.dom.field.ContentTypeField;
|
||||
+import org.apache.james.mime4j.message.MessageImpl;
|
||||
import org.apache.james.mime4j.message.BodyFactory;
|
||||
import org.apache.james.mime4j.message.BodyPart;
|
||||
-import org.apache.james.mime4j.message.Entity;
|
||||
-import org.apache.james.mime4j.message.Message;
|
||||
-import org.apache.james.mime4j.message.MessageBuilder;
|
||||
-import org.apache.james.mime4j.message.Multipart;
|
||||
-import org.apache.james.mime4j.message.TextBody;
|
||||
-import org.apache.james.mime4j.parser.Field;
|
||||
+import org.apache.james.mime4j.parser.AbstractContentHandler;
|
||||
import org.apache.james.mime4j.parser.MimeStreamParser;
|
||||
-import org.apache.james.mime4j.storage.DefaultStorageProvider;
|
||||
-import org.apache.james.mime4j.storage.StorageProvider;
|
||||
-import org.apache.james.mime4j.util.CharsetUtil;
|
||||
+import org.apache.james.mime4j.stream.BodyDescriptor;
|
||||
+import org.apache.james.mime4j.stream.Field;
|
||||
import org.apache.james.mime4j.util.MimeUtil;
|
||||
import org.jboss.resteasy.core.ProvidersContextRetainer;
|
||||
import org.jboss.resteasy.plugins.providers.multipart.i18n.Messages;
|
||||
@@ -47,6 +47,7 @@
|
||||
import java.lang.reflect.Method;
|
||||
import java.lang.reflect.Type;
|
||||
import java.util.ArrayList;
|
||||
+import java.nio.charset.Charset;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
@@ -69,7 +70,7 @@
|
||||
protected Providers savedProviders;
|
||||
|
||||
// We hack MIME4j so that it always returns a BinaryBody so we don't have to deal with Readers and their charset conversions
|
||||
- private static class BinaryOnlyMessageBuilder extends MessageBuilder
|
||||
+ private static class BinaryOnlyMessageBuilder extends AbstractContentHandler
|
||||
{
|
||||
private Method expectMethod;
|
||||
private java.lang.reflect.Field bodyFactoryField;
|
||||
@@ -92,18 +93,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
- private BinaryOnlyMessageBuilder(Entity entity)
|
||||
- {
|
||||
- super(entity);
|
||||
- init();
|
||||
- }
|
||||
-
|
||||
- private BinaryOnlyMessageBuilder(Entity entity, StorageProvider storageProvider)
|
||||
- {
|
||||
- super(entity, storageProvider);
|
||||
- init();
|
||||
- }
|
||||
-
|
||||
@Override
|
||||
public void body(BodyDescriptor bd, InputStream is) throws MimeException, IOException
|
||||
{
|
||||
@@ -147,13 +136,13 @@
|
||||
}
|
||||
}
|
||||
|
||||
- private static class BinaryMessage extends Message
|
||||
+ private static class BinaryMessage extends MessageImpl
|
||||
{
|
||||
private BinaryMessage(InputStream is) throws IOException, MimeIOException
|
||||
{
|
||||
try {
|
||||
- MimeStreamParser parser = new MimeStreamParser(null);
|
||||
- parser.setContentHandler(new BinaryOnlyMessageBuilder(this, DefaultStorageProvider.getInstance()));
|
||||
+ MimeStreamParser parser = new MimeStreamParser();
|
||||
+ parser.setContentHandler(new BinaryOnlyMessageBuilder());
|
||||
parser.parse(is);
|
||||
} catch (MimeException e) {
|
||||
throw new MimeIOException(e);
|
||||
@@ -198,15 +187,21 @@
|
||||
|
||||
public MultipartInputImpl(Multipart multipart, Providers workers) throws IOException
|
||||
{
|
||||
- for (BodyPart bodyPart : multipart.getBodyParts())
|
||||
- parts.add(extractPart(bodyPart));
|
||||
+ for (Entity bodyPart : multipart.getBodyParts())
|
||||
+ parts.add(extractPart((BodyPart) bodyPart));
|
||||
this.workers = workers;
|
||||
}
|
||||
|
||||
public void parse(InputStream is) throws IOException
|
||||
{
|
||||
- mimeMessage = new BinaryMessage(addHeaderToHeadlessStream(is));
|
||||
- extractParts();
|
||||
+ try {
|
||||
+ MessageServiceFactory factory = MessageServiceFactory.newInstance();
|
||||
+ MessageBuilder builder = factory.newMessageBuilder();
|
||||
+ mimeMessage = builder.parseMessage(addHeaderToHeadlessStream(is));
|
||||
+ extractParts();
|
||||
+ } catch (MimeException e) {
|
||||
+ throw new IOException("Couldn't parse message", e);
|
||||
+ }
|
||||
}
|
||||
|
||||
protected InputStream addHeaderToHeadlessStream(InputStream is)
|
||||
@@ -236,8 +231,8 @@
|
||||
protected void extractParts() throws IOException
|
||||
{
|
||||
Multipart multipart = (Multipart) mimeMessage.getBody();
|
||||
- for (BodyPart bodyPart : multipart.getBodyParts())
|
||||
- parts.add(extractPart(bodyPart));
|
||||
+ for (Entity bodyPart : multipart.getBodyParts())
|
||||
+ parts.add(extractPart((BodyPart) bodyPart));
|
||||
}
|
||||
|
||||
protected InputPart extractPart(BodyPart bodyPart) throws IOException
|
||||
diff -Nru Resteasy-3.0.19.Final/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java Resteasy-3.0.19.Final.mime4j/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java
|
||||
--- Resteasy-3.0.19.Final/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java 2016-08-02 16:26:27.000000000 +0200
|
||||
+++ Resteasy-3.0.19.Final.mime4j/jaxrs/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MultipartRelatedInputImpl.java 2016-08-21 13:34:08.114158495 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
package org.jboss.resteasy.plugins.providers.multipart;
|
||||
|
||||
-import org.apache.james.mime4j.field.ContentTypeField;
|
||||
-import org.apache.james.mime4j.field.FieldName;
|
||||
+import org.apache.james.mime4j.dom.field.ContentTypeField;
|
||||
+import org.apache.james.mime4j.dom.field.FieldName;
|
||||
import org.apache.james.mime4j.message.BodyPart;
|
||||
|
||||
import javax.ws.rs.core.MediaType;
|
||||
diff -Nru Resteasy-3.0.19.Final/jaxrs/security/resteasy-crypto/pom.xml Resteasy-3.0.19.Final.mime4j/jaxrs/security/resteasy-crypto/pom.xml
|
||||
--- Resteasy-3.0.19.Final/jaxrs/security/resteasy-crypto/pom.xml 2016-08-02 16:26:27.000000000 +0200
|
||||
+++ Resteasy-3.0.19.Final.mime4j/jaxrs/security/resteasy-crypto/pom.xml 2016-08-21 13:34:08.115158443 +0200
|
||||
@@ -70,7 +70,15 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.james</groupId>
|
||||
- <artifactId>apache-mime4j</artifactId>
|
||||
+ <artifactId>apache-mime4j-core</artifactId>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.james</groupId>
|
||||
+ <artifactId>apache-mime4j-dom</artifactId>
|
||||
+ </dependency>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.james</groupId>
|
||||
+ <artifactId>apache-mime4j-storage</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jboss.spec.javax.annotation</groupId>
|
||||
@ -1,68 +0,0 @@
|
||||
diff -Nru Resteasy-3.0.19.Final/jaxrs/pom.xml Resteasy-3.0.19.Final.netty3/jaxrs/pom.xml
|
||||
--- Resteasy-3.0.19.Final/jaxrs/pom.xml 2016-12-27 11:13:52.980803759 +0100
|
||||
+++ Resteasy-3.0.19.Final.netty3/jaxrs/pom.xml 2016-12-27 11:15:46.080178186 +0100
|
||||
@@ -39,7 +39,7 @@
|
||||
<dep.cdi-api.version>1.2</dep.cdi-api.version>
|
||||
<dep.jboss-ejb-api_3.1_spec.version>1.0.0.Final</dep.jboss-ejb-api_3.1_spec.version>
|
||||
<dep.guice.version>4.0</dep.guice.version>
|
||||
- <dep.netty.version>3.6.4.Final</dep.netty.version>
|
||||
+ <dep.netty.version>3.10.6.Final</dep.netty.version>
|
||||
<dep.netty4.version>4.0.7.Final</dep.netty4.version>
|
||||
<dep.slf4j.version>1.7.5</dep.slf4j.version>
|
||||
<dep.bc.version>1.52</dep.bc.version>
|
||||
diff -Nru Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyHttpResponse.java Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyHttpResponse.java
|
||||
--- Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyHttpResponse.java 2016-08-02 16:26:27.000000000 +0200
|
||||
+++ Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyHttpResponse.java 2016-12-27 11:14:53.477794634 +0100
|
||||
@@ -119,8 +119,9 @@
|
||||
if (keepAlive)
|
||||
{
|
||||
// Add keep alive and content length if needed
|
||||
- response.addHeader(Names.CONNECTION, Values.KEEP_ALIVE);
|
||||
- response.addHeader(Names.CONTENT_LENGTH, 0);
|
||||
+ response.headers()
|
||||
+ .add(Names.CONNECTION, Values.KEEP_ALIVE)
|
||||
+ .add(Names.CONTENT_LENGTH, 0);
|
||||
}
|
||||
channel.write(response);
|
||||
committed = true;
|
||||
diff -Nru Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyUtil.java Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyUtil.java
|
||||
--- Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyUtil.java 2016-08-02 16:26:27.000000000 +0200
|
||||
+++ Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/NettyUtil.java 2016-12-27 11:03:35.816979009 +0100
|
||||
@@ -98,7 +98,7 @@
|
||||
{
|
||||
Headers<String> requestHeaders = new Headers<String>();
|
||||
|
||||
- for (Map.Entry<String, String> header : request.getHeaders())
|
||||
+ for (Map.Entry<String, String> header : request.headers())
|
||||
{
|
||||
requestHeaders.add(header.getKey(), header.getValue());
|
||||
}
|
||||
diff -Nru Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/RestEasyHttpResponseEncoder.java Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/RestEasyHttpResponseEncoder.java
|
||||
--- Resteasy-3.0.19.Final/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/RestEasyHttpResponseEncoder.java 2016-08-02 16:26:27.000000000 +0200
|
||||
+++ Resteasy-3.0.19.Final.netty3/jaxrs/server-adapters/resteasy-netty/src/main/java/org/jboss/resteasy/plugins/server/netty/RestEasyHttpResponseEncoder.java 2016-12-27 11:05:34.884907810 +0100
|
||||
@@ -58,11 +58,11 @@
|
||||
RuntimeDelegate.HeaderDelegate delegate = dispatcher.providerFactory.getHeaderDelegate(value.getClass());
|
||||
if (delegate != null)
|
||||
{
|
||||
- response.addHeader(key, delegate.toString(value));
|
||||
+ response.headers().add(key, delegate.toString(value));
|
||||
}
|
||||
else
|
||||
{
|
||||
- response.setHeader(key, value.toString());
|
||||
+ response.headers().add(key, value.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -77,8 +77,9 @@
|
||||
if (nettyResponse.isKeepAlive())
|
||||
{
|
||||
// Add content length and connection header if needed
|
||||
- response.setHeader(Names.CONTENT_LENGTH, buffer.readableBytes());
|
||||
- response.setHeader(Names.CONNECTION, Values.KEEP_ALIVE);
|
||||
+ response.headers()
|
||||
+ .set(Names.CONTENT_LENGTH, buffer.readableBytes())
|
||||
+ .set(Names.CONNECTION, Values.KEEP_ALIVE);
|
||||
}
|
||||
return response;
|
||||
}
|
||||
428
resteasy.spec
428
resteasy.spec
@ -2,95 +2,53 @@
|
||||
%global namedversion %{version}%{namedreltag}
|
||||
|
||||
Name: resteasy
|
||||
Version: 3.0.19
|
||||
Release: 10%{?dist}
|
||||
Version: 3.0.26
|
||||
Release: 1%{?dist}
|
||||
Summary: Framework for RESTful Web services and Java applications
|
||||
License: ASL 2.0 and CDDL
|
||||
URL: http://resteasy.jboss.org/
|
||||
Source0: https://github.com/resteasy/Resteasy/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz
|
||||
|
||||
# Support for mime4j 0.7.2
|
||||
Patch0: resteasy-3.0.19-Mime4j-0.7.2-support.patch
|
||||
|
||||
Patch1: resteasy-3.0.19-port-resteasy-netty-to-netty-3.10.6.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.beust:jcommander)
|
||||
BuildRequires: mvn(com.fasterxml:classmate)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(com.sun.xml.bind:jaxb-impl)
|
||||
BuildRequires: mvn(log4j:log4j)
|
||||
BuildRequires: mvn(org.apache.httpcomponents:httpclient)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
|
||||
BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
|
||||
|
||||
# Jackson 2
|
||||
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind)
|
||||
BuildRequires: mvn(com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider)
|
||||
BuildRequires: mvn(com.google.inject:guice)
|
||||
BuildRequires: mvn(com.sun.mail:javax.mail)
|
||||
BuildRequires: mvn(com.sun.xml.bind:jaxb-impl)
|
||||
BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(io.netty:netty:3)
|
||||
BuildRequires: mvn(io.netty:netty-all)
|
||||
BuildRequires: mvn(io.undertow:undertow-core)
|
||||
BuildRequires: mvn(io.undertow:undertow-servlet)
|
||||
BuildRequires: mvn(javax.enterprise:cdi-api)
|
||||
BuildRequires: mvn(javax.json:javax.json-api)
|
||||
BuildRequires: mvn(javax.validation:validation-api)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(log4j:log4j:12)
|
||||
BuildRequires: mvn(net.jcip:jcip-annotations)
|
||||
BuildRequires: mvn(net.oauth.core:oauth-provider)
|
||||
BuildRequires: mvn(org.apache.httpcomponents:httpclient)
|
||||
BuildRequires: mvn(org.apache.james:apache-mime4j-core)
|
||||
BuildRequires: mvn(org.apache.james:apache-mime4j-dom)
|
||||
BuildRequires: mvn(org.apache.james:apache-mime4j-storage)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
|
||||
BuildRequires: mvn(org.bouncycastle:bcmail-jdk15on)
|
||||
BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on)
|
||||
BuildRequires: mvn(org.codehaus.jackson:jackson-core-asl)
|
||||
BuildRequires: mvn(org.codehaus.jackson:jackson-jaxrs)
|
||||
BuildRequires: mvn(org.codehaus.jackson:jackson-mapper-asl)
|
||||
BuildRequires: mvn(org.codehaus.jackson:jackson-xc)
|
||||
BuildRequires: mvn(org.codehaus.jettison:jettison)
|
||||
BuildRequires: mvn(org.eclipse.jetty:jetty-server)
|
||||
BuildRequires: mvn(org.glassfish:javax.el)
|
||||
BuildRequires: mvn(org.glassfish:javax.json)
|
||||
BuildRequires: mvn(org.hibernate:hibernate-validator)
|
||||
BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.0-api)
|
||||
BuildRequires: mvn(org.infinispan:infinispan-core)
|
||||
|
||||
BuildRequires: mvn(org.jboss:jboss-parent:pom:)
|
||||
BuildRequires: mvn(org.jboss.jandex:jandex-maven-plugin)
|
||||
BuildRequires: mvn(org.jboss.logging:jboss-logging)
|
||||
BuildRequires: mvn(org.jboss.logging:jboss-logging-annotations)
|
||||
BuildRequires: mvn(org.jboss.logging:jboss-logging-processor)
|
||||
BuildRequires: mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec)
|
||||
BuildRequires: mvn(org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec)
|
||||
BuildRequires: mvn(org.jboss.spec.javax.el:jboss-el-api_3.0_spec)
|
||||
BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_2.5_spec)
|
||||
BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec)
|
||||
BuildRequires: mvn(org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec)
|
||||
BuildRequires: mvn(org.jboss.weld:weld-api)
|
||||
BuildRequires: mvn(org.picketbox:picketbox)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.springframework:spring-core)
|
||||
BuildRequires: mvn(org.springframework:spring-test)
|
||||
BuildRequires: mvn(org.springframework:spring-webmvc)
|
||||
BuildRequires: mvn(org.yaml:snakeyaml)
|
||||
|
||||
Requires: resteasy-core = %{version}-%{release}
|
||||
Requires: resteasy-atom-provider = %{version}-%{release}
|
||||
Requires: resteasy-fastinfoset-provider = %{version}-%{release}
|
||||
Requires: resteasy-jackson-provider = %{version}-%{release}
|
||||
Requires: resteasy-client = %{version}-%{release}
|
||||
Requires: resteasy-core = %{version}-%{release}
|
||||
Requires: resteasy-jackson2-provider = %{version}-%{release}
|
||||
Requires: resteasy-jaxb-provider = %{version}-%{release}
|
||||
Requires: resteasy-jettison-provider = %{version}-%{release}
|
||||
Requires: resteasy-json-p-provider = %{version}-%{release}
|
||||
Requires: resteasy-multipart-provider = %{version}-%{release}
|
||||
Requires: resteasy-validator-provider-11 = %{version}-%{release}
|
||||
Requires: resteasy-yaml-provider = %{version}-%{release}
|
||||
Requires: resteasy-client = %{version}-%{release}
|
||||
Requires: resteasy-optional = %{version}-%{release}
|
||||
Requires: resteasy-test = %{version}-%{release}
|
||||
Requires: resteasy-netty3 = %{version}-%{release}
|
||||
|
||||
# subpackages removed in fedora 32
|
||||
Obsoletes: %{name}-fastinfoset-provider < 3.0.26-1
|
||||
Obsoletes: %{name}-jackson-provider < 3.0.26-1
|
||||
Obsoletes: %{name}-jettison-provider < 3.0.26-1
|
||||
Obsoletes: %{name}-json-p-provider < 3.0.26-1
|
||||
Obsoletes: %{name}-multipart-provider < 3.0.26-1
|
||||
Obsoletes: %{name}-netty3 < 3.0.26-1
|
||||
Obsoletes: %{name}-optional < 3.0.26-1
|
||||
Obsoletes: %{name}-test < 3.0.26-1
|
||||
Obsoletes: %{name}-validator-provider-11 < 3.0.26-1
|
||||
Obsoletes: %{name}-yaml-provider < 3.0.26-1
|
||||
|
||||
%description
|
||||
%global desc \
|
||||
@ -121,18 +79,6 @@ Summary: Module atom-provider for %{name}
|
||||
%description atom-provider
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package fastinfoset-provider
|
||||
Summary: Module fastinfoset-provider for %{name}
|
||||
|
||||
%description fastinfoset-provider
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package jackson-provider
|
||||
Summary: Module jackson-provider for %{name}
|
||||
|
||||
%description jackson-provider
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package jackson2-provider
|
||||
Summary: Module jackson2-provider for %{name}
|
||||
|
||||
@ -145,184 +91,111 @@ Summary: Module jaxb-provider for %{name}
|
||||
%description jaxb-provider
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package jettison-provider
|
||||
Summary: Module jettison-provider for %{name}
|
||||
|
||||
%description jettison-provider
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package json-p-provider
|
||||
Summary: Module json-p-provider for %{name}
|
||||
|
||||
%description json-p-provider
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package multipart-provider
|
||||
Summary: Module multipart-provider for %{name}
|
||||
|
||||
%description multipart-provider
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package netty3
|
||||
Summary: Netty 3 Integration for %{name}
|
||||
|
||||
%description netty3
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package validator-provider-11
|
||||
Summary: Module validate-provider-11 for %{name}
|
||||
|
||||
%description validator-provider-11
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package yaml-provider
|
||||
Summary: Module yaml-provider for %{name}
|
||||
|
||||
%description yaml-provider
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package client
|
||||
Summary: Client for %{name}
|
||||
|
||||
%description client
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package optional
|
||||
# BSD: ./jaxrs/tjws/src/main/java/Acme/*
|
||||
# LGPLv2: ./jaxrs/resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/CdiPropertyInjector.java
|
||||
License: ASL 2.0 and BSD and LGPLv2+
|
||||
Summary: Optional modules for %{name}
|
||||
|
||||
%description optional
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%package test
|
||||
Summary: Test modules for %{name}
|
||||
|
||||
%description test
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q -n Resteasy-%{namedversion}
|
||||
|
||||
%pom_disable_module arquillian
|
||||
%pom_disable_module eagledns
|
||||
%pom_disable_module jboss-modules
|
||||
%pom_disable_module profiling-tests
|
||||
%pom_disable_module resteasy-bom
|
||||
%pom_disable_module resteasy-cache
|
||||
%pom_disable_module resteasy-cdi
|
||||
%pom_disable_module resteasy-dependencies-bom
|
||||
%pom_disable_module resteasy-guice
|
||||
%pom_disable_module resteasy-jaxrs-testsuite
|
||||
%pom_disable_module resteasy-jsapi
|
||||
%pom_disable_module resteasy-jsapi-testing
|
||||
%pom_disable_module resteasy-links
|
||||
%pom_disable_module resteasy-servlet-initializer
|
||||
%pom_disable_module resteasy-spring
|
||||
%pom_disable_module resteasy-wadl
|
||||
%pom_disable_module resteasy-wadl-undertow-connector
|
||||
%pom_disable_module security
|
||||
%pom_disable_module server-adapters
|
||||
%pom_disable_module testsuite
|
||||
%pom_disable_module tjws
|
||||
|
||||
pushd providers
|
||||
%pom_disable_module fastinfoset
|
||||
%pom_disable_module jackson
|
||||
%pom_disable_module jettison
|
||||
%pom_disable_module json-p-ee7
|
||||
%pom_disable_module multipart
|
||||
%pom_disable_module resteasy-html
|
||||
%pom_disable_module resteasy-validator-provider-11
|
||||
%pom_disable_module yaml
|
||||
popd
|
||||
|
||||
find -name '*.jar' -print -delete
|
||||
|
||||
%pom_remove_plugin :maven-clover2-plugin
|
||||
|
||||
# remove activation.jar dependencies
|
||||
%pom_remove_dep -r javax.activation:activation resteasy-jaxrs resteasy-spring
|
||||
|
||||
# remove resteasy-dependencies pom
|
||||
%pom_remove_dep "org.jboss.resteasy:resteasy-dependencies"
|
||||
|
||||
# remove redundant jcip-dependencies dep from resteasy-jaxrs
|
||||
%pom_remove_dep net.jcip:jcip-annotations resteasy-jaxrs
|
||||
|
||||
# remove junit dependency from all modules
|
||||
%pom_remove_dep junit:junit resteasy-client
|
||||
%pom_remove_dep junit:junit providers/resteasy-atom
|
||||
%pom_remove_dep junit:junit providers/jaxb
|
||||
%pom_remove_dep junit:junit resteasy-jaxrs
|
||||
|
||||
# depend on servlet-api from pki-servlet-4.0-api
|
||||
%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api resteasy-jaxrs
|
||||
%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/abdera-atom
|
||||
%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/jaxb
|
||||
%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/jackson2
|
||||
|
||||
%pom_remove_plugin :maven-clean-plugin
|
||||
|
||||
%mvn_package ":resteasy-jaxrs" core
|
||||
%mvn_package ":providers-pom" core
|
||||
%mvn_package ":resteasy-jaxrs-all" core
|
||||
%mvn_package ":resteasy-pom" core
|
||||
%mvn_package ":resteasy-atom-provider" atom-provider
|
||||
%mvn_package ":resteasy-fastinfoset-provider" fastinfoset-provider
|
||||
%mvn_package ":resteasy-jackson-provider" jackson-provider
|
||||
%mvn_package ":resteasy-jackson2-provider" jackson2-provider
|
||||
%mvn_package ":resteasy-jaxb-provider" jaxb-provider
|
||||
%mvn_package ":resteasy-jettison-provider" jettison-provider
|
||||
%mvn_package ":resteasy-json-p-provider" json-p-provider
|
||||
%mvn_package ":resteasy-multipart-provider" multipart-provider
|
||||
%mvn_package ":resteasy-validator-provider-11" validator-provider-11
|
||||
%mvn_package ":resteasy-yaml-provider" yaml-provider
|
||||
%mvn_package ":resteasy-client" client
|
||||
%mvn_package ":test-resteasy-html" test
|
||||
%mvn_package ":test-all-jaxb" test
|
||||
%mvn_package ":test-jackson-jaxb-coexistence" test
|
||||
%mvn_package ":resteasy-jaxrs-testsuite" test
|
||||
%mvn_package ":async-http-servlet-3.0" optional
|
||||
%mvn_package ":asynch-http-servlet-3.0-pom" optional
|
||||
%mvn_package ":http-adapter-pom" optional
|
||||
%mvn_package ":jose-jwt" optional
|
||||
%mvn_package ":resteasy-bom" optional
|
||||
%mvn_package ":resteasy-cache-core" optional
|
||||
%mvn_package ":resteasy-cache-pom" optional
|
||||
%mvn_package ":resteasy-cdi" optional
|
||||
%mvn_package ":resteasy-crypto" optional
|
||||
%mvn_package ":resteasy-guice" optional
|
||||
%mvn_package ":resteasy-html" optional
|
||||
%mvn_package ":resteasy-jdk-http" optional
|
||||
%mvn_package ":resteasy-jsapi" optional
|
||||
%mvn_package ":resteasy-keystone-core" optional
|
||||
%mvn_package ":resteasy-links" optional
|
||||
%mvn_package ":resteasy-netty4" optional
|
||||
%mvn_package ":resteasy-netty4-cdi" optional
|
||||
%mvn_package ":resteasy-oauth" optional
|
||||
%mvn_package ":resteasy-servlet-initializer" optional
|
||||
%mvn_package ":resteasy-spring" optional
|
||||
%mvn_package ":resteasy-undertow" optional
|
||||
%mvn_package ":resteasy-wadl" optional
|
||||
%mvn_package ":security-pom" optional
|
||||
%mvn_package ":tjws" optional
|
||||
%mvn_package ":resteasy-netty" netty3
|
||||
|
||||
find -name '*.jar' -print -delete
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# Disable unnecesary modules
|
||||
%pom_disable_module examples jaxrs
|
||||
%pom_disable_module profiling-tests jaxrs
|
||||
%pom_disable_module resteasy-test-data jaxrs
|
||||
%pom_disable_module war-tests jaxrs
|
||||
|
||||
%pom_disable_module jboss-modules jaxrs
|
||||
%pom_disable_module login-module-authenticator jaxrs/security
|
||||
%pom_disable_module skeleton-key-idm jaxrs/security
|
||||
#skeleton-key-as7
|
||||
#skeleton-key-idp-war
|
||||
%pom_disable_module keystone/keystone-as7 jaxrs/security
|
||||
%pom_disable_module keystone/keystone-as7-modules jaxrs/security
|
||||
|
||||
%pom_disable_module test-jackson-jaxb-coexistence jaxrs/providers
|
||||
%pom_disable_module test-resteasy-html jaxrs/providers
|
||||
|
||||
%pom_disable_module arquillian jaxrs
|
||||
|
||||
%pom_disable_module async-http-servlet-3.0-test jaxrs/async-http-servlet-3.0
|
||||
%pom_disable_module callback-test jaxrs/async-http-servlet-3.0
|
||||
# HV 4.3
|
||||
%pom_disable_module resteasy-hibernatevalidator-provider jaxrs/providers
|
||||
|
||||
%pom_change_dep "org.mortbay.jetty:jetty" "org.eclipse.jetty:jetty-server" jaxrs/resteasy-spring
|
||||
sed -i "s|org.mortbay.jetty.Server|org.eclipse.jetty.server.Server|" \
|
||||
jaxrs/resteasy-spring/src/main/java/org/jboss/resteasy/springmvc/JettyLifecycleManager.java
|
||||
|
||||
%pom_remove_plugin com.atlassian.maven.plugins:maven-clover2-plugin jaxrs
|
||||
%pom_remove_plugin com.atlassian.maven.plugins:maven-clover2-plugin jaxrs/resteasy-jaxrs
|
||||
|
||||
# Replace 2.5 servlet with the jboss-servlet-2.5-api provides
|
||||
%pom_change_dep "javax.servlet:servlet-api" "org.jboss.spec.javax.servlet:jboss-servlet-api_2.5_spec" jaxrs/tjws
|
||||
|
||||
%pom_xpath_set pom:properties/pom:dep.netty.version 3 jaxrs
|
||||
|
||||
# remove activation.jar dependencies
|
||||
%pom_remove_dep -r javax.activation:activation jaxrs jaxrs/resteasy-jaxrs jaxrs/resteasy-spring jaxrs/resteasy-test-data
|
||||
|
||||
# Remove duplicate entry
|
||||
%pom_remove_dep :tjws::test jaxrs/resteasy-jaxrs-testsuite
|
||||
|
||||
# Fixing JDK7 ASCII issues
|
||||
files='
|
||||
jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/annotations/Query.java
|
||||
jaxrs/resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/QueryInjector.java
|
||||
jaxrs/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIWriter.java
|
||||
jaxrs/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIServlet.java
|
||||
jaxrs/resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/ServiceRegistry.java
|
||||
jaxrs/resteasy-links/src/main/java/org/jboss/resteasy/links/AddLinks.java
|
||||
jaxrs/resteasy-links/src/main/java/org/jboss/resteasy/links/ELProvider.java
|
||||
jaxrs/resteasy-links/src/main/java/org/jboss/resteasy/links/LinkELProvider.java
|
||||
jaxrs/resteasy-links/src/main/java/org/jboss/resteasy/links/LinkResource.java
|
||||
jaxrs/resteasy-links/src/main/java/org/jboss/resteasy/links/LinkResources.java
|
||||
jaxrs/resteasy-links/src/main/java/org/jboss/resteasy/links/ParentResource.java
|
||||
jaxrs/resteasy-links/src/main/java/org/jboss/resteasy/links/RESTServiceDiscovery.java
|
||||
jaxrs/resteasy-links/src/main/java/org/jboss/resteasy/links/ResourceFacade.java
|
||||
jaxrs/resteasy-links/src/main/java/org/jboss/resteasy/links/ResourceID.java
|
||||
jaxrs/resteasy-links/src/main/java/org/jboss/resteasy/links/ResourceIDs.java
|
||||
jaxrs/security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthConsumer.java
|
||||
jaxrs/security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthException.java
|
||||
jaxrs/security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthFilter.java
|
||||
jaxrs/security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthMemoryProvider.java
|
||||
jaxrs/security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthProvider.java
|
||||
jaxrs/security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthProviderChecker.java
|
||||
jaxrs/security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthRequestToken.java
|
||||
jaxrs/security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthServlet.java
|
||||
jaxrs/security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthToken.java
|
||||
jaxrs/security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthValidator.java
|
||||
resteasy-jaxrs/src/main/java/org/jboss/resteasy/annotations/Query.java
|
||||
resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/QueryInjector.java
|
||||
resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIWriter.java
|
||||
resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/JSAPIServlet.java
|
||||
resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/ServiceRegistry.java
|
||||
resteasy-links/src/main/java/org/jboss/resteasy/links/AddLinks.java
|
||||
resteasy-links/src/main/java/org/jboss/resteasy/links/ELProvider.java
|
||||
resteasy-links/src/main/java/org/jboss/resteasy/links/LinkELProvider.java
|
||||
resteasy-links/src/main/java/org/jboss/resteasy/links/LinkResource.java
|
||||
resteasy-links/src/main/java/org/jboss/resteasy/links/LinkResources.java
|
||||
resteasy-links/src/main/java/org/jboss/resteasy/links/ParentResource.java
|
||||
resteasy-links/src/main/java/org/jboss/resteasy/links/RESTServiceDiscovery.java
|
||||
resteasy-links/src/main/java/org/jboss/resteasy/links/ResourceFacade.java
|
||||
resteasy-links/src/main/java/org/jboss/resteasy/links/ResourceID.java
|
||||
resteasy-links/src/main/java/org/jboss/resteasy/links/ResourceIDs.java
|
||||
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthConsumer.java
|
||||
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthException.java
|
||||
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthFilter.java
|
||||
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthMemoryProvider.java
|
||||
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthProvider.java
|
||||
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthProviderChecker.java
|
||||
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthRequestToken.java
|
||||
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthServlet.java
|
||||
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthToken.java
|
||||
security/resteasy-oauth/src/main/java/org/jboss/resteasy/auth/oauth/OAuthValidator.java
|
||||
'
|
||||
|
||||
for f in ${files}; do
|
||||
@ -330,97 +203,44 @@ native2ascii -encoding UTF8 ${f} ${f}
|
||||
done
|
||||
|
||||
# Disable useless artifacts generation, package __noinstall do not work
|
||||
%pom_add_plugin org.apache.maven.plugins:maven-source-plugin jaxrs '
|
||||
%pom_add_plugin org.apache.maven.plugins:maven-source-plugin . '
|
||||
<configuration>
|
||||
<skipSource>true</skipSource>
|
||||
</configuration>'
|
||||
|
||||
%build
|
||||
|
||||
%mvn_build -f
|
||||
|
||||
# Create Jandex index file(s)
|
||||
# Not all files are required by WildFly, but let's create indexes for all of them
|
||||
find -name 'resteasy-*-%{namedversion}.jar' | while read f; do
|
||||
java -cp $(build-classpath jandex) org.jboss.jandex.Main -j ${f}
|
||||
done
|
||||
|
||||
# async-http-servlet-3.0 jose-jwt tjws
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
find -name "resteasy-*-jandex.jar" | while read f; do
|
||||
install -pm 644 ${f} %{buildroot}%{_javadir}/%{name}/$(basename -s "-%{namedversion}-jandex.jar" $f)-jandex.jar
|
||||
done
|
||||
|
||||
%files
|
||||
%doc README.md jaxrs/README.html
|
||||
%license jaxrs/License.html
|
||||
%doc README.md
|
||||
%license License.html
|
||||
|
||||
%files core -f .mfiles-core
|
||||
%{_javadir}/%{name}/resteasy-jaxrs-jandex.jar
|
||||
%license License.html
|
||||
|
||||
%files atom-provider -f .mfiles-atom-provider
|
||||
%{_javadir}/%{name}/resteasy-atom-provider-jandex.jar
|
||||
|
||||
%files fastinfoset-provider -f .mfiles-fastinfoset-provider
|
||||
%{_javadir}/%{name}/resteasy-fastinfoset-provider-jandex.jar
|
||||
|
||||
%files jackson-provider -f .mfiles-jackson-provider
|
||||
%{_javadir}/%{name}/resteasy-jackson-provider-jandex.jar
|
||||
%license License.html
|
||||
|
||||
%files jackson2-provider -f .mfiles-jackson2-provider
|
||||
%{_javadir}/%{name}/resteasy-jackson2-provider-jandex.jar
|
||||
%license License.html
|
||||
|
||||
%files jaxb-provider -f .mfiles-jaxb-provider
|
||||
%{_javadir}/%{name}/resteasy-jaxb-provider-jandex.jar
|
||||
|
||||
%files jettison-provider -f .mfiles-jettison-provider
|
||||
%{_javadir}/%{name}/resteasy-jettison-provider-jandex.jar
|
||||
|
||||
%files json-p-provider -f .mfiles-json-p-provider
|
||||
%{_javadir}/%{name}/resteasy-json-p-provider-jandex.jar
|
||||
|
||||
%files multipart-provider -f .mfiles-multipart-provider
|
||||
%{_javadir}/%{name}/resteasy-multipart-provider-jandex.jar
|
||||
|
||||
%files netty3 -f .mfiles-netty3
|
||||
%{_javadir}/%{name}/resteasy-netty-jandex.jar
|
||||
|
||||
%files validator-provider-11 -f .mfiles-validator-provider-11
|
||||
%{_javadir}/%{name}/resteasy-validator-provider-11-jandex.jar
|
||||
|
||||
%files yaml-provider -f .mfiles-yaml-provider
|
||||
%{_javadir}/%{name}/resteasy-yaml-provider-jandex.jar
|
||||
%license License.html
|
||||
|
||||
%files client -f .mfiles-client
|
||||
%{_javadir}/%{name}/resteasy-client-jandex.jar
|
||||
|
||||
%files optional -f .mfiles-optional
|
||||
%{_javadir}/%{name}/resteasy-cache-core-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-cdi-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-crypto-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-guice-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-html-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-jdk-http-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-jsapi-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-keystone-core-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-links-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-netty4-cdi-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-netty4-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-oauth-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-servlet-initializer-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-undertow-jandex.jar
|
||||
%{_javadir}/%{name}/resteasy-wadl-jandex.jar
|
||||
|
||||
%files test -f .mfiles-test
|
||||
%{_javadir}/%{name}/resteasy-jaxrs-testsuite-jandex.jar
|
||||
%license License.html
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license jaxrs/License.html
|
||||
%license License.html
|
||||
|
||||
%changelog
|
||||
* Fri Oct 18 2019 Dogtag PKI Team <pki-devel@redhat.com> 3.0.26-1
|
||||
- Update to version 3.0.26.
|
||||
- Build with reduced functionality and dependency set.
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.19-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user