Skip to content

Commit

Permalink
Removed fasterxml.uuid dependency by shading 4.0.1 (Azure#9761)
Browse files Browse the repository at this point in the history
* Removed fasterxml.uuid dependency by shading 4.0.1

* Added vendor specific spot bugs excludes

* Updated NOTICE.txt file with JUG Java UUID Generator license
  • Loading branch information
kushagraThapar authored Apr 3, 2020
1 parent 04f5f53 commit 4f6b8eb
Show file tree
Hide file tree
Showing 24 changed files with 3,197 additions and 11 deletions.
17 changes: 17 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,20 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.

License notice for JUG Java Uuid Generator
------------------------------------------------------------------------------

JUG Java Uuid Generator

Copyright (c) 2002- Tatu Saloranta, [email protected]

Licensed under the License specified in the file LICENSE which is
included with the source code.
You may not use this file except in compliance with the License.

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Original file line number Diff line number Diff line change
Expand Up @@ -1937,6 +1937,21 @@
UWF_UNWRITTEN_FIELD"/>
</Match>

<!-- Exclude vendor-ed com.fasterxml.uuid:java-uuid-generator types from spotbug -->
<Match>
<Class name="~com\.azure\.cosmos\.implementation\.uuid(.+)"/>
<Bug pattern="CN_IDIOM_NO_SUPER_CALL,
MS_PKGPROTECT,
DM_CONVERT_CASE,
MS_MUTABLE_COLLECTION_PKGPROTECT,
RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE,
SF_SWITCH_NO_DEFAULT,
UCF_USELESS_CONTROL_FLOW,
SE_COMPARATOR_SHOULD_BE_SERIALIZABLE,
CI_CONFUSED_INHERITANCE,
MS_SHOULD_BE_FINAL"/>
</Match>

<!-- Empty byte array is returned as null to reactor. Reactor transform null from Callable to downstream onComplete -->
<Match>
<Class name="~com\.azure\.core\.http\.okhttp\.OkHttpAsyncHttpClient\$OkHttpResponse(.*)"/>
Expand Down
1 change: 0 additions & 1 deletion eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ com.fasterxml.jackson.core:jackson-core;2.10.1
com.fasterxml.jackson.core:jackson-databind;2.10.1
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.10.1
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.10.1
com.fasterxml.uuid:java-uuid-generator;4.0.1
com.github.spotbugs:spotbugs;4.0.0-beta3
com.github.spotbugs:spotbugs-maven-plugin;3.1.12.2
com.google.code.gson:gson;2.8.5
Expand Down
6 changes: 0 additions & 6 deletions sdk/cosmos/azure-cosmos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,6 @@ Licensed under the MIT License.
<version>2.10.1</version> <!-- {x-version-update;cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;external_dependency} -->
</dependency>

<dependency>
<groupId>com.fasterxml.uuid</groupId>
<artifactId>java-uuid-generator</artifactId>
<version>4.0.1</version> <!-- {x-version-update;com.fasterxml.uuid:java-uuid-generator;external_dependency} -->
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

import com.azure.cosmos.ConsistencyLevel;
import com.azure.cosmos.implementation.apachecommons.lang.StringUtils;
import com.azure.cosmos.implementation.uuid.EthernetAddress;
import com.azure.cosmos.implementation.uuid.Generators;
import com.azure.cosmos.implementation.uuid.impl.TimeBasedGenerator;
import com.azure.cosmos.models.FeedOptions;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
import com.fasterxml.uuid.EthernetAddress;
import com.fasterxml.uuid.Generators;
import com.fasterxml.uuid.impl.TimeBasedGenerator;
import io.netty.buffer.ByteBuf;

import java.io.IOException;
Expand Down
Loading

0 comments on commit 4f6b8eb

Please sign in to comment.