[Cronet] Add license to maven modules and adjust version

Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester
Change-Id: I264fd1b0fd9275ed36a960dad24ccc048501c4e9
Reviewed-on: https://chromium-review.googlesource.com/1042929
Commit-Queue: Paul Jensen <pauljensen@chromium.org>
Commit-Queue: Andrei Kapishnikov <kapishnikov@chromium.org>
Reviewed-by: Andrei Kapishnikov <kapishnikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555906}

components/cronet/android/BUILD.gn

@@ -1596,6 +1596,8 @@ group("cronet_test_package") {
 _maven_dir = "$_package_dir/maven-$current_cpu"
 _maven_modules_dir = "$_maven_dir/org/chromium/net"
 _maven_test_dir = "$_maven_dir/test"
+_maven_version =
+    "$chrome_version_major.$chrome_version_build.$chrome_version_patch"
 
 copy("cronet_maven_test_copy") {
   sources = [
@@ -1663,7 +1665,7 @@ template("cronet_maven_module") {
       "//build/util/LASTCHANGE",
       "//chrome/VERSION",
     ]
-    output = "$_maven_modules_dir/$_module_name/$chrome_version_full/$_module_name-$chrome_version_full.pom"
+    output = "$_maven_modules_dir/$_module_name/$_maven_version/$_module_name-$_maven_version.pom"
   }
 
   if (defined(invoker.resource_dir)) {
@@ -1699,7 +1701,7 @@ template("cronet_maven_module") {
   copy(_aar_copy_target_name) {
     sources = get_target_outputs(":$_aar_target_name")
     outputs = [
-      "$_maven_modules_dir/$_module_name/$chrome_version_full/$_module_name-$chrome_version_full.aar",
+      "$_maven_modules_dir/$_module_name/$_maven_version/$_module_name-$_maven_version.aar",
     ]
     deps = [
       ":$_aar_target_name",
@@ -1712,7 +1714,7 @@ template("cronet_maven_module") {
     copy(_copy_target_name) {
       sources = get_target_outputs(invoker.src_jar_dep)
       outputs = [
-        "$_maven_modules_dir/$_module_name/$chrome_version_full/$_module_name-$chrome_version_full-sources.jar",
+        "$_maven_modules_dir/$_module_name/$_maven_version/$_module_name-$_maven_version-sources.jar",
       ]
       deps = [
         invoker.src_jar_dep,
@@ -1726,7 +1728,7 @@ template("cronet_maven_module") {
     copy(_copy_target_name) {
       sources = get_target_outputs(invoker.javadoc_jar_dep)
       outputs = [
-        "$_maven_modules_dir/$_module_name/$chrome_version_full/$_module_name-$chrome_version_full-javadoc.jar",
+        "$_maven_modules_dir/$_module_name/$_maven_version/$_module_name-$_maven_version-javadoc.jar",
       ]
       deps = [
         invoker.javadoc_jar_dep,

components/cronet/android/maven/cronet-api.pom.template

@@ -2,8 +2,15 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.chromium.net</groupId>
   <artifactId>cronet-api</artifactId>
-  <version>@MAJOR@.@MINOR@.@BUILD@.@PATCH@</version>
+  <version>@MAJOR@.@BUILD@.@PATCH@</version>
   <packaging>aar</packaging>
   <name>Cronet</name>
   <description>Cronet API. Does not contain implementation.</description>
+  <licenses>
+    <license>
+      <name>Chromium and built-in dependencies</name>
+      <url>https://storage.cloud.google.com/chromium-cronet/android/@MAJOR@.@MINOR@.@BUILD@.@PATCH@/Release/cronet/LICENSE</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 </project>

components/cronet/android/maven/cronet-common.pom.template

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.chromium.net</groupId>
   <artifactId>cronet-common</artifactId>
-  <version>@MAJOR@.@MINOR@.@BUILD@.@PATCH@</version>
+  <version>@MAJOR@.@BUILD@.@PATCH@</version>
   <packaging>aar</packaging>
   <name>Cronet</name>
   <description>Cronet shared implementation. Not a complete implementation; apps and libraries should not depend on this target directly.</description>
@@ -13,4 +13,11 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
+  <licenses>
+    <license>
+      <name>Chromium and built-in dependencies</name>
+      <url>https://storage.cloud.google.com/chromium-cronet/android/@MAJOR@.@MINOR@.@BUILD@.@PATCH@/Release/cronet/LICENSE</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 </project>

components/cronet/android/maven/cronet-embedded.pom.template

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.chromium.net</groupId>
   <artifactId>cronet-embedded</artifactId>
-  <version>@MAJOR@.@MINOR@.@BUILD@.@PATCH@</version>
+  <version>@MAJOR@.@BUILD@.@PATCH@</version>
   <packaging>aar</packaging>
   <name>Cronet</name>
   <description>High performance implementation of Cronet using native libraries.</description>
@@ -18,4 +18,11 @@
       <version>3.0.1</version>
     </dependency>
   </dependencies>
+  <licenses>
+    <license>
+      <name>Chromium and built-in dependencies</name>
+      <url>https://storage.cloud.google.com/chromium-cronet/android/@MAJOR@.@MINOR@.@BUILD@.@PATCH@/Release/cronet/LICENSE</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 </project>

components/cronet/android/maven/cronet-fallback.pom.template

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.chromium.net</groupId>
   <artifactId>cronet-fallback</artifactId>
-  <version>@MAJOR@.@MINOR@.@BUILD@.@PATCH@</version>
+  <version>@MAJOR@.@BUILD@.@PATCH@</version>
   <packaging>aar</packaging>
   <name>Cronet</name>
   <description>Low performance fallback Cronet implementation based on Android system HttpURLConnection implementation. Should only be used as a backup when Cronet native library implementation fails to load.</description>
@@ -13,4 +13,11 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
+  <licenses>
+    <license>
+      <name>Chromium and built-in dependencies</name>
+      <url>https://storage.cloud.google.com/chromium-cronet/android/@MAJOR@.@MINOR@.@BUILD@.@PATCH@/Release/cronet/LICENSE</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 </project>

components/cronet/android/maven/test/build.gradle.template

@@ -58,6 +58,6 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test:rules:1.0.1'
     implementation 'com.android.support:appcompat-v7:25.4.0'
-    implementation 'org.chromium.net:cronet-embedded:@MAJOR@.@MINOR@.@BUILD@.@PATCH@'
+    implementation 'org.chromium.net:cronet-embedded:@MAJOR@.@BUILD@.@PATCH@'
     androidTestUtil 'com.android.support.test:orchestrator:1.0.1'
 }