Merge pull request #1662 from eclipse-ditto/ditto-330

prepare Ditto 3.3.0 release

NOTICE.md

@@ -1,6 +1,6 @@
 This content is produced and maintained by the Eclipse Ditto project.
 
-* Project home: https://www.eclipse.org/ditto
+* Project home: https://www.eclipse.dev/ditto
 
 # Trademarks
 

README.md

@@ -13,14 +13,14 @@
 [![License](https://img.shields.io/badge/License-EPL%202.0-green.svg)](https://opensource.org/licenses/EPL-2.0)
 [![Lines of code](https://img.shields.io/badge/dynamic/xml.svg?label=Lines%20of%20code&url=https%3A%2F%2Fwww.openhub.net%2Fprojects%2Feclipse-ditto.xml%3Fapi_key%3D11ac3aa12a364fd87b461559a7eedcc53e18fb5a4cf1e43e02cb7a615f1f3d4f&query=%2Fresponse%2Fresult%2Fproject%2Fanalysis%2Ftotal_code_lines&colorB=lightgrey)](https://www.openhub.net/p/eclipse-ditto)
 
-[Eclipse Ditto](https://www.eclipse.org/ditto/)™ is a technology in the IoT implementing a software pattern called “digital twins”.  
+[Eclipse Ditto](https://www.eclipse.dev/ditto/)™ is a technology in the IoT implementing a software pattern called “digital twins”.  
 A digital twin is a virtual, cloud based, representation of his real world counterpart (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations, …).
 
 An ever growing list of [adopters](https://iot.eclipse.org/adopters/?#iot.ditto) makes use of Ditto as part of their IoT platforms - if you're as well using it, it would be super nice to show your [adoption here](https://iot.eclipse.org/adopters/how-to-be-listed-as-an-adopter/).
 
 ## Documentation
 
-Find the documentation on the project site: [https://www.eclipse.org/ditto/](https://www.eclipse.org/ditto/)
+Find the documentation on the project site: [https://www.eclipse.dev/ditto/](https://www.eclipse.dev/ditto/)
 
 ## Eclipse Ditto™ explorer UI
 
@@ -58,7 +58,7 @@ docker-compose logs -f
 ```
 
 Open following URL to get started: [http://localhost:8080](http://localhost:8080)<br/>
-Or have a look at the ["Hello World"](https://www.eclipse.org/ditto/intro-hello-world.html)
+Or have a look at the ["Hello World"](https://www.eclipse.dev/ditto/intro-hello-world.html)
 
 Additional [deployment options](deployment/) are also available, if Docker Compose is not what you want to use.
 

RELEASE.md

@@ -14,10 +14,10 @@ Ditto releases are tracked and planned here: https://projects.eclipse.org/projec
       * First close the staging repo (after all artifacts are there, e.g. also the client artifacts)
       * Then release the staging repo
       * Then it will take a few hours until those changes are synced successfully to Maven central
-* Write Release notes, e.g. like for 3.1.0: https://www.eclipse.org/ditto/release_notes_310.html
+* Write Release notes, e.g. like for 3.1.0: https://www.eclipse.dev/ditto/release_notes_310.html
    * New features, changes, bug fixes to last release / milestone release
    * Add migration notes (if there are any)
-* Write a Blog post announcement, e.g. like for: https://www.eclipse.org/ditto/2022-12-16-release-announcement-310.html
+* Write a Blog post announcement, e.g. like for: https://www.eclipse.dev/ditto/2022-12-16-release-announcement-310.html
 * Close GitHub milestone (and assign all Issues/PRs which were still included in that milestone): https://github.com/eclipse-ditto/ditto/milestones
 * Create a GitHub release: https://github.com/eclipse-ditto/ditto/releases (based on the Tags which was pushed during release job)
 * Write a mail to the "ditto-dev" mailing list

SECURITY.md

@@ -9,9 +9,9 @@ These versions of Eclipse Ditto are currently being supported with security upda
 
 | Version | Supported          |
 |---------| ------------------ |
-| 3.2x    | :white_check_mark: |
-| 3.1.x   | :white_check_mark: |
-| < 3.1.0 | :x:                |
+| 3.3.x   | :white_check_mark: |
+| 3.2.x   | :white_check_mark: |
+| < 3.2.0 | :x:                |
 
 ## Reporting a Vulnerability
 

base/model/src/main/java/org/eclipse/ditto/base/model/acks/AcknowledgementLabelInvalidException.java

@@ -19,12 +19,12 @@
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.NotThreadSafe;
 
-import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.json.JsonObject;
 
 /**
  * Thrown if an AcknowledgementLabel is not valid, for example because it did not comply to the AcknowledgmentLabel
@@ -48,7 +48,7 @@ public final class AcknowledgementLabelInvalidException extends DittoRuntimeExce
             "An acknowledgement label must conform to the regular expression of Ditto documentation.";
 
     private static final URI DEFAULT_HREF = URI.create(
-            "https://www.eclipse.org/ditto/protocol-specification-topic.html#acknowledgement-criterion-actions");
+            "https://www.eclipse.dev/ditto/protocol-specification-topic.html#acknowledgement-criterion-actions");
 
     private static final long serialVersionUID = -2385649293006205966L;
 

base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/NamespacedEntityIdInvalidException.java

@@ -56,7 +56,7 @@ public final class NamespacedEntityIdInvalidException extends EntityIdInvalidExc
                     "length of 256 characters.";
 
     private static final URI DEFAULT_HREF =
-            URI.create("https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id");
+            URI.create("https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id");
 
     private static final long serialVersionUID = -8903476318490123234L;
 

connectivity/service/src/main/resources/javascript/incoming-mapping.js

@@ -19,7 +19,7 @@ function mapToDittoProtocolMsg(
   // ### Insert/adapt your mapping logic here.
   // Use helper function Ditto.buildDittoProtocolMsg to build Ditto protocol message
   // based on incoming payload.
-  // See https://www.eclipse.org/ditto/connectivity-mapping.html#helper-functions for details.
+  // See https://www.eclipse.dev/ditto/connectivity-mapping.html#helper-functions for details.
 
   // ### example code assuming the Ditto protocol content type for incoming messages.
   if (contentType === 'application/vnd.eclipse.ditto+json') {

deployment/docker/README.md

@@ -49,7 +49,7 @@ curl http://devops:foobar@localhost:8080/devops/config/gateway/?path=ditto
 ```
 
 Or by going through the configuration files in this repository, all available configuration files are 
-[linked here](https://www.eclipse.org/ditto/installation-operating.html#ditto-configuration).
+[linked here](https://www.eclipse.dev/ditto/installation-operating.html#ditto-configuration).
 
 ## Start Eclipse Ditto
 

deployment/docker/sandbox/html/index.html

@@ -105,7 +105,7 @@ <h1><img src="./images/ditto.svg" class="ditto-logo" alt="Eclipse Ditto logo"> -
             API</a>.<br/> The Swagger UI for exploring the API will require authentication.
         </p>
         <p>
-            Visit the Eclipse Ditto <a href="https://www.eclipse.org/ditto/intro-overview.html">documentation</a> in
+            Visit the Eclipse Ditto <a href="https://www.eclipse.dev/ditto/intro-overview.html">documentation</a> in
             order to learn more about the project.
         </p>
         <p>

deployment/helm/ditto/Chart.yaml

@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 0.0.3  # chart version is set by release-job
+version: 0.0.4  # chart version is set by release-job
 appVersion: 3.2.1
 keywords:
   - iot-chart
@@ -25,7 +25,7 @@ keywords:
 home: https://www.eclipse.org/ditto
 sources:
   - https://github.com/eclipse-ditto/ditto
-icon: https://www.eclipse.org/ditto/images/ditto.svg
+icon: https://www.eclipse.dev/ditto/images/ditto.svg
 maintainers:
   - name: thjaeckle
     email: [email protected]

deployment/helm/ditto/README.md

@@ -2,7 +2,7 @@
 
 ## Introduction
 
-[Eclipse Ditto™](https://www.eclipse.org/ditto/) is a technology in the IoT implementing a software pattern
+[Eclipse Ditto™](https://www.eclipse.dev/ditto/) is a technology in the IoT implementing a software pattern
 called “digital twins”. A digital twin is a virtual, cloud based, representation of his real world counterpart
 (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations, …).
 

deployment/helm/ditto/ci/ci-workflow-values.yaml

@@ -27,7 +27,7 @@ ingress:
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   resources:
     cpu: 0.15
@@ -38,7 +38,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   resources:
     cpu: 0.15
@@ -49,7 +49,7 @@ things:
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   resources:
     cpu: 0.15
@@ -60,7 +60,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   resources:
     cpu: 0.15
@@ -71,7 +71,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   resources:
     cpu: 0.15

deployment/helm/ditto/local-values.yaml

@@ -25,7 +25,7 @@ global:
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   resources:
     cpu: 0.2
@@ -43,7 +43,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   resources:
     cpu: 0.2
@@ -61,7 +61,7 @@ things:
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   resources:
     cpu: 0.2
@@ -72,7 +72,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   resources:
     cpu: 0.2
@@ -83,7 +83,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   resources:
     cpu: 0.2

deployment/helm/ditto/values.yaml

@@ -61,7 +61,7 @@ global:
   hashedBasicAuthUsers: []
   # jwtOnly controls whether only OpenID-Connect authentication is supported
   #  if false, both OpenID-Connect and basicAuth via nginx (see above "basicAuthUsers" and "hashedBasicAuthUsers") is used
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#openid-connect
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#openid-connect
   jwtOnly: true
   # jvmOptions defines the JVM options applied to all Ditto services running in the JVM, it is put in JAVA_TOOL_OPTIONS
   jvmOptions: >
@@ -370,7 +370,7 @@ akka:
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   # enabled controls whether policies related resources should be created
   enabled: true
@@ -401,7 +401,7 @@ policies:
   # additionalJvmOptions JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for policies service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to policies container
   extraEnv:
@@ -547,7 +547,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-things.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   # enabled controls whether things related resources should be created
   enabled: true
@@ -578,7 +578,7 @@ things:
   # additionalJvmOptions JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for things service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to things container
   extraEnv:
@@ -741,12 +741,12 @@ things:
             }
           },
           "security": "basic_sc",
-          "support": "https://www.eclipse.org/ditto/"
+          "support": "https://www.eclipse.dev/ditto/"
         }
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   # enabled controls whether things-search related resources should be created
   enabled: true
@@ -777,7 +777,7 @@ thingsSearch:
   # additional JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for things-search service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to things-search container
   extraEnv:
@@ -855,7 +855,7 @@ thingsSearch:
       #  one of: unacknowledged | acknowledged | majority | journaled | w1 | w2 | w3
       searchWriteConcern: "acknowledged"
       # searchWithAcksWriteConcern configures the MongoDB write concern for commands sent with "search-persisted" ACK
-      #  ref: https://www.eclipse.org/ditto/basic-acknowledgements.html#built-in-acknowledgement-labels
+      #  ref: https://www.eclipse.dev/ditto/basic-acknowledgements.html#built-in-acknowledgement-labels
       #  one of: unacknowledged | acknowledged | majority | journaled | w1 | w2 | w3
       searchWithAcksWriteConcern: "majority"
       # queryReadConcern configures the MongoDB read concern for doing queries / performing searches
@@ -921,7 +921,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   # enabled controls whether connectivity related resources should be created
   enabled: true
@@ -952,7 +952,7 @@ connectivity:
   # additional JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for connectivity service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to connectivity container
   extraEnv:
@@ -1154,7 +1154,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   # enabled controls whether gateway related resources should be created
   enabled: true
@@ -1185,7 +1185,7 @@ gateway:
     # pullPolicy for the gateway docker image
     pullPolicy: IfNotPresent
   # systemProps used to define arbitrary system properties configuration for gateway
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
     - "-Dditto.protocol.blocklist.0=raw-request-uri"
     - "-Dditto.protocol.blocklist.1=cache-control"
@@ -1277,7 +1277,7 @@ gateway:
     # authentication contains the settings regarding authentication against the gateway
     authentication:
       # enablePreAuthentication whether Ditto "pre-authentication" should be enabled
-      #  ref: https://www.eclipse.org/ditto/installation-operating.html#pre-authentication
+      #  ref: https://www.eclipse.dev/ditto/installation-operating.html#pre-authentication
       enablePreAuthentication: false
       # oauth contains the OAuth2.0 / OpenID Connect related configuration
       oauth:

deployment/kubernetes/README.md

@@ -53,7 +53,7 @@ In case you already have a MongoDB in the cloud or elsewhere it is possible to c
 This can be done by setting the MongoDB URI via env variable "MONGO_DB_URI" in the 
 `deployment/kubernetes/deploymentFiles/ditto/ditto-cluster.yml` for all services except the `gateway`.
 Other MongoDB settings can be set via env variables and are documented in
-[Operating Ditto](https://www.eclipse.org/ditto/installation-operating.html) section.
+[Operating Ditto](https://www.eclipse.dev/ditto/installation-operating.html) section.
 
 In case your "MONGO_DB_URI" contains sensitive information like username and password it is recommended to use
 a kubernetes secret. 

deployment/openshift/nginx/index.html

@@ -41,7 +41,7 @@
   <h1>You have started Eclipse Ditto</h1>
   <div>
     <p>Thank you for trying out Eclipse Ditto!</p>
-    <p>In order to get started quickly, you can now have a look at the <a href="https://www.eclipse.org/ditto/index.html">documentation</a>
+    <p>In order to get started quickly, you can now have a look at the <a href="https://www.eclipse.dev/ditto/index.html">documentation</a>
 
     <p>To authenticate at the HTTP APIs use the following username "ditto" and password "ditto" when asked for by your browser.</p>
 

documentation/README.md

@@ -1,6 +1,6 @@
 ## Eclipse Ditto :: Documentation
 
-This folder contains the documentation and [static website of Eclipse Ditto](https://www.eclipse.org/ditto/).
+This folder contains the documentation and [static website of Eclipse Ditto](https://www.eclipse.dev/ditto/).
 
 The documentation is based on [Jekyll](https://jekyllrb.com) and the fabulous [Jekyll Documentation Theme 6.0](http://idratherbewriting.com/documentation-theme-jekyll/).