Merge pull request #4 from data-integrations/release/1.2

Release/1.2

Author: rohitsinha54

README.md

@@ -1,6 +1,6 @@
 # Image Directives
 
-[![cm-available](https://cdap-users.herokuapp.com/assets/cm-available.svg)](https://docs.cask.co/cdap/current/en/integrations/cask-market.html)
+[![cm-available](https://cdap-users.herokuapp.com/assets/cm-available.svg)](https://docs.cdap.io/cdap/current/en/integrations/cask-market.html)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Join CDAP community](https://cdap-users.herokuapp.com/badge.svg?t=wrangler)](https://cdap-users.herokuapp.com?t=1)
 
@@ -20,7 +20,7 @@ Developing CDAP DataPrep UDDs is by no means any rocket science, and is an effec
 
 ## Developing UDD
 
-There is one simple interface for developing your customized directive. The simple interface `co.cask.wrangler.api.Directive` can be used for developing user defined directive.
+There is one simple interface for developing your customized directive. The simple interface `io.cdap.wrangler.api.Directive` can be used for developing user defined directive.
 
 ### Simple API
 

pom.xml

@@ -4,19 +4,39 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>co.cask.wrangler</groupId>
+  <groupId>io.cdap.wrangler</groupId>
   <artifactId>image-exif-directives</artifactId>
   <name>UDDs to process images to extract infromation from images.</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <packaging>jar</packaging>
 
   <properties>
-    <cdap.version>5.1.2</cdap.version>
-    <wrangler.version>3.2.2</wrangler.version>
+    <cdap.version>6.0.0-SNAPSHOT</cdap.version>
+    <wrangler.version>4.0.0</wrangler.version>
     <commons.codec.version>1.10</commons.codec.version>
     <junit.version>4.12</junit.version>
   </properties>
 
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <developers>
+    <developer>
+      <name>CDAP</name>
+      <email>cdap-dev@googlegroups.com</email>
+      <organization>CDAP</organization>
+      <organizationUrl>http://cdap.io</organizationUrl>
+    </developer>
+  </developers>
+
+  <issueManagement>
+    <url>https://issues.cask.co/browse/CDAP</url>
+  </issueManagement>
+
   <distributionManagement>
     <repository>
       <id>sonatype.release</id>
@@ -33,19 +53,19 @@
     <!-- Core Dependencies -->
 
     <dependency>
-      <groupId>co.cask.wrangler</groupId>
+      <groupId>io.cdap.wrangler</groupId>
       <artifactId>wrangler-api</artifactId>
       <version>${wrangler.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>co.cask.cdap</groupId>
+      <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-api</artifactId>
       <version>${cdap.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>co.cask.cdap</groupId>
+      <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-etl-api</artifactId>
       <version>${cdap.version}</version>
       <scope>provided</scope>
@@ -67,7 +87,7 @@
 
     <!-- Testing Dependencies -->
     <dependency>
-      <groupId>co.cask.wrangler</groupId>
+      <groupId>io.cdap.wrangler</groupId>
       <artifactId>wrangler-test</artifactId>
       <version>${wrangler.version}</version>
       <scope>test</scope>
@@ -104,7 +124,7 @@
               <Embed-Transitive>true</Embed-Transitive>
               <!-- Embed-Directory>lib</Embed-Directory -->
               <!--Only @Plugin classes in the export packages will be included as plugin-->
-              <_exportcontents>co.cask.directives.*</_exportcontents>
+              <_exportcontents>io.cdap.directives.*</_exportcontents>
             </instructions>
           </configuration>
           <executions>
@@ -134,12 +154,12 @@
         <artifactId>maven-antrun-plugin</artifactId>
       </plugin>
         <plugin>
-          <groupId>co.cask</groupId>
+          <groupId>io.cdap</groupId>
           <artifactId>cdap-maven-plugin</artifactId>
-          <version>1.0.1</version>
+          <version>1.1.0</version>
           <configuration>
             <cdapArtifacts>
-              <parent>system:wrangler-transform[1.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)</parent>
+              <parent>system:wrangler-transform[4.0.0-SNAPSHOT, 5.0.0-SNAPSHOT)</parent>
             </cdapArtifacts>
           </configuration>
           <executions>

src/main/java/co/cask/directives/ExtractEXIF.java renamed to src/main/java/io/cdap/directives/ExtractEXIF.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright © 2017 Cask Data, Inc.
+ *  Copyright © 2019 CDAP
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
  *  use this file except in compliance with the License. You may obtain a copy of
@@ -14,25 +14,25 @@
  *  the License.
  */
 
-package co.cask.directives;
+package io.cdap.directives;
 
-import co.cask.cdap.api.annotation.Description;
-import co.cask.cdap.api.annotation.Name;
-import co.cask.cdap.api.annotation.Plugin;
-import co.cask.wrangler.api.Arguments;
-import co.cask.wrangler.api.Directive;
-import co.cask.wrangler.api.DirectiveExecutionException;
-import co.cask.wrangler.api.DirectiveParseException;
-import co.cask.wrangler.api.ErrorRowException;
-import co.cask.wrangler.api.ExecutorContext;
-import co.cask.wrangler.api.Row;
-import co.cask.wrangler.api.parser.ColumnName;
-import co.cask.wrangler.api.parser.TokenType;
-import co.cask.wrangler.api.parser.UsageDefinition;
 import com.drew.imaging.ImageMetadataReader;
 import com.drew.metadata.Directory;
 import com.drew.metadata.Metadata;
 import com.drew.metadata.Tag;
+import io.cdap.cdap.api.annotation.Description;
+import io.cdap.cdap.api.annotation.Name;
+import io.cdap.cdap.api.annotation.Plugin;
+import io.cdap.wrangler.api.Arguments;
+import io.cdap.wrangler.api.Directive;
+import io.cdap.wrangler.api.DirectiveExecutionException;
+import io.cdap.wrangler.api.DirectiveParseException;
+import io.cdap.wrangler.api.ErrorRowException;
+import io.cdap.wrangler.api.ExecutorContext;
+import io.cdap.wrangler.api.Row;
+import io.cdap.wrangler.api.parser.ColumnName;
+import io.cdap.wrangler.api.parser.TokenType;
+import io.cdap.wrangler.api.parser.UsageDefinition;
 
 import java.io.ByteArrayInputStream;
 import java.util.List;
@@ -41,7 +41,7 @@
  * This class <code>ExtractEXIF</code>implements a <code>Directive</code> interface
  * for reversing the text specified by the value of the <code>column</code>.
  */
-@Plugin(type = Directive.Type)
+@Plugin(type = Directive.TYPE)
 @Name(ExtractEXIF.DIRECTIVE_NAME)
 @Description(ExtractEXIF.DIRECTIVE_DESC)
 public final class ExtractEXIF implements Directive {

src/test/java/org/example/directives/ExtractEXIFTest.java renamed to src/test/java/io/cdap/directive/ExtractEXIFTest.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright © 2017 Cask Data, Inc.
+ *  Copyright © 2019 CDAP
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
  *  use this file except in compliance with the License. You may obtain a copy of
@@ -14,14 +14,14 @@
  *  the License.
  */
 
-package org.example.directives;
+package io.cdap.directive;
 
-import co.cask.directives.ExtractEXIF;
-import co.cask.wrangler.api.RecipePipeline;
-import co.cask.wrangler.api.Row;
-import co.cask.wrangler.test.TestingRig;
-import co.cask.wrangler.test.api.TestRecipe;
-import co.cask.wrangler.test.api.TestRows;
+import io.cdap.directives.ExtractEXIF;
+import io.cdap.wrangler.api.RecipePipeline;
+import io.cdap.wrangler.api.Row;
+import io.cdap.wrangler.test.TestingRig;
+import io.cdap.wrangler.test.api.TestRecipe;
+import io.cdap.wrangler.test.api.TestRows;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -56,4 +56,4 @@ public void testBasicReverse() throws Exception {
     Assert.assertEquals(1, actual.size());
     Assert.assertEquals(73, actual.get(0).getFields().size());
   }
-}
+}