This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 12bc494f72753c57be0fdac86fd46734181f33a0
Author: Robbie Gemmell <rob...@apache.org>
AuthorDate: Thu Jun 11 17:49:39 2020 +0100
ARTEMIS-2109: use default 1.8 compiler source/target config as with other
examples, newest JDKs no longer target 1.6. Fix SSL example. Allows building on
JDK 14+.
---
examples/features/sub-modules/tomcat/pom.xml | 12 +-----------
.../stomp/stomp-dual-authentication/readme.md | 4 ++--
.../jms/example/StompDualAuthenticationExample.java | 4 ----
.../activemq/server0/client-side-keystore.jks | Bin 1303 -> 2597 bytes
.../activemq/server0/client-side-truststore.jks | Bin 963 -> 1170 bytes
.../activemq/server0/server-side-keystore.jks | Bin 2253 -> 2565 bytes
.../activemq/server0/server-side-truststore.jks | Bin 1732 -> 1202 bytes
7 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/examples/features/sub-modules/tomcat/pom.xml
b/examples/features/sub-modules/tomcat/pom.xml
index cc642cf..4aaab0f 100644
--- a/examples/features/sub-modules/tomcat/pom.xml
+++ b/examples/features/sub-modules/tomcat/pom.xml
@@ -35,7 +35,6 @@ under the License.
<activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<projectBaseUri>${project.baseUri}</projectBaseUri>
- <java.version>1.6</java.version>
<servlet-api.version>3.0-alpha-1</servlet-api.version>
</properties>
@@ -77,15 +76,6 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.1</version>
@@ -122,4 +112,4 @@ under the License.
</plugin>
</plugins>
</build>
- </project>
\ No newline at end of file
+ </project>
diff --git a/examples/protocols/stomp/stomp-dual-authentication/readme.md
b/examples/protocols/stomp/stomp-dual-authentication/readme.md
index 0da536a..d8b95b8 100644
--- a/examples/protocols/stomp/stomp-dual-authentication/readme.md
+++ b/examples/protocols/stomp/stomp-dual-authentication/readme.md
@@ -6,9 +6,9 @@ This example shows you how to configure 2-way SSL along with 2
different authent
The various keystore files are generated using the following commands:
-* `keytool -genkey -keystore server-side-keystore.jks -storepass secureexample
-keypass secureexample -dname "CN=ActiveMQ Artemis Server, OU=Artemis,
O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA`
+* `keytool -genkey -keystore server-side-keystore.jks -storepass secureexample
-keypass secureexample -dname "CN=localhost, OU=Artemis, O=ActiveMQ, L=AMQ,
S=AMQ, C=AMQ" -keyalg RSA`
* `keytool -export -keystore server-side-keystore.jks -file
server-side-cert.cer -storepass secureexample`
* `keytool -import -keystore client-side-truststore.jks -file
server-side-cert.cer -storepass secureexample -keypass secureexample -noprompt`
* `keytool -genkey -keystore client-side-keystore.jks -storepass secureexample
-keypass secureexample -dname "CN=ActiveMQ Artemis Client, OU=Artemis,
O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA`
* `keytool -export -keystore client-side-keystore.jks -file
client-side-cert.cer -storepass secureexample`
-* `keytool -import -keystore server-side-truststore.jks -file
client-side-cert.cer -storepass secureexample -keypass secureexample -noprompt`
\ No newline at end of file
+* `keytool -import -keystore server-side-truststore.jks -file
client-side-cert.cer -storepass secureexample -keypass secureexample -noprompt`
diff --git
a/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java
b/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java
index dd5259d..688c03a 100644
---
a/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java
+++
b/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java
@@ -29,9 +29,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
-import java.security.Security;
-
-import com.sun.net.ssl.internal.ssl.Provider;
/**
* An example where a client will send a Stomp message on a TCP socket
@@ -45,7 +42,6 @@ public class StompDualAuthenticationExample {
Connection connection = null;
InitialContext initialContext = null;
- Security.addProvider(new Provider());
try {
// set up SSL keystores for Stomp connection
diff --git
a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-keystore.jks
b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-keystore.jks
index cb65a44..88ed01f 100644
Binary files
a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-keystore.jks
and
b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-keystore.jks
differ
diff --git
a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-truststore.jks
b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-truststore.jks
index 7eb1d56..902f8f4 100644
Binary files
a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-truststore.jks
and
b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-truststore.jks
differ
diff --git
a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-keystore.jks
b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-keystore.jks
index 6089c6e..83f5e96 100644
Binary files
a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-keystore.jks
and
b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-keystore.jks
differ
diff --git
a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-truststore.jks
b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-truststore.jks
index 0b7e224..edb5e59 100644
Binary files
a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-truststore.jks
and
b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-truststore.jks
differ
