Browse Source

Updated POM version and set compilier and signatures to Java8 (#704)

* Updated the Cipher Suites in `TrustingSSLSocketFactory` to an appropriate
Java 8 Cipher.
* Updated all versions to 10.0.0-SNAPSHOT
pull/708/head
Kevin Davis 6 years ago committed by Marvin Froeder
parent
commit
99c1540c7e
  1. 2
      benchmark/pom.xml
  2. 2
      core/pom.xml
  3. 11
      core/src/test/java/feign/client/TrustingSSLSocketFactory.java
  4. 2
      gson/pom.xml
  5. 2
      httpclient/pom.xml
  6. 2
      hystrix/pom.xml
  7. 2
      jackson-jaxb/pom.xml
  8. 2
      jackson/pom.xml
  9. 2
      java8/pom.xml
  10. 2
      jaxb/pom.xml
  11. 2
      jaxrs/pom.xml
  12. 2
      jaxrs2/pom.xml
  13. 2
      mock/pom.xml
  14. 2
      okhttp/pom.xml
  15. 8
      pom.xml
  16. 2
      ribbon/pom.xml
  17. 2
      sax/pom.xml
  18. 2
      slf4j/pom.xml

2
benchmark/pom.xml

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-benchmark</artifactId>

2
core/pom.xml

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-core</artifactId>

11
core/src/test/java/feign/client/TrustingSSLSocketFactory.java

@ -26,13 +26,8 @@ import java.security.cert.X509Certificate; @@ -26,13 +26,8 @@ import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509KeyManager;
import javax.net.ssl.X509TrustManager;
import javax.net.ssl.*;
/**
* Used for ssl tests to simplify setup.
@ -43,7 +38,7 @@ public final class TrustingSSLSocketFactory extends SSLSocketFactory @@ -43,7 +38,7 @@ public final class TrustingSSLSocketFactory extends SSLSocketFactory
private static final Map<String, SSLSocketFactory> sslSocketFactories =
new LinkedHashMap<String, SSLSocketFactory>();
private static final char[] KEYSTORE_PASSWORD = "password".toCharArray();
private final static String[] ENABLED_CIPHER_SUITES = {"SSL_RSA_WITH_3DES_EDE_CBC_SHA"};
private final static String[] ENABLED_CIPHER_SUITES = {"TLS_RSA_WITH_AES_256_CBC_SHA"};
private final SSLSocketFactory delegate;
private final String serverAlias;
private final PrivateKey privateKey;

2
gson/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-gson</artifactId>

2
httpclient/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-httpclient</artifactId>

2
hystrix/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-hystrix</artifactId>

2
jackson-jaxb/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-jackson-jaxb</artifactId>

2
jackson/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-jackson</artifactId>

2
java8/pom.xml

@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>io.github.openfeign</groupId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jaxb/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-jaxb</artifactId>

2
jaxrs/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-jaxrs</artifactId>

2
jaxrs2/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-jaxrs2</artifactId>

2
mock/pom.xml

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-mock</artifactId>

2
okhttp/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-okhttp</artifactId>

8
pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@ -46,8 +46,8 @@ @@ -46,8 +46,8 @@
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<!-- default bytecode version for src/main -->
<main.java.version>1.6</main.java.version>
<main.signature.artifact>java16</main.signature.artifact>
<main.java.version>1.8</main.java.version>
<main.signature.artifact>java18</main.signature.artifact>
<!-- default bytecode version for src/test -->
<maven.compiler.source>1.8</maven.compiler.source>
@ -469,6 +469,7 @@ @@ -469,6 +469,7 @@
<plugins>
<!-- Creates source jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<executions>
@ -482,6 +483,7 @@ @@ -482,6 +483,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>

2
ribbon/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-ribbon</artifactId>

2
sax/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-sax</artifactId>

2
slf4j/pom.xml

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
<parent>
<groupId>io.github.openfeign</groupId>
<artifactId>parent</artifactId>
<version>9.8.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>feign-slf4j</artifactId>

Loading…
Cancel
Save