NextMillennium: Adapter and server version

src/main/java/org/prebid/server/bidder/nextmillennium/NextMillenniumBidder.java

@@ -112,7 +112,11 @@ private BidRequest updateBidRequest(BidRequest bidRequest, ExtImpNextMillennium
 
         final Imp firstImp = bidRequest.getImp().getFirst();
         final ObjectNode updatedImpExt = mapper.mapper().createObjectNode();
-        updatedImpExt.set("bidder", mapper.mapper().valueToTree(ext));
+        updatedImpExt.set("nextMillennium", nextMillenniumNode);
+
+        final ObjectNode prebidNode = mapper.mapper().createObjectNode();
+        prebidNode.set("storedrequest", mapper.mapper().valueToTree(storedRequest));
+        updatedImpExt.set("prebid", prebidNode);
 
         final Imp updatedImp = firstImp.toBuilder()
                 .ext(updatedImpExt)

src/main/java/org/prebid/server/proto/openrtb/ext/request/nextmillennium/ExtRequestNextMillennium.java

@@ -11,9 +11,7 @@ public class ExtRequestNextMillennium {
     @JsonProperty("nmmFlags")
     List<String> nmmFlags;
 
-    @JsonProperty("nmVersion")
     String nmVersion;
 
-    @JsonProperty("serverVersion")
     String serverVersion;
 }

src/test/resources/org/prebid/server/it/openrtb2/nextmillennium/test-nextmillennium-bid-request.json

@@ -9,8 +9,11 @@
       },
       "secure": 1,
       "ext": {
-        "bidder": {
-          "placement_id": "placement_id"
+        "nextMillennium": {},
+        "prebid": {
+          "storedrequest": {
+            "id": "placement_id"
+          }
         }
       }
     }
@@ -56,8 +59,8 @@
     },
     "nextMillennium": {
       "nmmFlags": [ "1" ],
-      "nmVersion": "v1.0.0",
-      "serverVersion": "${json-unit.any-string}"
+      "nm_version": "v1.0.0",
+      "server_version": "${json-unit.any-string}"
     }
   }
 }