Skip to content

Commit

Permalink
updating jersey extras to 2.0 to support dropwizard 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Jake Swenson committed Nov 17, 2016
1 parent 8db39d6 commit ab838a1
Show file tree
Hide file tree
Showing 24 changed files with 383 additions and 478 deletions.
1 change: 1 addition & 0 deletions .deployment
Submodule .deployment added at 0af986
4 changes: 4 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule ".deployment"]
path = .deployment
url = https://github.com/paradoxical-io/deployment.git
branch = master
15 changes: 12 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
language: java
jdk:
- oraclejdk8

- oraclejdk8
git:
submodules: false
before_install:
- git submodule update --init --remote --recursive
after_success:
- ./deploy.sh
- "./.deployment/deploy.sh"
env:
global:
- secure: EWi7H2SfKN1PkmRb2eoR8FtPVdyqQE6Obwgy2wYWeuDKm22Y9p0es36yneuE4X6TFe4t/T2QSxH09JaA350OEhfD8hB5eJEwr/kmA/pQQdDsn554nWqV/FsFaQuilMFcGRhM6hJ1EUJnZbVkEnKlf+rJNl1vE5amCXztReR7XEZToTajnOSyhkH6YX10qSQAJURTqjaRFJVsyQd4cP80aUvRRZMXdFLF+kCjWsM+1gEYMIl15jOuZU3E2MUNIWZEAkVoi7+Ino1XVUiuHWm9EAsE+pUvzvww8Cy36LC7orryccY4J/c0lFu+NbjStviPnoreas9U21msTB+aZj8JTDSSL/dNu3d/eZg26xHbcsJpBcfVAVb7qxb2vNuT7XpwyrJIVdfbT0fmJ1eDdOyNs44o9mo9C5qH6r+Ywo/eMHAP4uL+HsRl/em/QDFtSiaMrxxMci9y3G9OuDjfQD5xT5ULJJW5+E/CrwOz8FlleQaB0s7SnWiMyupqJa8df2PrlfJP3NkbqVZWCOogSai0Zk+x2EXTVyuTx+6zguRXMPaFzmakb+ZjISeojzC2F5NEtk+P0BAOVHOqcBKAjFSxEXqRBcjQopp7fkA+Xexj9C8CXVzdJNVZv3t6i/HCQy5dUF0/QoghgTMtrtFaU7OsN5gN8460Xt502NQIUvp6Zw4=
- secure: ameSBFDiscY4RBthJQV0jr+uIH+ozXOaaPZa9HHpai724Dzf8INaFv8xDKKIidsgb7ipls/tZa3I9MwOpcJ50iwB2sS4ZJaf4BmXA/nPKnofOLaThJgIy8hxtbyjtyJh0Si5lEVJm5yV2pxoQ3/BDveN1K1xhuMw9cdb73G9xtkd1G5xeY48YkCsVVHmOzrxgdFdB3lcz/NVu7CTXxSDr6smwu6nw7refISXDV1k1X4Zhih9roCYTKPsz2jPea5hUoEbM3/tFowd2JseAVkX6g38aDhzCo6/73CYOaucPYesGcj8f/9cPvy2OHbJR0wbf9bciw8ejHWxJ96NeZkDE9MGuOxxyqoZOG60QYaSIQLNrJkFxAamXmCNmQLkv13UEoE13vYEYDS+6+ilaAHfSbEzQ+WaIPzi8KyDNyGVJtBxB670StVFCLKt5+SqvkUR914YfVft0yT8HAX9mKp/w9OqbiMpLmTm7TvLwTpXITpOXGs49rDYfhvnQgLrjNVbUxmg63oZEPrtsZNnz3AUierMnDPnZViHPS3EI/PZQ8QIPwD4dXucmtpPKnUGtMwonoBgrejkDWtXSE0fJDIQYfaRsAzkrsb1eivoyk7bbd2QznM8sYmdJBb7mB9pIuYdUnrSR2StCInAJPbj5KGhyoIXKQZwM3CpfVfcWXkOWTg=
- secure: myX2BgwTLzGptuTk5AXF6g4sAy+/RxCAxcFcHdZBm7ey/CQLuEFar1ZSRakYxxtVBxKjwFlehjToPWu9HEK8ibkamhzFOO9CJNTcI6fYHF7A5/nVTtdoelrSWSJrOPILocoVO4nnKmhze/BUszNIyK4Of26slTlEiOkrxSD73uul0dM5BqudsLBaAZoYM0iodrAHRVseMWuySwiwJRI0FieOE9hdq3XotJwIU6QCA4bDwRw6TzxI54ZXH1vZWFOIY+iCZ+ebxORZEVZr4ufoKKGKNULjr6eIOvkxQ6bm9BSCGOlMDSPTL4lpcgE/6uY7X0WLmZB8QGfmJawmc2kixjXoTeCPrF4p6Z1Ga1EOTWSc7jlZdY5MTbvgzmuZsU6rNhCKWs2LUN57dvLxBnDaG7pkSn5J7xZdZfzHXYcwrdPsqg1HWUb2t2UECxazAi5RZ9HpnTmlG7FZQBq0paA6rWflNFp5tEru6tFV31qrbjQK1RQPNLdfYkZ7XMemN17YKPqIo6dyrtU6CYJ6CHhB0ePW54NK4oKrbEXZPR7jyMsU4lWolbvp6mPDIRa/SKvrnP5Ob5lBrF14h1ZJcktLEdQh0jC5wvcy/aXYYck0sS3Rmx8oRlqKab1H7OFg5U1sPC7CACKovsfbmuRa5hfwyMeNZh2Px0tfiOkXagl30W8=
- secure: EyLbLkbxjMsFsnl34BmlgvNU7Fjbtdfqymdc3gaia8Uybr77hR+wpXK0u+ns/Fc6x0C5BCX5tkgcLBjPTo+fb+HgNXmzQqesJ5tcpJg/CAiEKROKZuCAKRr1iMyA7tIpy4V9ypB7HafXQNuZ4GqGwHniS06PqQuSw2+RSjD8KbGBvsJFODdGkNfu+DPEJE1Oj4AVWohXQMR8lsqiCzU4XwmVDJxEH+jjhHOD4w8+3NyxKl2ygtPAYago74Js0SqWaapKJHm2VrZVVkNqX1VSlbCVJRG3mS6C7893YE6ueg9NWglheTHkAHnSSr9ZsX/2iBYyu70IeYhw9Gju/s+rlw2EVLW5WXvOoPfmqK2NjW2kWa8ssCFEVsNPrxoYxyBWUDfpQ+nuG93eR3gw1EiKIlUmLxmjm8/GEtBEl8OM9yKHlrBEXH/jBS6n6vJFIZdTNaOVkw+9v+GXpA7YrAMgKGCpatA39Igskw59DUbZBi/wiGawGf9xNLKWx5vh4Ka7baPIeolO4YD8HJb5du4rCWLfhAzW8w+GJ8ERhhe5RTEVG/KZ0ec/CclhviAmxMDxcEycs3xwDXNSoS41VPZPNmUy9YqO+jhGHp/P8QROhtIY4gHusWb68Ro07PiYqkNSMA9mfAF4xXuOIge1EtE4C1pF/XslX+1DaGgA5ZsI0mc=
7 changes: 0 additions & 7 deletions deploy.sh
View file

