Skip to content
Permalink
Browse files

[Release] Merge branch 'origin/release/1.7.0' into master

  • Loading branch information...
donsciarra committed Feb 8, 2019
2 parents e3e525b + 47fce50 commit c975d2fa2cb2d1b96e7bca03b0696d951b9e9cde
Showing 743 changed files with 15,973 additions and 7,099 deletions.
@@ -1,31 +1,87 @@
.autosave
# Build related files
.gradle/
bin/
*-build*/
build-*/
!build-resources/
build/
!docker/build/
buildSignature.js
CMakeLists.txt.user*
cpp/docs/
cpp/libjoynr/communication-model/
cpp/libjoynr/include/joynr/JoynrExport.h
cpp/libjoynr/include/joynr/JoynrVersion.h
cpp/libjoynr/include/joynr/infrastructure/
cpp/libjoynr/include/joynr/system/
cpp/libjoynr/include/joynr/types/
cpp/libjoynrclustercontroller/include/joynr/JoynrClusterControllerExport.h
cpp/runtimes/include/joynr/JoynrClusterControllerRuntimeExport.h
cpp/runtimes/include/joynr/JoynrRuntimeExport.h
dependency-reduced-pom.xml
joynr.bundle.js
target/
.classpath
.project

# Generated files
/**/src/main/generated*/
/**/src/test/generated*/
cpp/libjoynr/**/generated/
cpp/tests/gen-with-version/
gen/
javascript/libjoynr-js/src/main/js/generated*
xtend-gen*/

# Logs
derby.log
log.txt
logs/
npm-debug.log
reports/
sst-full.log

# IDE related files
*.iml
.autosave
.checkstyle
.settings/
.externalToolBuilders/
/gen
src/main/generated/
bounceproxy.build-.log
/java/messaging/messaging-service/logs
THIRD-PARTY.properties
/*-build*/
.classpath
.DS_Store
.externalToolBuilders/
.idea/
*.iml
logs/
examples/radio-app/gps-provider-joynr.properties
joynrpersistence/
derby.log
build/
javascript/joynr.properties
javascript/apps/radio/joynr.properties
java/core/clustercontroller-standalone/joynr.properties
node_modules
build-*/
!build-resources
generated-cpp
cpp/common/include/joynr/JoynrVersion.h
.vscode/
.project
.settings/
.sts4-cache/
.vscode/

# Dependency caches
node_modules/

# Files from joynr execution
*.launch
.nyc_output/
*.persistence_file
capabilitiesdump/
catruststore.*
clientkeystore.*
controlled-bounceproxy/
examples/radio-js/src/main/resources/lib/
ilt-results*
java/common/infrastructure-common/testdb/
javascript/libjoynr-js/userdirectorydb/
joynr_persistedSubscriptionRequests/
joynrpersistence/
robustness-results*

# Properties files
*joynr.properties
joynr_capabilitiesdirectory.properties
joynr_participantIds.properties
testmessaging.properties
THIRD-PARTY.properties

# Local storage files
localStorageProvider/
localStorageProviderTls/
localStorageStorage/
localStorageTestResults/
radioLocalStorageConsumer/
radioLocalStorageProvider/
@@ -0,0 +1,24 @@
# Available rules:
#
# T1: title-max-length
# T2: title-trailing-whitespace
# T3: title-trailing-punctuation (disabled)
# T4: title-hard-tab
# T5: title-must-not-contain-word (disabled)
# T6: title-leading-whitespace
# T7: title-match-regex (disabled)
# B1: body-max-line-length
# B2: body-trailing-whitespace
# B3: body-hard-tab
# B4: body-first-line-empty
# B5: body-min-length (disabled)
# B6: body-is-missing (disabled)
# B7: body-changed-file-mention (disabled)
#
# See http://jorisroovers.github.io/gitlint/rules/ for a full description.

[general]
ignore=T3,T5,T7,B1,B2,B5,B6,B7

