Skip to content

Commit 85f70c8

Browse files
thjaecklethjaeckle
committed
post-release 3.0.0 commit:
* updated binary compatibility check; removed exclusions Signed-off-by: Thomas Jaeckle <[email protected]>
1 parent a022dcc commit 85f70c8

File tree

15 files changed

+1
-88
lines changed

15 files changed

+1
-88
lines changed

‎base/model/pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,6 @@
132132
<excludes>
133133
<!-- Don't add excludes here before checking with the whole Ditto team -->
134134
<!--<exclude></exclude>-->
135-
<exclude>org.eclipse.ditto.base.model.signals.commands.exceptions</exclude>
136-
<exclude>org.eclipse.ditto.base.model.headers.DittoHeaderDefinition#POLICY_ENFORCER_INVALIDATED_PREEMPTIVELY</exclude>
137-
<exclude>org.eclipse.ditto.base.model.headers.DittoHeadersSizeChecker</exclude>
138-
<exclude>org.eclipse.ditto.base.model.entity.id.RegexPatterns</exclude>
139-
<exclude>org.eclipse.ditto.base.model.exceptions.DittoHeaderInvalidException#newCustomMessageBuilder(java.lang.String)</exclude>
140-
<exclude>org.eclipse.ditto.base.model.namespaces.signals.commands.PurgeNamespaceResponse$JsonFields</exclude>
141-
<exclude>org.eclipse.ditto.base.model.signals.commands.CommandResponseJsonDeserializer</exclude>
142135
</excludes>
143136
</parameter>
144137
</configuration>

‎connectivity/model/pom.xml

-14
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,6 @@
125125
<excludes>
126126
<!-- Don't add excludes here before checking with the whole Ditto team -->
127127
<!--<exclude></exclude>-->
128-
<exclude>org.eclipse.ditto.connectivity.model.AddressMetric$JsonFields</exclude>
129-
<exclude>org.eclipse.ditto.connectivity.model.Connection#getUsername()</exclude>
130-
<exclude>org.eclipse.ditto.connectivity.model.Connection#getPassword()</exclude>
131-
<exclude>org.eclipse.ditto.connectivity.model.Connection$JsonFields#SCHEMA_VERSION</exclude>
132-
<exclude>org.eclipse.ditto.connectivity.model.ConnectivityModelFactory#newClientStatus(java.lang.String,org.eclipse.ditto.connectivity.model.ConnectivityStatus,java.lang.String,java.time.Instant)</exclude>
133-
<exclude>org.eclipse.ditto.connectivity.model.LogEntry#getThingId()</exclude>
134-
<exclude>org.eclipse.ditto.connectivity.model.LogEntry$JsonFields#THING_ID</exclude>
135-
<exclude>org.eclipse.ditto.connectivity.model.LogEntryBuilder#thingId(org.eclipse.ditto.things.model.ThingId)</exclude>
136-
<exclude>org.eclipse.ditto.connectivity.model.ResourceStatus$JsonFields#SCHEMA_VERSION</exclude>
137-
<exclude>org.eclipse.ditto.connectivity.model.Source$JsonFields#SCHEMA_VERSION</exclude>
138-
<exclude>org.eclipse.ditto.connectivity.model.SourceMetrics$JsonFields#SCHEMA_VERSION</exclude>
139-
<exclude>org.eclipse.ditto.connectivity.model.SshTunnel$JsonFields#SCHEMA_VERSION</exclude>
140-
<exclude>org.eclipse.ditto.connectivity.model.Target$JsonFields#SCHEMA_VERSION</exclude>
141-
<exclude>org.eclipse.ditto.connectivity.model.TargetMetrics$JsonFields#SCHEMA_VERSION</exclude>
142128
</excludes>
143129
</parameter>
144130
</configuration>

‎connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPublisherErrorTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
5353
import org.eclipse.ditto.things.model.signals.events.ThingDeleted;
5454
import org.junit.After;
55-
import org.junit.Ignore;
5655
import org.junit.Test;
5756