This file was deleted.

1 change: 0 additions & 1 deletion perform-release.sh
View file

This file was deleted.

194 changes: 26 additions & 168 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">

<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/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<prerequisites>
<maven>3.0.0</maven>
</prerequisites>

<groupId>io.paradoxical</groupId>

<parent>
<groupId>io.paradoxical</groupId>
<artifactId>deployment-base-pom</artifactId>
<version>1.0</version>
</parent>

<artifactId>jersey-extras</artifactId>
<version>1.1-SNAPSHOT</version>
<version>2.0${revision}</version>
<packaging>jar</packaging>
<description>Jersey utilities</description>


<name>jersey-extras</name>
<url>http://maven.apache.org</url>
<description>Jersey utilities</description>

<licenses>
<license>
Expand All @@ -28,8 +34,7 @@
<gpg.passphrase>${env.GPG_PASSWORD}</gpg.passphrase>
<slf4j.version>1.7.10</slf4j.version>
<lombok.version>1.16.2</lombok.version>
<reflectasm.version>1.10.0</reflectasm.version>
<guava.version>18.0</guava.version>
<guava.version>19.0</guava.version>
<logback.version>1.0.13</logback.version>
<mockito.version>1.10.19</mockito.version>
<junit.version>4.12</junit.version>
Expand All @@ -39,24 +44,20 @@
<maven.source.plugin.version>2.4</maven.source.plugin.version>
<maven.surefire.report.plugin.version>2.14</maven.surefire.report.plugin.version>
<maven.surefire.plugin.version>2.14</maven.surefire.plugin.version>
<godaddy.logging.version>1.0</godaddy.logging.version>
<podam.version>4.7.2.RELEASE</podam.version>
<jersey.version>2.21</jersey.version>
<godaddy.logging.version>1.2.2</godaddy.logging.version>
<podam.version>7.0.1.RELEASE</podam.version>
<jersey.version>2.23.1</jersey.version>
<paradoxical.common.version>1.1</paradoxical.common.version>
</properties>

