Skip to content
Commits on Source (9)
install:
- mvn clean
script:
- mvn -B -fae -Dserver.version=$SERVER_VERSION install
- travis_wait 60 mvn -B -Ptravis -fae -Dserver.version=$SERVER_VERSION install
language: java
jdk:
......@@ -24,5 +24,3 @@ addons:
apt:
packages:
- oracle-java8-installer
\ No newline at end of file
before_install:
- "if [ -d \"$JAVA_HOME/jre\" ]; then SEC_LIB=$JAVA_HOME/jre; else SEC_LIB=$JAVA_HOME; fi; sudo unzip -j -o travis-libs/jce_policy-8.zip *.jar -d $SEC_LIB/lib/security;"
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.6.1.SP2</version>
<version>3.6.2.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>RESTEASY-1056-jetty-bv11</artifactId>
......
package org.jboss.resteasy.resteasy1056;
import org.jboss.logging.Logger;
import javax.validation.constraints.Min;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
......@@ -19,12 +21,15 @@ import javax.ws.rs.core.Response;
@Path("/")
public class TestResource
{
private static final Logger LOG = Logger.getLogger(TestResource.class);
@GET
@Path("test/{param}")
@Produces(MediaType.TEXT_PLAIN)
public Response test(@Min(7) @PathParam("param") int param)
{
System.out.println("param: " + param);
LOG.info("param: " + param);
return Response.ok().entity(param).build();
}
}
......@@ -9,6 +9,7 @@ import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.logging.Logger;
import org.jboss.resteasy.api.validation.ResteasyConstraintViolation;
import org.jboss.resteasy.api.validation.ResteasyViolationException;
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
......@@ -32,6 +33,9 @@ import org.junit.runner.RunWith;
@RunWith(Arquillian.class)
@RunAsClient
public class MissingCDITest {
private static final Logger LOG = Logger.getLogger(MissingCDITest.class);
@Deployment
public static Archive<?> createTestArchive() {
WebArchive war = ShrinkWrap.create(WebArchive.class, "RESTEASY-1056.war")
......@@ -46,9 +50,9 @@ public class MissingCDITest {
@Test
public void testMissingCDIValid() throws Exception {
Response response = ResteasyClientBuilder.newClient().target(baseUri.toString() + "test/17").request().get();
System.out.println("Status: " + response.getStatus());
LOG.info("Status: " + response.getStatus());
String entity = response.readEntity(String.class);
System.out.println("Result: " + entity);
LOG.info("Result: " + entity);
assertEquals(200, response.getStatus());
Assert.assertEquals("17", entity);
}
......@@ -56,9 +60,9 @@ public class MissingCDITest {
@Test
public void testMissingCDIInvalid() throws Exception {
Response response = ResteasyClientBuilder.newClient().target(baseUri.toString() + "test/0").request().get();
System.out.println("Status: " + response.getStatus());
LOG.info("Status: " + response.getStatus());
String entity = response.readEntity(String.class);
System.out.println("Result: " + entity);
LOG.info("Result: " + entity);
assertEquals(400, response.getStatus());
ResteasyViolationException e = new ResteasyViolationException(entity);
countViolations(e, 1, 0, 0, 0, 1, 0);
......@@ -75,4 +79,3 @@ public class MissingCDITest {
Assert.assertEquals(returnValueCount, e.getReturnValueViolations().size());
}
}
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.6.1.SP2</version>
<version>3.6.2.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>RESTEASY-736-jetty</artifactId>
......
......@@ -2,6 +2,7 @@ package org.jboss.resteasy.resteasy736;
import org.jboss.resteasy.annotations.Suspend;
import org.jboss.resteasy.spi.AsynchronousResponse;
import org.jboss.logging.Logger;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
......@@ -20,6 +21,9 @@ import javax.ws.rs.core.Response;
@Produces("text/plain")
public class TestResource
{
private static final Logger LOG = Logger.getLogger(TestResource.class);
@GET
@Path("test")
public void test(final @Suspend(5000) AsynchronousResponse response)
......@@ -31,15 +35,15 @@ public class TestResource
{
try
{
System.out.println("TestResource: async thread started");
LOG.info("TestResource: async thread started");
Thread.sleep(10000);
Response jaxrs = Response.ok("test").type(MediaType.TEXT_PLAIN).build();
response.setResponse(jaxrs);
System.out.println("TestResource: async thread finished");
LOG.info("TestResource: async thread finished");
}
catch (Exception e)
{
e.printStackTrace();
LOG.error(e.getMessage(), e);
}
}
};
......@@ -57,15 +61,15 @@ public class TestResource
{
try
{
System.out.println("TestResource: async thread started");
LOG.info("TestResource: async thread started");
Thread.sleep(35000); // Jetty async timeout defaults to 30000.
Response jaxrs = Response.ok("test").type(MediaType.TEXT_PLAIN).build();
response.setResponse(jaxrs);
System.out.println("TestResource: async thread finished");
LOG.info("TestResource: async thread finished");
}
catch (Exception e)
{
e.printStackTrace();
LOG.error(e.getMessage(), e);
}
}
};
......
......@@ -10,6 +10,7 @@ import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.logging.Logger;
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
import org.jboss.resteasy.resteasy736.TestApplication;
import org.jboss.resteasy.resteasy736.TestResource;
......@@ -30,6 +31,9 @@ import org.junit.runner.RunWith;
@RunWith(Arquillian.class)
@RunAsClient
public class AsyncTimeoutTest {
private static final Logger LOG = Logger.getLogger(AsyncTimeoutTest.class);
@Deployment
public static Archive<?> createTestArchive() {
WebArchive war = ShrinkWrap.create(WebArchive.class, "RESTEASY-736.war")
......@@ -44,23 +48,22 @@ public class AsyncTimeoutTest {
@Test
public void testAsynchTimeout() throws Exception {
System.out.println("url = " + url);
LOG.info("url = " + url);
Builder request = ResteasyClientBuilder.newClient().target(url.toString() + "test/").request();
long start = System.currentTimeMillis();
System.out.println("start: " + start);
LOG.info("start: " + start);
Response response = null;
try {
response = request.get();
} catch (Exception e) {
System.out.println(e);
LOG.error(e.getMessage(), e);
} finally {
System.out.println("finish: " + System.currentTimeMillis());
LOG.info("finish: " + System.currentTimeMillis());
long elapsed = System.currentTimeMillis() - start;
System.out.println("elapsed: " + elapsed + " ms");
;
System.out.println("status: " + response.getStatus());
LOG.info("elapsed: " + elapsed + " ms");
LOG.info("status: " + response.getStatus());
assertTrue(response != null);
System.out.println("response: " + response.readEntity(String.class));
LOG.info("response: " + response.readEntity(String.class));
Assert.assertEquals("Status is wrong", 503, response.getStatus());
assertTrue(elapsed < 10000);
}
......@@ -71,19 +74,19 @@ public class AsyncTimeoutTest {
public void testDefaultAsynchTimeout() throws Exception {
Builder request = ResteasyClientBuilder.newClient().target(url.toString() + "default/").request();
long start = System.currentTimeMillis();
System.out.println("start: " + start);
LOG.info("start: " + start);
Response response = null;
try {
response = request.get();
} catch (Exception e) {
System.out.println(e);
LOG.error("Error: ", e);
} finally {
System.out.println("finish: " + System.currentTimeMillis());
LOG.info("finish: " + System.currentTimeMillis());
long elapsed = System.currentTimeMillis() - start;
System.out.println("elapsed: " + elapsed + " ms");
System.out.println("status: " + response.getStatus());
LOG.info("elapsed: " + elapsed + " ms");
LOG.info("status: " + response.getStatus());
assertTrue(response != null);
System.out.println("response: " + response.readEntity(String.class));
LOG.info("response: " + response.readEntity(String.class));
Assert.assertEquals("Wrong response", 503, response.getStatus());
Assert.assertTrue("Should timeout", elapsed < 36000); // Jetty async timeout defaults to 30000.
}
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.6.1.SP2</version>
<version>3.6.2.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>RESTEasy Misc Arquillian-based tests</name>
......
<assembly>
<id>all</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>jboss-as-distro</directory>
<outputDirectory/>
</fileSet>
</fileSets>
</assembly>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.6.1.SP2</version>
</parent>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-dist</artifactId>
<packaging>pom</packaging>
<version>8.0.0m-alpha-20130417</version>
<name>Custom AS8 Distribution</name>
<description/>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>assemble</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
<outputDirectory>
target/distribution
</outputDirectory>
<workDirectory>
target/assembly/work
</workDirectory>
<finalName>jboss-as-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<createChecksum>true</createChecksum>
</configuration>
</plugin>
</plugins>
</build>
</project>
<assembly>
<id>all</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.build.directory}/jboss-as-${jboss.dist.version}</directory>
<outputDirectory>jboss-as-${project.version}</outputDirectory>
<excludes>
<exclude>**/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/**</exclude>
<exclude>**/modules/system/layers/base/org/jboss/resteasy/resteasy-cdi/**</exclude>
<exclude>**/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson-provider/**</exclude>
<exclude>**/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/**</exclude>
<exclude>**/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs/**</exclude>
<exclude>**/modules/system/layers/base/org/jboss/resteasy/resteasy-jettison-provider/**</exclude>
<exclude>**/modules/system/layers/base/org/jboss/resteasy/resteasy-jsapi/**</exclude>
<exclude>**/modules/system/layers/base/org/jboss/resteasy/resteasy-multipart-provider/**</exclude>
<exclude>**/modules/system/layers/base/org/jboss/resteasy/resteasy-yaml-provider/**</exclude>
<exclude>**/modules/system/layers/base/javax/ws/rs/**</exclude>
<exclude>**/modules/system/layers/base/org/bouncycastle/**</exclude>
<exclude>**/modules/system/layers/base/org/codehaus/jackson/**</exclude>
<exclude>**/modules/system/layers/base/org/codehaus/jettison/**</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>../jboss-modules/target/mavenized/modules</directory>
<outputDirectory>jboss-as-${project.version}/modules/system/layers/base</outputDirectory>
</fileSet>
</fileSets>
</assembly>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.6.1.SP2</version>
</parent>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-dist</artifactId>
<version>8.0.0m-alpha-20130417-resteasy-3.6.1.SP2</version>
<packaging>pom</packaging>
<name>Custom AS8 Resteasy Distribution</name>
<description/>
<properties>
<jboss.dist.version>8.0.0m-alpha-20130417</jboss.dist.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-dist</artifactId>
<version>${jboss.dist.version}</version>
<type>zip</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.7</version>
<executions>
<execution>
<id>unpack</id>
<phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-dist</artifactId>
<version>${jboss.dist.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>assemble</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
<outputDirectory>
target/distribution
</outputDirectory>
<workDirectory>
target/assembly/work
</workDirectory>
<finalName>
jboss-as-${project.version}
</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<createChecksum>true</createChecksum>
</configuration>
</plugin>
</plugins>
</build>
</project>
resteasy (3.6.1.SP2-1) UNRELEASED; urgency=medium
resteasy (3.6.2-1) unstable; urgency=medium
* Team upload.
* New upstream release.
* New upstream release. (Closes: #888081)
- CVE-2017-7561 (Closes: #873392)
- Refresh the patch
- Update Maven rules
- Add libreactive-streams-java to build-depends
......@@ -10,8 +10,13 @@ resteasy (3.6.1.SP2-1) UNRELEASED; urgency=medium
* maven.rules: Updated.
* control, jaxb-api-compatibility.diff: Fix build, add libjaxb-api-
java to build-depends.
* control: Add libhttpasyncclient-java to build-depends.
* libresteasy-java.poms: Ignore some poms.
* maven.ignoreRules: Ignore jetty-client.
* control: Update VCS urls.
* control: Add libjsonp-java to build-depends.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 13 Mar 2018 17:23:12 +0200
-- Timo Aaltonen <tjaalton@debian.org> Tue, 04 Dec 2018 17:12:38 +0200
resteasy (3.1.4-1) unstable; urgency=medium
......
......@@ -9,6 +9,7 @@ Build-Depends-Indep:
junit4,
libcommons-io-java,
libgeronimo-validation-1.1-spec-java,
libhttpasyncclient-java,
libhttpclient-java,
libjackson-json-java,
libjaxb-java,
......@@ -17,6 +18,7 @@ Build-Depends-Indep:
libjboss-logging-java,
libjboss-logging-tools-java,
libjettison-java,
libjsonp-java,
liblog4j1.2-java (>= 1.2.17),
libmaven-install-plugin-java,
libreactive-streams-java,
......@@ -25,8 +27,8 @@ Build-Depends-Indep:
libtomcat8-java,
libyaml-snake-java
Standards-Version: 4.1.1
Vcs-Git: https://anonscm.debian.org/git/pkg-java/resteasy.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/resteasy.git
Vcs-Git: https://salsa.debian.org/java-team/resteasy.git
Vcs-Browser: https://salsa.debian.org/java-team/resteasy
Homepage: http://rest-easy.org
Package: libresteasy-java
......
......@@ -57,6 +57,8 @@ resteasy-jaxrs-testsuite/pom.xml --ignore
resteasy-jsapi/pom.xml --ignore
#resteasy-legacy/pom.xml --has-package-version
resteasy-links/pom.xml --ignore
resteasy-rxjava/pom.xml --ignore
resteasy-rxjava2/pom.xml --ignore
resteasy-spring/pom.xml --ignore
resteasy-servlet-initializer/pom.xml --ignore
resteasy-wadl/pom.xml --ignore
......
......@@ -29,6 +29,7 @@ org.apache.maven.plugins maven-javadoc-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
org.bouncycastle bcprov-jdk16 * * * *
org.codehaus.mojo build-helper-maven-plugin * * * *
org.eclipse.jetty jetty-client * * * *
org.eclipse.microprofile.rest.client microprofile-rest-client-api * * * *
org.eclipse.microprofile.config microprofile-config-api * * * *
org.glassfish.web javax.el * * * *
......
......@@ -14,4 +14,4 @@ s/org.jboss.spec.javax.servlet/javax.servlet/ s/jboss-servlet-api_3.1_spec/javax
s/org.jboss.spec.javax.el/javax.el/ s/jboss-el-api_3.0_spec/javax.el-api/ * s/.*/3.0/ * *
s/org.jboss.spec.javax.ws.rs/javax.ws.rs/ s/jboss-jaxrs-api_2.1_spec/javax.ws.rs-api/ * s/.*/debian/ * *
s/javax.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.1_spec/ * s/.*/debian/ * *
s/org.jboss.spec.javax.xml.bind/javax.xml.bind/ s/jboss-jaxb-api_2.3_spec/jaxb-api/ * * *
s/org.jboss.spec.javax.xml.bind/javax.xml.bind/ s/jboss-jaxb-api_2.3_spec/jaxb-api/ s/.*/debian/ * *
--- a/resteasy-jaxrs/pom.xml
+++ b/resteasy-jaxrs/pom.xml
@@ -127,6 +127,11 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
</dependencies>
<build>
--- a/resteasy-dependencies-bom/pom.xml
+++ b/resteasy-dependencies-bom/pom.xml
@@ -67,7 +67,7 @@
<version.org.jboss.spec.javax.el.jboss-el-api_3.0_spec>1.0.7.Final</version.org.jboss.spec.javax.el.jboss-el-api_3.0_spec>
<version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec>1.0.0.Final</version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec>
<version.org.jboss.spec.javax.jms.jboss-jms-api_2.0_spec>1.0.0.Final</version.org.jboss.spec.javax.jms.jboss-jms-api_2.0_spec>
- <version.org.jboss.spec.javax.xml.bind-api_2.3_spec>1.0.0.Final</version.org.jboss.spec.javax.xml.bind-api_2.3_spec>
+ <version.org.jboss.spec.javax.xml.bind-api_2.3_spec>debian</version.org.jboss.spec.javax.xml.bind-api_2.3_spec>
<version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.1_spec>1.0.0.Final</version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.1_spec>
<version.org.jboss.shrinkwrap.resolver>2.2.4</version.org.jboss.shrinkwrap.resolver>
<version.org.jboss.weld.se.weld-se-core>2.4.5.Final</version.org.jboss.weld.se.weld-se-core>
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.6.1.SP2</version>
<version>3.6.2.Final</version>
</parent>
<artifactId>resteasy-jaxrs-dist</artifactId>
......