[title-max-length]
line-length=100
38 NOTICE
@@ -16,7 +16,6 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
Accessibility Test Framework under Apache License, Version 2.0
Aether API under Eclipse Public License, Version 1.0
Aether Connector Basic under Eclipse Public License, Version 1.0
@@ -31,23 +30,22 @@ This project has dependencies to:
AOP alliance under Public Domain
aopalliance version 1.0 repackaged as a module under CDDL + GPLv2 with classpath exception
Apache Commons CLI under Apache License, Version 2.0
Apache Commons Codec under Apache License, Version 2.0
Apache Commons Collections under Apache License, Version 2.0
Apache Commons Lang under Apache License, Version 2.0
Apache Commons Logging under The Apache Software License, Version 2.0
Apache Derby Database Engine and Embedded JDBC Driver under Apache 2
Apache Geronimo JSR-317 JPA 2.0 Spec API under The Apache Software License, Version 2.0
Apache Groovy under The Apache Software License, Version 2.0
Apache HttpClient under Apache License, Version 2.0
Apache HttpClient Mime under Apache License, Version 2.0
Apache HttpCore under Apache License, Version 2.0
Apache Log4j under The Apache Software License, Version 2.0
Apache Log4j API under The Apache Software License, Version 2.0
Apache Log4j SLF4J Binding under The Apache Software License, Version 2.0
Apache Maven Wagon :: API under The Apache Software License, Version 2.0
Apache Maven Wagon :: Providers :: File Provider under The Apache Software License, Version 2.0
Apache Maven Wagon :: Providers :: HTTP Shared Library under The Apache Software License, Version 2.0
Apache Maven Wagon :: Providers :: Lightweight HTTP Provider under The Apache Software License, Version 2.0
Apache XBean :: ASM 5 shaded (repackaged) under Apache License, Version 2.0
Apache XBean :: Reflect under The Apache Software License, Version 2.0
Arquillian Config API under Apache License, Version 2.0
Arquillian Config Implementation Base under Apache License, Version 2.0
Arquillian Container GlassFish Embedded 3.1 under Public Domain
@@ -102,6 +100,7 @@ This project has dependencies to:
Commons Collections under The Apache Software License, Version 2.0
Commons IO under The Apache Software License, Version 2.0
Commons Lang under The Apache Software License, Version 2.0
Commons Logging under The Apache Software License, Version 2.0
Commons Pool under The Apache Software License, Version 2.0
Connector Architecture 1.5 API under lgpl
Core File Systems under Eclipse Public License
@@ -127,13 +126,12 @@ This project has dependencies to:
Extension Registry Support under Eclipse Public License - v 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
flatbuffers-java under Apache License V2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Google Guice - Extensions - AssistedInject under The Apache Software License, Version 2.0
Google Guice - Extensions - MultiBindings under The Apache Software License, Version 2.0
Google Guice - Extensions - Persist under The Apache Software License, Version 2.0
Google Guice - Extensions - Servlet under The Apache Software License, Version 2.0
google-collect under The Apache Software License, Version 2.0
graceful-shutdown-test-backend-services under The Apache Software License, Version 2.0
Groovy under The Apache Software License, Version 2.0
Gson under The Apache Software License, Version 2.0
@@ -146,6 +144,7 @@ This project has dependencies to:
HK2 Implementation Utilities under CDDL + GPLv2 with classpath exception
HtmlUnit under Apache License, Version 2.0
HtmlUnit Core JS under Mozilla Public License version 2.0
HttpMime under Apache License
ICU4J under ICU License
INFOMAS ASL :: Annotation Detector under The Apache Software License, Version 2.0
inter-language-test-jee-api under The Apache Software License, Version 2.0
@@ -161,7 +160,16 @@ This project has dependencies to:
io.joynr.examples.radio-jee:radio-jee-provider under The Apache Software License, Version 2.0
io.joynr.examples:android-location-consumer under The Apache Software License, Version 2.0
io.joynr.examples:android-location-provider under The Apache Software License, Version 2.0
io.joynr.examples:custom-headers under The Apache Software License, Version 2.0
io.joynr.examples:custom-headers-api under The Apache Software License, Version 2.0
io.joynr.examples:custom-headers-jee-consumer under The Apache Software License, Version 2.0
io.joynr.examples:custom-headers-jee-provider under The Apache Software License, Version 2.0
io.joynr.examples:location-tester under The Apache Software License, Version 2.0
io.joynr.examples:message-persistence under The Apache Software License, Version 2.0
io.joynr.examples:message-persistence-consumer under The Apache Software License, Version 2.0
io.joynr.examples:message-persistence-impl under The Apache Software License, Version 2.0
io.joynr.examples:message-persistence-java under The Apache Software License, Version 2.0
io.joynr.examples:message-persistence-jee under The Apache Software License, Version 2.0
io.joynr.examples:radio-app under The Apache Software License, Version 2.0
io.joynr.examples:radio-jee under The Apache Software License, Version 2.0
io.joynr.examples:radio-js under The Apache Software License, Version 2.0
@@ -224,14 +232,25 @@ This project has dependencies to:
io.joynr.tests.graceful-shutdown-test:graceful-shutdown-test-consumer under The Apache Software License, Version 2.0
io.joynr.tests.graceful-shutdown-test:graceful-shutdown-test-provider under The Apache Software License, Version 2.0
io.joynr.tests.graceful-shutdown-test:graceful-shutdown-test-second-level-provider under The Apache Software License, Version 2.0
io.joynr.tests.joynr-hivemq-shared-subscriptions.test-apps:backpressure-test-clustered-provider-large under The Apache Software License, Version 2.0
io.joynr.tests.joynr-hivemq-shared-subscriptions.test-apps:backpressure-test-clustered-provider-small under The Apache Software License, Version 2.0
io.joynr.tests.joynr-hivemq-shared-subscriptions.test-apps:backpressure-test-monitor-app under The Apache Software License, Version 2.0
io.joynr.tests.joynr-hivemq-shared-subscriptions.test-apps:sharedsubscriptions-test-clustered-app under The Apache Software License, Version 2.0
io.joynr.tests.joynr-hivemq-shared-subscriptions.test-apps:sharedsubscriptions-test-clustered-app-base under The Apache Software License, Version 2.0
io.joynr.tests.joynr-hivemq-shared-subscriptions.test-apps:sharedsubscriptions-test-monitor-app under The Apache Software License, Version 2.0
io.joynr.tests.joynr-hivemq-shared-subscriptions.test-apps:sharedsubscriptions-test-ping-service-api under The Apache Software License, Version 2.0
io.joynr.tests.joynr-hivemq-shared-subscriptions:test-apps under The Apache Software License, Version 2.0
io.joynr.tests.system-integration-test:sit-controller under The Apache Software License, Version 2.0
io.joynr.tests.system-integration-test:sit-cpp-app under The Apache Software License, Version 2.0
io.joynr.tests.system-integration-test:sit-java-app under The Apache Software License, Version 2.0
io.joynr.tests.system-integration-test:sit-jee-api under The Apache Software License, Version 2.0
io.joynr.tests.system-integration-test:sit-jee-app under The Apache Software License, Version 2.0
io.joynr.tests.system-integration-test:sit-jee-stateless-consumer under The Apache Software License, Version 2.0
io.joynr.tests.system-integration-test:sit-node-app under The Apache Software License, Version 2.0
io.joynr.tests:graceful-shutdown-test under The Apache Software License, Version 2.0
io.joynr.tests:inter-language-test under The Apache Software License, Version 2.0
io.joynr.tests:inter-language-test-jee under The Apache Software License, Version 2.0
io.joynr.tests:joynr-hivemq-shared-subscriptions under The Apache Software License, Version 2.0
io.joynr.tests:performance-test under The Apache Software License, Version 2.0
io.joynr.tests:robustness-test under The Apache Software License, Version 2.0
io.joynr.tests:robustness-test-base under The Apache Software License, Version 2.0
@@ -332,7 +351,6 @@ This project has dependencies to:
libjoynr-websocket-runtime under The Apache Software License, Version 2.0
Logback Classic Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
Logback Core Module under Eclipse Public License - v 1.0 or GNU Lesser General Public License
Logging under The Apache Software License, Version 2.0
Maven Aether Provider under Apache License, Version 2.0
Maven Ant Tasks under The Apache Software License, Version 2.0
Maven Artifact under The Apache Software License, Version 2.0
@@ -352,6 +370,7 @@ This project has dependencies to:
Maven Wagon File Provider under The Apache Software License, Version 2.0
Maven Wagon HTTP Shared Library under The Apache Software License, Version 2.0
Maven Wagon Lightweight HTTP Provider under The Apache Software License, Version 2.0
message-persistence-backend-services under The Apache Software License, Version 2.0
MIME streaming extension under CDDL 1.1 or GPL2 w/ CPE
Mockito under The MIT License
Neko HTML under The Apache Software License, Version 2.0
@@ -369,12 +388,10 @@ This project has dependencies to:
org.franca.core.dsl under Eclipse Public License - v 1.0
org.franca.deploymodel.dsl under Eclipse Public License - v 1.0
OSGi resource locator bundle - used by various API providers that rely on META-INF/services mechanism to locate providers. under CDDL + GPLv2 with classpath exception
OSGi System Bundle under Eclipse Public License
OSGi System Bundle under Eclipse Public License - v 2.0
Payara Embedded-All under CDDL + GPLv2 with classpath exception
Plexus :: Component Annotations under The Apache Software License, Version 2.0
Plexus :: Default Container under The Apache Software License, Version 2.0
Plexus Cipher: encryption/decryption Component under Apache Public License 2.0
Plexus Classworlds under The Apache Software License, Version 2.0
Plexus Common Utilities under The Apache Software License, Version 2.0
Plexus Interpolation API under The Apache Software License, Version 2.0
Plexus Security Dispatcher Component under Apache Public License 2.0
@@ -406,6 +423,7 @@ This project has dependencies to:
SLF4J JDK14 Binding under MIT License
SLF4J LOG4J-12 Binding under MIT License
SOAP with Attachments API for Java 1.3 under lgpl
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1
sqlite4java under The Apache Software License, Version 2.0
stateless-async-backend-services under The Apache Software License, Version 2.0
StAX API under The Apache Software License, Version 2.0