<scm>
<url>http://github.com:paradoxical-io/common.web</url>
<connection>
scm:git:git@github.com:paradoxical-io/common.web.git
</connection>
<developerConnection>
scm:git:git@github.com:paradoxical-io/common.web.git
</developerConnection>
<tag>HEAD</tag>
</scm>
<url>http://github.com:paradoxical-io/jersey-extras</url>
<connection>scm:git:git@github.com:paradoxical-io/jersey-extras.git</connection>
<developerConnection>scm:git:git@github.com:paradoxical-io/jersey-extras.git</developerConnection>
<tag>HEAD</tag>
</scm>

<developers>
<developers>
<developer>
<id>devshorts</id>
<name>Anton Kropp</name>
Expand Down Expand Up @@ -84,11 +85,6 @@
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.5.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -104,7 +100,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>uk.co.jemos.podam</groupId>
Expand Down Expand Up @@ -145,11 +141,6 @@
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>reflectasm</artifactId>
<version>${reflectasm.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down Expand Up @@ -181,139 +172,6 @@
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin.version}</version>
<configuration>
<!--the -XX:-UseSplitVerifier option slows class loading.
It does not affect security, runtime performance or functionality.
http://stackoverflow.com/questions/15253173/how-safe-is-it-to-use-xx-usesplitverifier -->
<argLine>-XX:-UseSplitVerifier</argLine>
<includes>
<include>%regex[.*]</include>
</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${maven.surefire.report.plugin.version}</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
<executions>
<execution>
<id>generate-test-report</id>
<phase>test</phase>
<goals>
<goal>report-only</goal>
</goals>
</execution>
<execution>
<id>generate-integration-test-report</id>
<phase>integration-test</phase>
<goals>
<goal>failsafe-report-only</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.6</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
<shortRevisionLength>5</shortRevisionLength>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9.2</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven.source.plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>sign</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
<configuration>
<useAgent>true</useAgent>
<keyname>devshorts</keyname>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
1 change: 0 additions & 1 deletion prep-release.sh
View file

This file was deleted.

1 change: 0 additions & 1 deletion rollback-release.sh
View file

This file was deleted.

14 changes: 0 additions & 14 deletions src/main/java/io/paradoxical/common/web/web/CorrelationRequestContext.java
View file

This file was deleted.

9 changes: 0 additions & 9 deletions src/main/java/io/paradoxical/common/web/web/filter/ContextAttributeKeys.java
View file

This file was deleted.

32 changes: 0 additions & 32 deletions src/main/java/io/paradoxical/common/web/web/filter/ContextProvider.java
View file

This file was deleted.

Loading

0 comments on commit ab838a1

Please sign in to comment.