post-release 3.0.0 commit:

* updated binary compatibility check; removed exclusions Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Sep 28, 2022 · 85f70c8 · 85f70c8
1 parent a022dcc
commit 85f70c8
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 88 deletions.
diff --git a/base/model/pom.xml b/base/model/pom.xml
@@ -132,13 +132,6 @@
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
-                            <exclude>org.eclipse.ditto.base.model.signals.commands.exceptions</exclude>
-                            <exclude>org.eclipse.ditto.base.model.headers.DittoHeaderDefinition#POLICY_ENFORCER_INVALIDATED_PREEMPTIVELY</exclude>
-                            <exclude>org.eclipse.ditto.base.model.headers.DittoHeadersSizeChecker</exclude>
-                            <exclude>org.eclipse.ditto.base.model.entity.id.RegexPatterns</exclude>
-                            <exclude>org.eclipse.ditto.base.model.exceptions.DittoHeaderInvalidException#newCustomMessageBuilder(java.lang.String)</exclude>
-                            <exclude>org.eclipse.ditto.base.model.namespaces.signals.commands.PurgeNamespaceResponse$JsonFields</exclude>
-                            <exclude>org.eclipse.ditto.base.model.signals.commands.CommandResponseJsonDeserializer</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

diff --git a/connectivity/model/pom.xml b/connectivity/model/pom.xml
@@ -125,20 +125,6 @@
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
-                            <exclude>org.eclipse.ditto.connectivity.model.AddressMetric$JsonFields</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.Connection#getUsername()</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.Connection#getPassword()</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.Connection$JsonFields#SCHEMA_VERSION</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.ConnectivityModelFactory#newClientStatus(java.lang.String,org.eclipse.ditto.connectivity.model.ConnectivityStatus,java.lang.String,java.time.Instant)</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.LogEntry#getThingId()</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.LogEntry$JsonFields#THING_ID</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.LogEntryBuilder#thingId(org.eclipse.ditto.things.model.ThingId)</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.ResourceStatus$JsonFields#SCHEMA_VERSION</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.Source$JsonFields#SCHEMA_VERSION</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.SourceMetrics$JsonFields#SCHEMA_VERSION</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.SshTunnel$JsonFields#SCHEMA_VERSION</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.Target$JsonFields#SCHEMA_VERSION</exclude>
-                            <exclude>org.eclipse.ditto.connectivity.model.TargetMetrics$JsonFields#SCHEMA_VERSION</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

diff --git a/...ava/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPublisherErrorTest.java b/...ava/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPublisherErrorTest.java
@@ -52,7 +52,6 @@
 import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
 import org.eclipse.ditto.things.model.signals.events.ThingDeleted;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.typesafe.config.Config;
@@ -139,7 +138,6 @@ public void connectionPoolIdleTimeoutShouldNotDisturbEventPublishing() throws Ex
     }
 
     @Test