5857
import com.typesafe.config.Config;
@@ -139,7 +138,6 @@ public void connectionPoolIdleTimeoutShouldNotDisturbEventPublishing() throws Ex
139138
}
140139

141140
@Test
142-
@Ignore("TODO unignore! this test fails because the embedded test server somehow on longer reachable after it was manually recreated")
143141
public void closingConnectionFromServerSideShouldNotDisturbEventPublishing() throws Exception {
144142
createActorSystem(TestConstants.CONFIG);
145143
new TestKit(actorSystem) {{

‎json/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,6 @@
109109
<excludes>
110110
<!-- Don't add excludes here before checking with the whole Ditto team -->
111111
<!--<exclude></exclude>-->
112-
<exclude>org.eclipse.ditto.json.JsonFactory#newValue(int)</exclude>
113-
<exclude>org.eclipse.ditto.json.JsonFactory#newValue(long)</exclude>
114-
<exclude>org.eclipse.ditto.json.JsonFactory#newValue(double)</exclude>
115-
<exclude>org.eclipse.ditto.json.JsonValue#of(int)</exclude>
116-
<exclude>org.eclipse.ditto.json.JsonValue#of(long)</exclude>
117-
<exclude>org.eclipse.ditto.json.JsonValue#of(double)</exclude>
118112
</excludes>
119113
</parameter>
120114
</configuration>

‎jwt/model/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@
121121
<parameter>
122122
<excludes>
123123
<!-- Don't add excludes here before checking with the whole Ditto team -->
124-
<exclude>org.eclipse.ditto.jwt.model.ImmutableJsonWebKey#getExponent()</exclude>
125-
<exclude>org.eclipse.ditto.jwt.model.ImmutableJsonWebKey#getModulus()</exclude>
126-
<exclude>org.eclipse.ditto.jwt.model.JsonWebKey#getModulus()</exclude>
127-
<exclude>org.eclipse.ditto.jwt.model.JsonWebKey#getExponent()</exclude>
128-
<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>
129124
</excludes>
130125
</parameter>
131126
</configuration>

‎messages/model/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@
131131
<excludes>
132132
<!-- Don't add excludes here before checking with the whole Ditto team -->
133133
<!--<exclude></exclude>-->
134-
<exclude>org.eclipse.ditto.messages.model.signals.commands.MessageCommandSizeValidator#DITTO_LIMITS_MESSAGES_MAX_SIZE_BYTES</exclude>
135-
<exclude>org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse#getEntityId()</exclude>
136-
<exclude>org.eclipse.ditto.messages.model.MessageTimeoutException</exclude>
137-
<exclude>org.eclipse.ditto.messages.model.signals.commands.acks.MessageCommandAckRequestSetter</exclude>
138134
</excludes>
139135
</parameter>
140136
</configuration>

‎placeholders/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,6 @@
144144
<excludes>
145145
<!-- Don't add excludes here before checking with the whole Ditto team -->
146146
<!--<exclude></exclude>-->
147-
<exclude>org.eclipse.ditto.placeholders.ExpressionResolver#resolvePartially(java.lang.String,java.util.Collection)</exclude>
148-
<exclude>org.eclipse.ditto.placeholders.PipelineElement#accept(org.eclipse.ditto.placeholders.PipelineElementVisitor)</exclude>
149-
<exclude>org.eclipse.ditto.placeholders.PipelineElement#toOptional()</exclude>
150-
<exclude>org.eclipse.ditto.placeholders.Placeholder#resolve(java.lang.Object,java.lang.String)</exclude>
151-
<exclude>org.eclipse.ditto.placeholders.PlaceholderResolver#getPlaceholderSource()</exclude>
152-
<exclude>org.eclipse.ditto.placeholders.PlaceholderResolver#resolve(java.lang.String)</exclude>
153147
</excludes>
154148
</parameter>
155149
</configuration>

‎policies/model/pom.xml

-13
Original file line numberDiff line numberDiff line change
@@ -149,19 +149,6 @@
149149
<excludes>
150150
<!-- Don't add excludes here before checking with the whole Ditto team -->
151151
<!-- <exclude></exclude> -->
152-
<exclude>org.eclipse.ditto.policies.model.signals.commands.PolicyCommandSizeValidator#DITTO_LIMITS_POLICIES_MAX_SIZE_BYTES</exclude>
153-
<exclude>org.eclipse.ditto.policies.model.signals.commands.modify.DeleteExpiredSubject</exclude>
154-
<exclude>org.eclipse.ditto.policies.model.enforcers.PolicyEnforcers#defaultEvaluator(org.eclipse.ditto.policies.model.Policy)</exclude>
155-
<exclude>org.eclipse.ditto.policies.model.enforcers.PolicyEnforcers#memoryOptimizedEvaluator(org.eclipse.ditto.policies.model.Policy)</exclude>
156-
<exclude>org.eclipse.ditto.policies.model.enforcers.PolicyEnforcers#throughputOptimizedEvaluator(org.eclipse.ditto.policies.model.Policy)</exclude>
157-
<exclude>org.eclipse.ditto.policies.model.enforcers.tree.TreeBasedPolicyEnforcer#createInstance(org.eclipse.ditto.policies.model.Policy)</exclude>
158-
<exclude>org.eclipse.ditto.policies.model.enforcers.trie.TrieBasedPolicyEnforcer#newInstance(org.eclipse.ditto.policies.model.Policy)</exclude>
159-
<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>
160-
<exclude>org.eclipse.ditto.policies.model.EffectedPermissions$JsonFields#SCHEMA_VERSION</exclude>
161-
<exclude>org.eclipse.ditto.policies.model.Policy$JsonFields#SCHEMA_VERSION</exclude>
162-
<exclude>org.eclipse.ditto.policies.model.PolicyEntry$JsonFields#SCHEMA_VERSION</exclude>
163-
<exclude>org.eclipse.ditto.policies.model.Resource$JsonFields</exclude>
164-
<exclude>org.eclipse.ditto.policies.model.Subject$JsonFields</exclude>
165152
</excludes>
166153
</parameter>
167154
</configuration>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
<!-- globally set version for checking binary compatibility against -->
232232
<!-- whoever changes this to ${revision} or ${project.version} is responsible for API breakage caused by this! -->
233233
<!-- in other words: never do that here! exclude the 'breakages' locally in the japicmp maven plugin if you intentionally break something -->
234-
<binary-compatibility-check.version>2.4.0</binary-compatibility-check.version>
234+
<binary-compatibility-check.version>3.0.0</binary-compatibility-check.version>
235235

236236
<maven.skins.fluido.version>1.7</maven.skins.fluido.version>
237237
<doxia.markdown.version>1.8</doxia.markdown.version>

‎protocol/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,6 @@
189189
<excludes>
190190
<!-- Don't add excludes here before checking with the whole Ditto team -->
191191
<!--<exclude></exclude>-->
192-
<exclude>org.eclipse.ditto.protocol.HeaderTranslator</exclude> <!-- moved to ditto-model-base -->
193-
<exclude>org.eclipse.ditto.protocol.adapter.acknowledgements.DefaultAcknowledgementsAdapterProvider</exclude>
194-
<exclude>org.eclipse.ditto.protocol.adapter.connectivity.DefaultConnectivityCommandAdapterProvider</exclude>
195-
<exclude>org.eclipse.ditto.protocol.adapter.policies.DefaultPolicyCommandAdapterProvider</exclude>
196-
<exclude>org.eclipse.ditto.protocol.adapter.things.DefaultThingCommandAdapterProvider</exclude>
197-
<exclude>org.eclipse.ditto.protocol.adapter.things.RetrieveThingsCommandAdapter#of(org.eclipse.ditto.protocol.HeaderTranslator)</exclude>
198-
<exclude>org.eclipse.ditto.protocol.adapter.things.RetrieveThingsCommandResponseAdapter#of(org.eclipse.ditto.protocol.HeaderTranslator)</exclude>
199-
<exclude>org.eclipse.ditto.protocol.adapter.ProtocolAdapter#headerTranslator()</exclude>
200-
<exclude>org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter#getHeaderTranslator()</exclude>
201-
<exclude>org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter#headerTranslator()</exclude>
202-
<exclude>org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter#of(org.eclipse.ditto.protocol.HeaderTranslator)</exclude>
203-
<exclude>org.eclipse.ditto.protocol.adapter.AbstractErrorResponseAdapter#getTopicPathBuilder(org.eclipse.ditto.base.model.signals.commands.ErrorResponse)</exclude>
204192
</excludes>
205193
</parameter>
206194
</configuration>

‎rql/parser/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@
174174
<excludes>
175175
<!-- Always exclude the 'internal' package -->
176176
<exclude>org.eclipse.ditto.rql.parser.internal</exclude>
177-
<!-- thingsearch package was moved to its own module "ditto-rql-search-option-parser" -->
178-
<exclude>org.eclipse.ditto.rql.parser.thingsearch</exclude>
179177
<!-- Don't add excludes here before checking with the whole Ditto team -->
180178
<!--<exclude></exclude>-->
181179
</excludes>

‎rql/query/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@
108108
<excludes>
109109
<!-- Don't add excludes here before checking with the whole Ditto team -->
110110
<!--<exclude></exclude>-->
111-
<exclude>org.eclipse.ditto.rql.query.LikeHelper</exclude>
112-
<exclude>org.eclipse.ditto.rql.query.things.ThingPredicateVisitor#apply(org.eclipse.ditto.rql.query.criteria.Criteria)</exclude>
113111
</excludes>
114112
</parameter>
115113
</configuration>

‎things/model/pom.xml

-10
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,6 @@
157157
<excludes>
158158
<!-- Don't add excludes here before checking with the whole Ditto team -->
159159
<!--<exclude></exclude>-->
160-
<exclude>org.eclipse.ditto.things.model.signals.commands.ThingCommandSizeValidator#DITTO_LIMITS_THINGS_MAX_SIZE_BYTES</exclude>
161-
<exclude>org.eclipse.ditto.things.model.signals.commands.ThingCommandResponse#getEntityId()</exclude>
162-
<exclude>org.eclipse.ditto.things.model.Thing#getPolicyEntityId()</exclude> <!-- renamed to getPolicyId() -->
163-
<exclude>org.eclipse.ditto.things.model.signals.commands.acks.ThingLiveCommandAckRequestSetter</exclude>
164-
<exclude>org.eclipse.ditto.things.model.signals.commands.acks.ThingModifyCommandAckRequestSetter</exclude>
165-
<exclude>org.eclipse.ditto.things.model.Feature$JsonFields#SCHEMA_VERSION</exclude>
166-
<exclude>org.eclipse.ditto.things.model.Thing$JsonFields#SCHEMA_VERSION</exclude>
167-
<exclude>org.eclipse.ditto.things.model.signals.commands.WithSelectedFields</exclude>
168-
<exclude>org.eclipse.ditto.things.model.signals.commands.query.RetrieveThings</exclude>
169-
<exclude>org.eclipse.ditto.things.model.signals.commands.query.ThingQueryCommand</exclude>
170160
</excludes>
171161
</parameter>
172162
</configuration>

‎thingsearch/model/pom.xml

-3
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@
105105
<excludes>
106106
<!-- Don't add excludes here before checking with the whole Ditto team -->
107107
<!--<exclude></exclude>-->
108-
<exclude>org.eclipse.ditto.thingsearch.model.signals.commands.query.StreamThings</exclude>
109-
<exclude>org.eclipse.ditto.thingsearch.model.signals.events.ThingsOutOfSync</exclude>
110-
<exclude>org.eclipse.ditto.thingsearch.model.SearchResult$JsonFields#SCHEMA_VERSION</exclude>
111108
</excludes>
112109
</parameter>
113110
</configuration>

‎wot/model/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
<groupId>com.github.siom79.japicmp</groupId>
106106
<artifactId>japicmp-maven-plugin</artifactId>
107107
<configuration>
108-
<skip>true</skip> <!-- TODO remove once not longer treated as "experimental" -->
109108
<parameter>
110109
<excludes>
111110
<!-- Don't add excludes here before checking with the whole Ditto team -->

0 commit comments

Comments
 (0)