update r3 release

LICENSE

@@ -1,4 +1,4 @@
-                                 Apache License
+ Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2018 Google LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@
    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.
+   limitations under the License.

build.gradle

@@ -15,31 +15,33 @@
  */
 buildscript {
     ext {
-        dataflowBeamVersion = '2.6.0'
+        dataflowBeamVersion = '2.8.0'
     }
     repositories {
         mavenCentral()
         jcenter()
         maven {
      		 url "https://plugins.gradle.org/m2/"
     	}
-
-    }
-    dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
+    	dependencies {
+        classpath "net.ltgt.gradle:gradle-apt-plugin:0.19"
 
 
     }
+
+    }
+
 }
 
 apply plugin: 'java'
 apply plugin: 'application'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
-apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: "net.ltgt.apt"
 
-mainClassName = System.getProperty("mainClass")
-//mainClassName = 'com.google.swarm.tokenization.CSVBatchPipeline'
+//mainClassName = System.getProperty("mainClass")
+// local build to test
+mainClassName = 'com.google.swarm.tokenization.CSVStreamingPipeline'
 group 'com.google.swarm'
 version '0.1.0'
 
@@ -54,9 +56,7 @@ tasks.withType(JavaCompile) {
 
 repositories {
    mavenCentral()
-   //maven {
-     		 //url "https://repository.apache.org/content/repositories/snapshots/"
-    	//}
+
 
 }
 
@@ -65,43 +65,26 @@ dependencies {
     compile group: 'org.apache.beam', name: 'beam-runners-google-cloud-dataflow-java', version: dataflowBeamVersion
     compile group: 'org.apache.beam', name: 'beam-runners-direct-java', version: dataflowBeamVersion
 	compile group: 'org.slf4j', name: 'slf4j-jdk14', version: '1.7.5'
-	compile 'com.google.apis:google-api-services-cloudkms:v1-rev53-1.23.0'    
-    compile('com.google.cloud:google-cloud-dlp:0.45.0-beta')           
-    compile('com.google.guava:guava:21.0'){
-        force = true
-    }
-
-    compile ('com.google.api-client:google-api-client:1.23.0') {
-        force = true
-    }
-
+	compile 'com.google.cloud:google-cloud-kms:0.70.0-beta'   
+    compile 'com.google.cloud:google-cloud-dlp:0.74.0-beta'
+    compile 'com.google.guava:guava:27.0-jre'
+    compile 'com.google.api-client:google-api-client:1.27.0'
+    compile group: 'com.google.apis', name: 'google-api-services-cloudkms', version: 'v1-rev53-1.23.0'
+	compile "com.google.auto.value:auto-value-annotations:1.6.2"
+    annotationProcessor "com.google.auto.value:auto-value:1.6.2"
 	testCompile group: 'org.apache.beam', name: 'beam-runners-direct-java', version: dataflowBeamVersion
 	testCompile group: 'org.slf4j', name: 'slf4j-jdk14', version: '1.7.5'
 	testCompile 'junit:junit:4.12'
 
 }
-//configurations.all {
-    // check for updates every build
-    //resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
-//}
+
 jar {
     manifest {
-       // attributes ('Main-Class': mainClassName)
+        attributes ('Main-Class': mainClassName)
     }
-    enabled = false
-    doLast { shadowJar.execute() }
-}
-
-shadowJar {
-    zip64 = true
-    def jarVersion = project.hasProperty('artifactVersion') ? artifactVersion: version
-    mergeServiceFiles()
-    exclude 'META-INF/*.DSA'
-    exclude 'META-INF/*.RSA'
-    archiveName = "${rootProject.name}-${jarVersion}.jar"
+
 }
 
-
 compileJava {
     // Add additional jvm argument
     options.compilerArgs.addAll(['-Xlint:all'])
@@ -123,4 +106,3 @@ run {
 
 run.mustRunAfter 'resources'
 
-

dlp-tokenization_metadata

@@ -16,28 +16,23 @@
 	 "is_optional": false
   },
    {
-     "name": "tableSpec",
-     "label": "BQ Table Spec ",
-     "help_text": "<project_id>:<dataset_id>.<table_id>",
+     "name": "dataset",
+     "label": "BQ DatasetId e.g pii_dataset ",
+     "help_text": "<dataset_id>",
  	"is_optional": false
    },
-  {
-      "name": "project",
-      "label": "Name of the Host Project",
-      "help_text": "project_id",
-      "is_optional": true
-    },
-    {
+
+   {
       "name": "batchSize",
       "label": "batch size in number of rows",
       "help_text": "4700, 200",
 		"is_optional": false
 	},
     {
       "name": "pollingInterval",
-      "label": "batch size in number of rows",
+      "label": "Polling interval to GCS- Default is to 5 mins (300 seconds)",
       "help_text": "in seconds: 10, 60",
-		"is_optional": false
+	  "is_optional": true
 	},
    {
       "name": "inspectTemplateName",
@@ -73,20 +68,8 @@
      "name": "fileDecryptKey",
      "label": "Key Name For Input File Encryption",
      "help_text": "data-file-key",
-     "is_optional": true
- 	},
-   {
-     "name": "workerMachineType",
-     "label": "Machine Type",
-     "help_text": "n1-highmem-4",
-     "is_optional": true
- 	},
-   {
-     "name": "numWorkers",
-     "label": "Number of Workers",
-     "help_text": "number 1",
      "is_optional": true
  	}
-
+   
   ]
 }