-    @Ignore("TODO unignore! this test fails because the embedded test server somehow on longer reachable after it was manually recreated")
     public void closingConnectionFromServerSideShouldNotDisturbEventPublishing() throws Exception {
         createActorSystem(TestConstants.CONFIG);
         new TestKit(actorSystem) {{

diff --git a/json/pom.xml b/json/pom.xml
@@ -109,12 +109,6 @@
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
-                            <exclude>org.eclipse.ditto.json.JsonFactory#newValue(int)</exclude>
-                            <exclude>org.eclipse.ditto.json.JsonFactory#newValue(long)</exclude>
-                            <exclude>org.eclipse.ditto.json.JsonFactory#newValue(double)</exclude>
-                            <exclude>org.eclipse.ditto.json.JsonValue#of(int)</exclude>
-                            <exclude>org.eclipse.ditto.json.JsonValue#of(long)</exclude>
-                            <exclude>org.eclipse.ditto.json.JsonValue#of(double)</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

diff --git a/jwt/model/pom.xml b/jwt/model/pom.xml
@@ -121,11 +121,6 @@
                     <parameter>
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
-                            <exclude>org.eclipse.ditto.jwt.model.ImmutableJsonWebKey#getExponent()</exclude>
-                            <exclude>org.eclipse.ditto.jwt.model.ImmutableJsonWebKey#getModulus()</exclude>
-                            <exclude>org.eclipse.ditto.jwt.model.JsonWebKey#getModulus()</exclude>
-                            <exclude>org.eclipse.ditto.jwt.model.JsonWebKey#getExponent()</exclude>
-                            <exclude>org.eclipse.ditto.jwt.model.ImmutableJsonWebKey#of(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.math.BigInteger,java.math.BigInteger)</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

diff --git a/messages/model/pom.xml b/messages/model/pom.xml
@@ -131,10 +131,6 @@
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
-                            <exclude>org.eclipse.ditto.messages.model.signals.commands.MessageCommandSizeValidator#DITTO_LIMITS_MESSAGES_MAX_SIZE_BYTES</exclude>
-                            <exclude>org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse#getEntityId()</exclude>
-                            <exclude>org.eclipse.ditto.messages.model.MessageTimeoutException</exclude>
-                            <exclude>org.eclipse.ditto.messages.model.signals.commands.acks.MessageCommandAckRequestSetter</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

diff --git a/placeholders/pom.xml b/placeholders/pom.xml
@@ -144,12 +144,6 @@
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
-                            <exclude>org.eclipse.ditto.placeholders.ExpressionResolver#resolvePartially(java.lang.String,java.util.Collection)</exclude>
-                            <exclude>org.eclipse.ditto.placeholders.PipelineElement#accept(org.eclipse.ditto.placeholders.PipelineElementVisitor)</exclude>
-                            <exclude>org.eclipse.ditto.placeholders.PipelineElement#toOptional()</exclude>
-                            <exclude>org.eclipse.ditto.placeholders.Placeholder#resolve(java.lang.Object,java.lang.String)</exclude>
-                            <exclude>org.eclipse.ditto.placeholders.PlaceholderResolver#getPlaceholderSource()</exclude>
-                            <exclude>org.eclipse.ditto.placeholders.PlaceholderResolver#resolve(java.lang.String)</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

diff --git a/policies/model/pom.xml b/policies/model/pom.xml
@@ -149,19 +149,6 @@
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!-- <exclude></exclude> -->
-                            <exclude>org.eclipse.ditto.policies.model.signals.commands.PolicyCommandSizeValidator#DITTO_LIMITS_POLICIES_MAX_SIZE_BYTES</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.signals.commands.modify.DeleteExpiredSubject</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.enforcers.PolicyEnforcers#defaultEvaluator(org.eclipse.ditto.policies.model.Policy)</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.enforcers.PolicyEnforcers#memoryOptimizedEvaluator(org.eclipse.ditto.policies.model.Policy)</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.enforcers.PolicyEnforcers#throughputOptimizedEvaluator(org.eclipse.ditto.policies.model.Policy)</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.enforcers.tree.TreeBasedPolicyEnforcer#createInstance(org.eclipse.ditto.policies.model.Policy)</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.enforcers.trie.TrieBasedPolicyEnforcer#newInstance(org.eclipse.ditto.policies.model.Policy)</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.SubjectAnnouncement#of(org.eclipse.ditto.base.model.common.DittoDuration, boolean, java.util.List, org.eclipse.ditto.base.model.common.DittoDuration)</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.EffectedPermissions$JsonFields#SCHEMA_VERSION</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.Policy$JsonFields#SCHEMA_VERSION</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.PolicyEntry$JsonFields#SCHEMA_VERSION</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.Resource$JsonFields</exclude>
-                            <exclude>org.eclipse.ditto.policies.model.Subject$JsonFields</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

diff --git a/pom.xml b/pom.xml
@@ -231,7 +231,7 @@
         <!-- globally set version for checking binary compatibility against -->
         <!-- whoever changes this to ${revision} or ${project.version} is responsible for API breakage caused by this! -->
         <!-- in other words: never do that here! exclude the 'breakages' locally in the japicmp maven plugin if you intentionally break something -->
-        <binary-compatibility-check.version>2.4.0</binary-compatibility-check.version>
+        <binary-compatibility-check.version>3.0.0</binary-compatibility-check.version>
 
         <maven.skins.fluido.version>1.7</maven.skins.fluido.version>
         <doxia.markdown.version>1.8</doxia.markdown.version>

diff --git a/protocol/pom.xml b/protocol/pom.xml
@@ -189,18 +189,6 @@
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
-                            <exclude>org.eclipse.ditto.protocol.HeaderTranslator</exclude> <!-- moved to ditto-model-base -->
-                            <exclude>org.eclipse.ditto.protocol.adapter.acknowledgements.DefaultAcknowledgementsAdapterProvider</exclude>
-                            <exclude>org.eclipse.ditto.protocol.adapter.connectivity.DefaultConnectivityCommandAdapterProvider</exclude>
-                            <exclude>org.eclipse.ditto.protocol.adapter.policies.DefaultPolicyCommandAdapterProvider</exclude>
-                            <exclude>org.eclipse.ditto.protocol.adapter.things.DefaultThingCommandAdapterProvider</exclude>
-                            <exclude>org.eclipse.ditto.protocol.adapter.things.RetrieveThingsCommandAdapter#of(org.eclipse.ditto.protocol.HeaderTranslator)</exclude>
-                            <exclude>org.eclipse.ditto.protocol.adapter.things.RetrieveThingsCommandResponseAdapter#of(org.eclipse.ditto.protocol.HeaderTranslator)</exclude>
-                            <exclude>org.eclipse.ditto.protocol.adapter.ProtocolAdapter#headerTranslator()</exclude>
-                            <exclude>org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter#getHeaderTranslator()</exclude>
-                            <exclude>org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter#headerTranslator()</exclude>
-                            <exclude>org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter#of(org.eclipse.ditto.protocol.HeaderTranslator)</exclude>
-                            <exclude>org.eclipse.ditto.protocol.adapter.AbstractErrorResponseAdapter#getTopicPathBuilder(org.eclipse.ditto.base.model.signals.commands.ErrorResponse)</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

diff --git a/rql/parser/pom.xml b/rql/parser/pom.xml
@@ -174,8 +174,6 @@
                         <excludes>
                             <!-- Always exclude the 'internal' package -->
                             <exclude>org.eclipse.ditto.rql.parser.internal</exclude>
-                            <!-- thingsearch package was moved to its own module "ditto-rql-search-option-parser" -->
-                            <exclude>org.eclipse.ditto.rql.parser.thingsearch</exclude>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
                         </excludes>

diff --git a/rql/query/pom.xml b/rql/query/pom.xml
@@ -108,8 +108,6 @@
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
-                            <exclude>org.eclipse.ditto.rql.query.LikeHelper</exclude>
-                            <exclude>org.eclipse.ditto.rql.query.things.ThingPredicateVisitor#apply(org.eclipse.ditto.rql.query.criteria.Criteria)</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

diff --git a/things/model/pom.xml b/things/model/pom.xml
@@ -157,16 +157,6 @@
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
-                            <exclude>org.eclipse.ditto.things.model.signals.commands.ThingCommandSizeValidator#DITTO_LIMITS_THINGS_MAX_SIZE_BYTES</exclude>
-                            <exclude>org.eclipse.ditto.things.model.signals.commands.ThingCommandResponse#getEntityId()</exclude>
-                            <exclude>org.eclipse.ditto.things.model.Thing#getPolicyEntityId()</exclude> <!-- renamed to getPolicyId() -->
-                            <exclude>org.eclipse.ditto.things.model.signals.commands.acks.ThingLiveCommandAckRequestSetter</exclude>
-                            <exclude>org.eclipse.ditto.things.model.signals.commands.acks.ThingModifyCommandAckRequestSetter</exclude>
-                            <exclude>org.eclipse.ditto.things.model.Feature$JsonFields#SCHEMA_VERSION</exclude>
-                            <exclude>org.eclipse.ditto.things.model.Thing$JsonFields#SCHEMA_VERSION</exclude>
-                            <exclude>org.eclipse.ditto.things.model.signals.commands.WithSelectedFields</exclude>
-                            <exclude>org.eclipse.ditto.things.model.signals.commands.query.RetrieveThings</exclude>
-                            <exclude>org.eclipse.ditto.things.model.signals.commands.query.ThingQueryCommand</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

diff --git a/thingsearch/model/pom.xml b/thingsearch/model/pom.xml
@@ -105,9 +105,6 @@
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
-                            <exclude>org.eclipse.ditto.thingsearch.model.signals.commands.query.StreamThings</exclude>
-                            <exclude>org.eclipse.ditto.thingsearch.model.signals.events.ThingsOutOfSync</exclude>
-                            <exclude>org.eclipse.ditto.thingsearch.model.SearchResult$JsonFields#SCHEMA_VERSION</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

diff --git a/wot/model/pom.xml b/wot/model/pom.xml
@@ -105,7 +105,6 @@
                 <groupId>com.github.siom79.japicmp</groupId>
                 <artifactId>japicmp-maven-plugin</artifactId>
                 <configuration>
-                    <skip>true</skip> <!-- TODO remove once not longer treated as "experimental" -->
                     <parameter>
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->