Skip to content

Commit

Permalink
[RESTEASY-1316] MOre on removing jettison...
Browse files Browse the repository at this point in the history
  • Loading branch information
asoldano committed Jan 21, 2019
1 parent 18110c2 commit db3f78d
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 145 deletions.
1 change: 0 additions & 1 deletion distribution/assembly.xml
Expand Up @@ -41,7 +41,6 @@
<include>org.jboss.resteasy:resteasy-client</include>
<include>org.jboss.resteasy:resteasy-servlet-initializer</include>
<include>org.jboss.resteasy:resteasy-jaxb-provider</include>
<include>org.jboss.resteasy:resteasy-jettison-provider</include>
<include>org.jboss.resteasy:resteasy-fastinfoset-provider</include>
<include>org.jboss.resteasy:resteasy-atom-provider</include>
<include>org.jboss.resteasy:resteasy-multipart-provider</include>
Expand Down

This file was deleted.

This file was deleted.

14 changes: 0 additions & 14 deletions resteasy-dependencies-bom/pom.xml
Expand Up @@ -46,7 +46,6 @@
<version.org.apache.maven>3.3.9</version.org.apache.maven> <!-- Used to download aether-provider -->
<version.org.bouncycastle>1.60</version.org.bouncycastle>
<version.org.codehaus.jackson>1.9.13</version.org.codehaus.jackson>
<version.org.codehaus.jettison>1.4.0</version.org.codehaus.jettison>
<version.org.eclipse.aether>1.1.0</version.org.eclipse.aether>
<version.org.eclipse.jetty>9.4.14.v20181114</version.org.eclipse.jetty>
<version.org.eclipse.yasson>1.0.2</version.org.eclipse.yasson>
Expand Down Expand Up @@ -311,19 +310,6 @@
<artifactId>jcip-annotations</artifactId>
<version>${version.net.jcip.jcip-annotations}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>${version.org.codehaus.jettison}</version>
<exclusions>
<!-- This results in duplicate stax-api jars. This is the older
one. A newer is brought in by org.glassfish.jaxb -->
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>javax.activation</groupId>
Expand Down
Expand Up @@ -41,7 +41,6 @@ public class JacksonJaxbCoexistenceTest {

static ResteasyClient client;
protected static final Logger logger = Logger.getLogger(JacksonJaxbCoexistenceTest.class.getName());
private static final String JETTISON_DEPLOYMENT = "jettison";

@Deployment(name = "default")
public static Archive<?> deploy() {
Expand All @@ -52,19 +51,6 @@ public static Archive<?> deploy() {
JacksonJaxbCoexistenceXmlProduct.class);
}

/**
* Jettison is deprecated, so it needs to be added to EAP manually (see JBEAP-2856).
*/
@Deployment(name = "jettison")
public static Archive<?> deployJettison() {
WebArchive war = TestUtil.prepareArchive(JETTISON_DEPLOYMENT);
war.addAsManifestResource("jboss-deployment-structure-jackson-v2-jettison.xml", "jboss-deployment-structure.xml");
return TestUtil.finishContainerPrepare(war, null, JacksonJaxbCoexistenceJacksonResource.class,
JacksonJaxbCoexistenceJacksonXmlResource.class, JacksonJaxbCoexistenceXmlResource.class,
JacksonJaxbCoexistenceProduct2.class,
JacksonJaxbCoexistenceXmlProduct.class);
}

@Before
public void init() {
client = (ResteasyClient)ClientBuilder.newClient();
Expand Down Expand Up @@ -134,29 +120,6 @@ public void testJacksonXmlString() throws Exception {
response.close();
}

/**
* @tpTestDetails Test that Jettison is picked
* Jettison is deprecated, so it needs to be added to EAP manually (see JBEAP-2856).
* @tpSince RESTEasy 3.0.16
*/
@Test
public void testXmlString() throws Exception {
WebTarget target = client.target(PortProviderUtil.generateURL("/xml/products/333", JETTISON_DEPLOYMENT));
Response response = target.request().get();
String entity = response.readEntity(String.class);
logger.info(entity);
Assert.assertEquals(TestUtil.getErrorMessageForKnownIssue("JBEAP-2856"), HttpResponseCodes.SC_OK, response.getStatus());
Assert.assertTrue(entity.startsWith("{\"product"));
response.close();

target = client.target(PortProviderUtil.generateURL("/xml/products", JETTISON_DEPLOYMENT));
response = target.request().get();
entity = response.readEntity(String.class);
logger.info(entity);
Assert.assertEquals(TestUtil.getErrorMessageForKnownIssue("JBEAP-2856"), HttpResponseCodes.SC_OK, response.getStatus());
Assert.assertTrue(entity.startsWith("[{\"product"));
}

/**
* @tpTestDetails Test that Jackson is picked and object can be returned from the resource
* @tpSince RESTEasy 3.0.16
Expand Down

This file was deleted.

0 comments on commit db3f78d

Please sign in to comment.