diff --git a/packages/framework/lib/src/core/service.dart b/packages/framework/lib/src/core/service.dart
index 7592c48d..fdde7586 100644
--- a/packages/framework/lib/src/core/service.dart
+++ b/packages/framework/lib/src/core/service.dart
@@ -3,7 +3,7 @@ library angel_framework.http.service;
 import 'dart:async';
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:merge_map/merge_map.dart';
-import 'package:quiver_hashcode/hashcode.dart';
+import 'package:quiver/core.dart';
 import '../util.dart';
 import 'anonymous_service.dart';
 import 'hooked_service.dart' show HookedService;
diff --git a/packages/framework/pubspec.yaml b/packages/framework/pubspec.yaml
index 18d6acb0..562ede92 100644
--- a/packages/framework/pubspec.yaml
+++ b/packages/framework/pubspec.yaml
@@ -27,7 +27,7 @@ dependencies:
       url: https://github.com/dukefirehawk/angel.git
       ref: sdk-2.12.x_nnbd
       path: packages/route
-  charcode: ^1.0.0
+  charcode: ^1.2.0
   combinator:
     git: 
       url: https://github.com/dukefirehawk/angel.git
@@ -35,25 +35,34 @@ dependencies:
       path: packages/combinator
   file: ^6.1.0
   http_parser: ^4.0.0
-  http_server: ^0.9.0
+  http_server: ^1.0.0
   http2: ^2.0.0
   logging: ^1.0.0
-  matcher: ^0.12.0
-  merge_map: ^1.0.0
-  meta: ^1.0.0
-  mime: ^0.9.0
-  mock_request: ^1.0.0
-  path: ^1.0.0
+  matcher: ^0.12.10
+  merge_map:
+    git: 
+      url: https://github.com/dukefirehawk/angel.git
+      ref: sdk-2.12.x_nnbd
+      path: packages/merge_map
+  meta: ^1.3.0
+  mime: ^1.0.0
+  mock_request:
+    git: 
+      url: https://github.com/dukefirehawk/angel.git
+      ref: sdk-2.12.x_nnbd
+      path: packages/mock_request
+  path: ^1.8.0
   # pedantic: ^1.0.0
-  quiver_hashcode: ^2.0.0
-  recase: ^3.0.1
-  stack_trace: ^1.0.0
-  string_scanner: ^1.0.0
-  tuple: ^1.0.3
+  #quiver_hashcode: ^3.0.0+1
+  quiver: ^3.0.0
+  recase: ^4.0.0-nullsafety.0
+  stack_trace: ^1.10.0
+  string_scanner: ^1.1.0
+  tuple: ^2.0.0
   uuid: ^3.0.1
 dev_dependencies:
-  http: ^0.13.0
+  http: ^0.13.1
   io: ^1.0.0
   #pretty_logging: ^1.0.0
-  test: ^1.15.7
+  test: ^1.16.8