Merge pull request #51 from kklisura/update-protocol

Update protocol to latest version

Author: kklisura

Makefile

@@ -18,15 +18,15 @@ BROWSER_PROTOCOL_JSON_FILE=./browser_protocol.json
 
 EXAMPLES_DIR=cdt-examples
 
-install-cdt-java-protocol-parser:
-	# Building and install cdt-protocol-parser project...
+copy-protocol-files-to-test-resources:
+	# Copy protocol files to cdt-protocol-parser test resources dir.
 	$(CP) $(JS_PROTOCOL_JSON_FILE) "./$(PROTOCOL_PARSER)/src/test/resources/js_protocol.json"
 	$(CP) $(BROWSER_PROTOCOL_JSON_FILE) "./$(PROTOCOL_PARSER)/src/test/resources/browser_protocol.json"
 	$(MVN) --file "$(PROTOCOL_PARSER_DIR)/" clean install
 
-build-cdt-java-protocol-builder: install-cdt-java-protocol-parser
-	# Building cdt-java-protocol-builder project...
-	$(MVN) --file "$(JAVA_PROTOCOL_BUILDER_DIR)/" clean package
+build-all-modules:
+	# Building all modules
+	$(MVN) clean package
 
 compile-cdt-java-client:
 	# Compiling cdt-java-client project...
@@ -46,14 +46,22 @@ clean-previous-protocol:
 	$(RM) -rf $(JAVA_CLIENT_DIR)/src/main/java/$(JAVA_CLIENT_PACKAGE)/events
 	$(RM) -rf $(JAVA_CLIENT_DIR)/src/main/java/$(JAVA_CLIENT_PACKAGE)/commands
 
-upgrade-protocol: build-cdt-java-protocol-builder clean-previous-protocol
+upgrade-protocol: copy-protocol-files-to-test-resources build-all-modules clean-previous-protocol
 	$(RUN_JAR) $(JAVA_PROTOCOL_BUILDER_JAR) --base-package="$(PACKAGE_NAME)" \
 		--output=./$(JAVA_CLIENT_DIR)/ \
 		--js-protocol=$(JS_PROTOCOL_JSON_FILE) \
-		--browser-protocol=$(BROWSER_PROTOCOL_JSON_FILE) \
+		--browser-protocol=$(BROWSER_PROTOCOL_JSON_FILE)
+	# Apply the formatting on the codebase
+	$(MVN) com.coveo:fmt-maven-plugin:format
 
-update-protocol: upgrade-protocol compile-cdt-java-client
+update-protocol: upgrade-protocol
 	# Updated protocol on cdt-java-client
+	$(MVN) verify
+
+update-copyright-license-header:
+	$(MVN) clean license:update-file-header
+	# Apply the formatting on the codebase
+	$(MVN) com.coveo:fmt-maven-plugin:format
 
 sonar-analysis:
 	# Running sonar analysis
@@ -62,11 +70,9 @@ sonar-analysis:
 
 verify:
 	# Running unit tests
-	cd $(JAVA_PROTOCOL_BUILDER_DIR)/ && make verify
-	cd $(JAVA_CLIENT_DIR)/ && make verify
-	$(MVN) --file "$(JAVA_CLIENT_DIR)/" clean install && \
-	  $(MVN) --file "$(EXAMPLES_DIR)/" clean compile
+	$(MVN) verify
 
 download-latest-protocol:
+	# Downloads the latest protocol json files
 	curl -o browser_protocol.json https://raw.githubusercontent.com/ChromeDevTools/devtools-protocol/master/json/browser_protocol.json
 	curl -o js_protocol.json https://raw.githubusercontent.com/ChromeDevTools/devtools-protocol/master/json/js_protocol.json

README.md

@@ -8,7 +8,9 @@ For more information on DevTools, see https://chromedevtools.github.io/devtools-
 
 [v1.3.6](https://github.com/kklisura/chrome-devtools-java-client/tree/v1.3.6) tested on Google Chrome Version 67.0.3396.87. Protocol files from [dev-tools-protocol#1aa7b31ca7](https://github.com/ChromeDevTools/devtools-protocol/tree/1aa7b31ca7bba982eceea8d4bd494b27850fb0df/json)
 
-[v2.0.0](https://github.com/kklisura/chrome-devtools-java-client/tree/v2.0.0) tested on Google Chrome Version 76.0.3809.100. Protocol files from [dev-tools-protocol#e1fb93bd76](https://github.com/ChromeDevTools/devtools-protocol/tree/e1fb93bd76f99cdf401b949757c874c579e15434/json)
+[v2.1.0](https://github.com/kklisura/chrome-devtools-java-client/tree/v2.1.0) tested on Google Chrome Version 76.0.3809.100. Protocol files from [dev-tools-protocol#e1fb93bd76](https://github.com/ChromeDevTools/devtools-protocol/tree/e1fb93bd76f99cdf401b949757c874c579e15434/json)
+
+[vx.x.x](https://github.com/kklisura/chrome-devtools-java-client/tree/vx.x.x) tested on Google Chrome Version 86.0.4240.111. Protocol files from [dev-tools-protocol#fcb68d10bc](https://github.com/ChromeDevTools/devtools-protocol/tree/fcb68d10bc5258ebf96121caf57200069f6e6731/json)
 
 [1] https://chromedevtools.github.io/devtools-protocol/.
 
@@ -129,6 +131,14 @@ make update-protocol
 
 This will build the tools for parsing and generating Java files, [cdt-java-protocol-builder](cdt-java-protocol-builder/) project. The input for this tool are protocol definitions files: `browser_protocol.json` and `js_protocol.json`. The generated Java files will be present in [cdt-java-client](cdt-java-client/) project. After building Java files, the [cdt-java-client](cdt-java-client/) will be compiled. If everything goes successfully, consider the protocol updated. :)
 
+## Updating copyright license header
+
+To go over each module and each source java file to update copyright license header, run:
+
+```
+make update-copyright-license-header
+```
+
 ## License
 
 Chrome DevTools Java Client is licensed under the Apache License, Version 2.0. See [LICENSE](LICENSE.txt) for the full license text.