This file was deleted.

Oops, something went wrong.
@@ -16,12 +16,13 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
Accessibility Test Framework under Apache License, Version 2.0
android under Apache License, Version 2.0
ant-launcher under Apache License, Version 2.0
AOP alliance under Public Domain
Apache Commons Codec under Apache License, Version 2.0
Apache Commons Lang under Apache License, Version 2.0
Apache Commons Logging under The Apache Software License, Version 2.0
Apache HttpClient under Apache License, Version 2.0
Apache HttpClient Mime under Apache License, Version 2.0
Apache HttpCore under Apache License, Version 2.0
@@ -35,22 +36,19 @@ This project has dependencies to:
Bouncy Castle Provider under Bouncy Castle Licence
classworlds under BSD Style License
clustercontroller-websocket-runtime under The Apache Software License, Version 2.0
Commons Codec under The Apache Software License, Version 2.0
Commons Collections under The Apache Software License, Version 2.0
Commons IO under The Apache Software License, Version 2.0
Commons Lang under The Apache Software License, Version 2.0
CSS Parser under GNU Lesser General Public License
Default Plexus Container under Apache License, Version 2.0
ehcache under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
flatbuffers-java under Apache License V2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Google Guice - Extensions - AssistedInject under The Apache Software License, Version 2.0
Google Guice - Extensions - MultiBindings under The Apache Software License, Version 2.0
Google Guice - Extensions - Servlet under The Apache Software License, Version 2.0
Hamcrest Core under New BSD License
Hamcrest library under New BSD License
HtmlUnit under Apache License, Version 2.0
HtmlUnit Core JS under Mozilla Public License version 2.0
ICU4J under ICU License
@@ -106,7 +104,6 @@ This project has dependencies to:
jsr311-api under CDDL License
JUnit under Eclipse Public License 1.0
libjoynr-websocket-runtime under The Apache Software License, Version 2.0
Logging under The Apache Software License, Version 2.0
Maven Ant Tasks under The Apache Software License, Version 2.0
Maven Artifact under The Apache Software License, Version 2.0
Maven Artifact Manager under The Apache Software License, Version 2.0
@@ -135,6 +132,7 @@ This project has dependencies to:
SLF4J API and Google Android Binding under The MIT License
SLF4J API Module under MIT License
SLF4J LOG4J-12 Binding under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1
sqlite4java under The Apache Software License, Version 2.0
vtd-xml under GNU GENERAL PUBLIC LICENSE Version 2, June 1991
Xalan Java under The Apache Software License, Version 2.0
@@ -16,12 +16,10 @@ specific language governing permissions and limitations
under the License.

This project has dependencies to:
"Java Concurrency in Practice" book annotations under Creative Commons Attribution License
AOP alliance under Public Domain
Commons Lang under The Apache Software License, Version 2.0
FindBugs-Annotations under GNU Lesser Public License
FindBugs-jsr305 under The Apache Software License, Version 2.0
flatbuffers-java under Apache License V2.0
FlatBuffers Java API under Apache License V2.0
Google Guice - Core Library under The Apache Software License, Version 2.0
Google Guice - Extensions - AssistedInject under The Apache Software License, Version 2.0
Google Guice - Extensions - MultiBindings under The Apache Software License, Version 2.0
@@ -51,4 +49,5 @@ This project has dependencies to:
libjoynr-websocket-runtime under The Apache Software License, Version 2.0
SLF4J API and Google Android Binding under The MIT License
SLF4J API Module under MIT License
SpotBugs Annotations under GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1

@@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>android</artifactId>
<version>1.6.5</version>
<version>1.7.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit c975d2f

Please sign in to comment.
You can’t perform that action at this time.