Repository: juddi Updated Branches: refs/heads/master 2cbf9df7e -> 15d3c0d7b
http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-examples/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-examples/pom.xml b/juddi-examples/pom.xml index 26cf9b9..98c43b6 100644 --- a/juddi-examples/pom.xml +++ b/juddi-examples/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.juddi.example</groupId> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-examples/service-version/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-examples/service-version/pom.xml b/juddi-examples/service-version/pom.xml index ae3e743..3c1fbc8 100644 --- a/juddi-examples/service-version/pom.xml +++ b/juddi-examples/service-version/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.juddi.example</groupId> <artifactId>juddi-examples</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <groupId>org.apache.juddi</groupId> <artifactId>service-version</artifactId> @@ -39,7 +39,7 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>juddi-client</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-examples/simple-browse/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-examples/simple-browse/pom.xml b/juddi-examples/simple-browse/pom.xml index 2416e4e..cd6ee1c 100644 --- a/juddi-examples/simple-browse/pom.xml +++ b/juddi-examples/simple-browse/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.juddi.example</groupId> <artifactId>juddi-examples</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>simple-browse</artifactId> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-examples/simple-publish-clerk/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-examples/simple-publish-clerk/pom.xml b/juddi-examples/simple-publish-clerk/pom.xml index 30932fe..5c52bc2 100644 --- a/juddi-examples/simple-publish-clerk/pom.xml +++ b/juddi-examples/simple-publish-clerk/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.juddi.example</groupId> <artifactId>juddi-examples</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>simple-publish-clerk</artifactId> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-examples/simple-publish-portable/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-examples/simple-publish-portable/pom.xml b/juddi-examples/simple-publish-portable/pom.xml index bdcab60..ab7d06c 100644 --- a/juddi-examples/simple-publish-portable/pom.xml +++ b/juddi-examples/simple-publish-portable/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.juddi.example</groupId> <artifactId>juddi-examples</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>simple-publish-portable</artifactId> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-examples/subscription-notification-amqp/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-examples/subscription-notification-amqp/pom.xml b/juddi-examples/subscription-notification-amqp/pom.xml index acd3073..f301909 100644 --- a/juddi-examples/subscription-notification-amqp/pom.xml +++ b/juddi-examples/subscription-notification-amqp/pom.xml @@ -12,11 +12,11 @@ <parent> <groupId>org.apache.juddi.example</groupId> <artifactId>juddi-examples</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <artifactId>subscription-notification-amqp</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> <name>jUDDI Example AMQP Notifier for Subscription callbacks</name> <description>Demonstrates how to write a custom notifier for subscriptions</description> <dependencies> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-examples/uddi-annotations/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-examples/uddi-annotations/pom.xml b/juddi-examples/uddi-annotations/pom.xml index 5e76e9e..e96f03a 100644 --- a/juddi-examples/uddi-annotations/pom.xml +++ b/juddi-examples/uddi-annotations/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.juddi.example</groupId> <artifactId>juddi-examples</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>uddi-annotations</artifactId> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-examples/uddiv2-api-bridge-example/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-examples/uddiv2-api-bridge-example/pom.xml b/juddi-examples/uddiv2-api-bridge-example/pom.xml index 4dda1a9..2833c13 100644 --- a/juddi-examples/uddiv2-api-bridge-example/pom.xml +++ b/juddi-examples/uddiv2-api-bridge-example/pom.xml @@ -20,11 +20,11 @@ <parent> <groupId>org.apache.juddi.example</groupId> <artifactId>juddi-examples</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <groupId>org.apache.juddi.example</groupId> <artifactId>uddiv2-api-bridge-example</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> <name>jUDDI Example Access UDDIv2 using Transport Adapter</name> <url>http://maven.apache.org</url> <properties> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-examples/wsdl2uddi-lifecyle/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-examples/wsdl2uddi-lifecyle/pom.xml b/juddi-examples/wsdl2uddi-lifecyle/pom.xml index 4525fe6..c61970d 100644 --- a/juddi-examples/wsdl2uddi-lifecyle/pom.xml +++ b/juddi-examples/wsdl2uddi-lifecyle/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.juddi.example</groupId> <artifactId>juddi-examples</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wsdl2uddi-lifecycle</artifactId> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-examples/wsdl2uddi/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-examples/wsdl2uddi/pom.xml b/juddi-examples/wsdl2uddi/pom.xml index eb8c6dc..feeeea1 100644 --- a/juddi-examples/wsdl2uddi/pom.xml +++ b/juddi-examples/wsdl2uddi/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.juddi.example</groupId> <artifactId>juddi-examples</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>wsdl2uddi</artifactId> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-gui-dsig/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-gui-dsig/pom.xml b/juddi-gui-dsig/pom.xml index 0f9bb54..8455cf4 100644 --- a/juddi-gui-dsig/pom.xml +++ b/juddi-gui-dsig/pom.xml @@ -12,7 +12,7 @@ language governing permissions and * limitations under the License. * */ --> <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <artifactId>juddi-gui-dsig</artifactId> <name>jUDDI Web Client Digital Signature Applet</name> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-gui/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-gui/pom.xml b/juddi-gui/pom.xml index 3a455be..ab8b04b 100644 --- a/juddi-gui/pom.xml +++ b/juddi-gui/pom.xml @@ -12,7 +12,7 @@ language governing permissions and * limitations under the License. * */ --> <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <artifactId>juddi-gui-war</artifactId> <packaging>war</packaging> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-rest-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-rest-cxf/pom.xml b/juddi-rest-cxf/pom.xml index 4ca2b6a..e7fdc7d 100644 --- a/juddi-rest-cxf/pom.xml +++ b/juddi-rest-cxf/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-rest-cxf</artifactId> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-tomcat/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-tomcat/pom.xml b/juddi-tomcat/pom.xml index 9eb43d7..a28b5d7 100644 --- a/juddi-tomcat/pom.xml +++ b/juddi-tomcat/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <artifactId>juddi-tomcat</artifactId> <name>jUDDI Tomcat Packaging</name> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddi-tomcat/server.xml ---------------------------------------------------------------------- diff --git a/juddi-tomcat/server.xml b/juddi-tomcat/server.xml index e98abb6..fce8922 100644 --- a/juddi-tomcat/server.xml +++ b/juddi-tomcat/server.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='utf-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -26,8 +26,6 @@ --> <!--APR library loader. Documentation at /docs/apr.html --> <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> - <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html --> - <Listener className="org.apache.catalina.core.JasperListener" /> <!-- Prevent memory leaks due to use of particular java/javax APIs--> <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> @@ -63,10 +61,10 @@ <!-- A "Connector" represents an endpoint by which requests are received and responses are returned. Documentation at : - Java HTTP Connector: /docs/config/http.html (blocking & non-blocking) + Java HTTP Connector: /docs/config/http.html Java AJP Connector: /docs/config/ajp.html APR (HTTP/AJP) Connector: /docs/apr.html - Define a non-SSL HTTP/1.1 Connector on port 8080 + Define a non-SSL/TLS HTTP/1.1 Connector on port 8080 --> <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" @@ -78,17 +76,41 @@ connectionTimeout="20000" redirectPort="8443" /> --> - <!-- Define a SSL HTTP/1.1 Connector on port 8443 - This connector uses the BIO implementation that requires the JSSE - style configuration. When using the APR/native implementation, the - OpenSSL style configuration is required as described in the APR/native - documentation --> - <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" - maxThreads="150" scheme="https" secure="true" - clientAuth="want" sslProtocol="TLS" - truststoreFile="truststore.jks" truststorePass="password" - keystoreFile="conf/keystore.jks" keystorePass="password" - /> + <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 + This connector uses the NIO implementation. The default + SSLImplementation will depend on the presence of the APR/native + library and the useOpenSSL attribute of the + AprLifecycleListener. + Either JSSE or OpenSSL style configuration may be used regardless of + the SSLImplementation selected. JSSE style configuration is used below. + --> + <!-- + <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol" + maxThreads="150" SSLEnabled="true"> + <SSLHostConfig> + <Certificate certificateKeystoreFile="conf/localhost-rsa.jks" + type="RSA" /> + </SSLHostConfig> + </Connector> + --> + <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2 + This connector uses the APR/native implementation which always uses + OpenSSL for TLS. + Either JSSE or OpenSSL style configuration may be used. OpenSSL style + configuration is used below. + --> + <!-- + <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol" + maxThreads="150" SSLEnabled="true" > + <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" /> + <SSLHostConfig> + <Certificate certificateKeyFile="conf/localhost-rsa-key.pem" + certificateFile="conf/localhost-rsa-cert.pem" + certificateChainFile="conf/localhost-rsa-chain.pem" + type="RSA" /> + </SSLHostConfig> + </Connector> + --> <!-- Define an AJP 1.3 Connector on port 8009 --> <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> @@ -136,7 +158,7 @@ Documentation at: /docs/config/valve.html Note: The pattern used is equivalent to using pattern="common" --> <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" - prefix="localhost_access_log." suffix=".txt" + prefix="localhost_access_log" suffix=".txt" pattern="%h %l %u %t "%r" %s %b" /> </Host> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddiv3-war-repl/pom.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war-repl/pom.xml b/juddiv3-war-repl/pom.xml index 1640603..6f48a07 100644 --- a/juddiv3-war-repl/pom.xml +++ b/juddiv3-war-repl/pom.xml @@ -12,7 +12,7 @@ <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <artifactId>juddiv3-war-repl</artifactId> <packaging>war</packaging> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/juddiv3-war/pom.xml ---------------------------------------------------------------------- diff --git a/juddiv3-war/pom.xml b/juddiv3-war/pom.xml index 6c6d5cd..a9cbd05 100644 --- a/juddiv3-war/pom.xml +++ b/juddiv3-war/pom.xml @@ -12,7 +12,7 @@ language governing permissions and * limitations under the License. * */ --> <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <artifactId>juddiv3-war</artifactId> <packaging>war</packaging> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a82fa8d..58da79a 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. <packaging>pom</packaging> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> <name>jUDDI_v3 Parent</name> <description>jUDDI (pronounced "Judy") is an open source Java implementation of the Universal Description, Discovery, and @@ -45,7 +45,7 @@ under the License. <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <cxf.version>2.7.18</cxf.version> <springframework.version>3.2.18.RELEASE</springframework.version> - <apache.tomcat.version>7.0.82</apache.tomcat.version> + <apache.tomcat.version>8.5.23</apache.tomcat.version> <jacoco.it.execution.data.file>${project.build.directory}/coverage-reports/jacoco-it.exec</jacoco.it.execution.data.file> <jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/uddi-client-dist/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-client-dist/pom.xml b/uddi-client-dist/pom.xml index caac778..3acb2c9 100644 --- a/uddi-client-dist/pom.xml +++ b/uddi-client-dist/pom.xml @@ -12,7 +12,7 @@ language governing permissions and * limitations under the License. * */ --> <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <artifactId>uddi-client-dist</artifactId> <name>UDDI Client Distribution Assembly</name> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/uddi-migration-tool/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-migration-tool/pom.xml b/uddi-migration-tool/pom.xml index 56e936d..11a720e 100644 --- a/uddi-migration-tool/pom.xml +++ b/uddi-migration-tool/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <groupId>org.apache.juddi</groupId> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/uddi-tck-base/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-tck-base/pom.xml b/uddi-tck-base/pom.xml index a555e48..68a1739 100644 --- a/uddi-tck-base/pom.xml +++ b/uddi-tck-base/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <artifactId>uddi-tck-base</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/uddi-tck-runner/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-tck-runner/pom.xml b/uddi-tck-runner/pom.xml index 9191c25..bfb3436 100644 --- a/uddi-tck-runner/pom.xml +++ b/uddi-tck-runner/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <artifactId>uddi-tck-runner</artifactId> <name>UDDI TCK Test Runner</name> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/uddi-tck/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/pom.xml b/uddi-tck/pom.xml index ec681e0..62e0d1c 100644 --- a/uddi-tck/pom.xml +++ b/uddi-tck/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <artifactId>uddi-tck</artifactId> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/juddi/blob/15d3c0d7/uddi-ws/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-ws/pom.xml b/uddi-ws/pom.xml index 07d0b78..c3d2102 100644 --- a/uddi-ws/pom.xml +++ b/uddi-ws/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.juddi</groupId> <artifactId>juddi-parent</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.5-SNAPSHOT</version> </parent> <artifactId>uddi-ws</artifactId> <packaging>bundle</packaging> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
