You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2019/12/13 21:24:06 UTC
[juddi] 03/04: Merge branch 'master' into feature/JUDDI-991
This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a commit to branch feature/JUDDI-991
in repository https://gitbox.apache.org/repos/asf/juddi.git
commit 4522d6fb5bf61408aa8a4f20e47f2ee2813b48ff
Merge: 8016bf3 bec0273
Author: Alex O'Ree <al...@apache.org>
AuthorDate: Fri Dec 13 15:18:11 2019 -0500
Merge branch 'master' into feature/JUDDI-991
.gitattributes | 1 +
KEYS | 121 ++++++++++++++++-----
RELEASE_NOTES.html | 28 +++++
docs/asciidoc/ClientGuide/pom.xml | 2 +-
docs/asciidoc/Guide/pom.xml | 2 +-
docs/asciidoc/pom.xml | 2 +-
docs/dist/pom.xml | 2 +-
docs/pom.xml | 2 +-
juddi-client-cli/pom.xml | 4 +-
juddi-client/pom.xml | 2 +-
.../apache/juddi/v3/client/config/UDDIClient.java | 30 ++---
.../juddi/v3/client/transport/JAXWSTransport.java | 4 +-
juddi-core-openjpa/pom.xml | 2 +-
juddi-core/pom.xml | 2 +-
.../org/apache/juddi/api/impl/JUDDIApiImpl.java | 3 +-
.../org/apache/juddi/model/TmodelInstanceInfo.java | 2 +
.../apache/juddi/api/impl/API_141_JIRATest.java | 7 ++
juddi-ddl-generator/pom.xml | 2 +-
juddi-dist/pom.xml | 2 +-
juddi-examples/ValueSetValidator/pom.xml | 2 +-
juddi-examples/create-partition/pom.xml | 2 +-
juddi-examples/hello-world-embedded/pom.xml | 2 +-
juddi-examples/hello-world/pom.xml | 2 +-
.../juddi/example/helloworld/HelloWorld.java | 2 +-
juddi-examples/more-uddi-samples/pom.xml | 2 +-
juddi-examples/pom.xml | 2 +-
juddi-examples/service-version/pom.xml | 2 +-
juddi-examples/simple-browse/pom.xml | 2 +-
juddi-examples/simple-publish-clerk/pom.xml | 2 +-
juddi-examples/simple-publish-portable/pom.xml | 2 +-
.../subscription-notification-amqp/pom.xml | 2 +-
juddi-examples/uddi-annotations/pom.xml | 2 +-
juddi-examples/uddiv2-api-bridge-example/pom.xml | 2 +-
juddi-examples/wsdl2uddi-lifecyle/pom.xml | 2 +-
juddi-examples/wsdl2uddi/generate-client.sh | 2 +-
juddi-examples/wsdl2uddi/pom.xml | 2 +-
juddi-gui-dsig/pom.xml | 2 +-
juddi-gui/pom.xml | 2 +-
juddi-rest-cxf/pom.xml | 2 +-
juddi-tomcat/catalina.sh | 4 +-
juddi-tomcat/juddi-cryptor.sh | 2 +-
juddi-tomcat/juddi-md5.sh | 2 +-
juddi-tomcat/pom.xml | 2 +-
juddiv3-war-repl/pom.xml | 2 +-
juddiv3-war/pom.xml | 2 +-
pom.xml | 28 ++++-
src/site/markdown/index.md | 2 +
src/site/markdown/releases.md | 1 +
uddi-client-dist/pom.xml | 2 +-
.../src/main/bin/juddi-client-cryptor.sh | 2 +-
uddi-migration-tool/pom.xml | 2 +-
uddi-tck-base/pom.xml | 2 +-
uddi-tck-runner/pom.xml | 2 +-
uddi-tck/pom.xml | 2 +-
...ientSubscriptionCallbackAPIIntegrationTest.java | 2 +
.../v3/tck/JUDDI_300_MultiNodeIntegrationTest.java | 4 +-
uddi-ws/pom.xml | 2 +-
57 files changed, 227 insertions(+), 98 deletions(-)
diff --cc pom.xml
index 68f0557,1ed56e2..cee0379
--- a/pom.xml
+++ b/pom.xml
@@@ -43,9 -43,9 +43,9 @@@ under the License
<sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <cxf.version>2.7.18</cxf.version>
+ <cxf.version>3.2.6</cxf.version>
<springframework.version>3.2.18.RELEASE</springframework.version>
- <apache.tomcat.version>9.0.10</apache.tomcat.version>
+ <apache.tomcat.version>9.0.30</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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org