From 9f051cee2a77c61bf1ee58ddd3d43aba6caef540 Mon Sep 17 00:00:00 2001
From: Srikanta <51379715+srnagar@users.noreply.github.com>
Date: Fri, 25 Sep 2020 14:49:55 -0700
Subject: [PATCH] [Schema Registry] Move module-info.java to the right
 directory (#15726)

* Move module-info.java to the right directory

* Fix module-info related changes to compile and run tests

* Missing module-info
---
 .../azure-data-schemaregistry-avro/pom.xml    | 29 +++++++++++++++++--
 .../src/main/{ => java}/module-info.java      |  4 +++
 .../azure-data-schemaregistry/pom.xml         | 24 +++++++++++++++
 .../src/main/{ => java}/module-info.java      |  1 +
 4 files changed, 55 insertions(+), 3 deletions(-)
 rename sdk/schemaregistry/azure-data-schemaregistry-avro/src/main/{ => java}/module-info.java (60%)
 rename sdk/schemaregistry/azure-data-schemaregistry/src/main/{ => java}/module-info.java (76%)

diff --git a/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml
index 5c4294339a4f5..bb1118d7bf170 100644
--- a/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml
+++ b/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml
@@ -47,9 +47,9 @@
       <version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-data-schemaregistry;current} -->
     </dependency>
     <dependency>
-      <groupId>org.apache.avro</groupId>
-      <artifactId>avro</artifactId>
-      <version>1.9.2</version> <!-- {x-version-update;org.apache.avro:avro;external_dependency} -->
+      <groupId>com.azure</groupId>
+      <artifactId>azure-core-serializer-avro-apache</artifactId>
+      <version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-core-serializer-avro-apache;dependency} -->
     </dependency>
 
     <!-- Test dependencies -->
@@ -124,4 +124,27 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>java-lts</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
+            <configuration>
+              <argLine>
+                --add-opens com.azure.data.schemaregistry.avro/com.azure.data.schemaregistry.avro=ALL-UNNAMED
+              </argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/sdk/schemaregistry/azure-data-schemaregistry-avro/src/main/module-info.java b/sdk/schemaregistry/azure-data-schemaregistry-avro/src/main/java/module-info.java
similarity index 60%
rename from sdk/schemaregistry/azure-data-schemaregistry-avro/src/main/module-info.java
rename to sdk/schemaregistry/azure-data-schemaregistry-avro/src/main/java/module-info.java
index 83d9eeb854ab9..744954dedb6bc 100644
--- a/sdk/schemaregistry/azure-data-schemaregistry-avro/src/main/module-info.java
+++ b/sdk/schemaregistry/azure-data-schemaregistry-avro/src/main/java/module-info.java
@@ -3,6 +3,10 @@
 
 module com.azure.data.schemaregistry.avro {
     requires transitive com.azure.data.schemaregistry;
+    requires transitive com.azure.core.serializer.avro.apache;
 
     exports com.azure.data.schemaregistry.avro;
+
+    opens com.azure.data.schemaregistry.avro to com.fasterxml.jackson.databind, com.azure.core;
+
 }
diff --git a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml
index 08751b7a8ce6f..84ff348b44456 100644
--- a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml
+++ b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml
@@ -93,4 +93,28 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>java-lts</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
+            <configuration>
+              <argLine>
+                --add-opens com.azure.data.schemaregistry/com.azure.data.schemaregistry=ALL-UNNAMED
+              </argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/sdk/schemaregistry/azure-data-schemaregistry/src/main/module-info.java b/sdk/schemaregistry/azure-data-schemaregistry/src/main/java/module-info.java
similarity index 76%
rename from sdk/schemaregistry/azure-data-schemaregistry/src/main/module-info.java
rename to sdk/schemaregistry/azure-data-schemaregistry/src/main/java/module-info.java
index d14d3288f09e5..854653413eefa 100644
--- a/sdk/schemaregistry/azure-data-schemaregistry/src/main/module-info.java
+++ b/sdk/schemaregistry/azure-data-schemaregistry/src/main/java/module-info.java
@@ -8,4 +8,5 @@
     exports com.azure.data.schemaregistry.models;
 
     opens com.azure.data.schemaregistry to com.fasterxml.jackson.databind, com.azure.core;
+    opens com.azure.data.schemaregistry.implementation.models to com.fasterxml.jackson.databind, com.azure.core;
 }