Move dataproc snippets one dir up

GoogleCloudPlatform · Nov 11, 2022 · ec7759b · ec7759b
1 parent ba3bca3
commit ec7759b
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 96 deletions.
diff --git a/dataproc/pom.xml b/dataproc/pom.xml
@@ -2,14 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>com.google.cloud</groupId>
-  <artifactId>google-cloud-dataproc-samples</artifactId>
-  <version>0.0.1-SNAPSHOT</version><!-- This artifact should not be released -->
-  <packaging>pom</packaging>
-  <name>Google Dataproc Samples Parent</name>
+  <artifactId>dataproc-snippets</artifactId>
+  <packaging>jar</packaging>
+  <name>Google Dataproc Snippets</name>
   <url>https://github.com/googleapis/java-dataproc</url>
-  <description>
-    Java idiomatic client for Google Cloud Platform services.
-  </description>
 
   <!--
     The parent pom defines common style checks and testing strategies for our samples.
@@ -27,28 +23,43 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <modules>
-    <module>snippets</module>
-  </modules>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>3.0.0</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.13</version>
-        <configuration>
-          <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project> 
+  <!-- [START dataproc_install_with_bom] -->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>libraries-bom</artifactId>
+        <version>26.1.3</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-dataproc</artifactId>
+    </dependency>
+    <!-- [START_EXCLUDE] -->
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-storage</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>1.1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- [END_EXCLUDE] -->
+  </dependencies>
+  <!-- [END dataproc_install_with_bom] -->
+</project>
diff --git a/dataproc/snippets/pom.xml b/dataproc/snippets/pom.xml
diff --git a/...snippets/src/main/java/CreateCluster.java → dataproc/src/main/java/CreateCluster.java b/...snippets/src/main/java/CreateCluster.java → dataproc/src/main/java/CreateCluster.java
diff --git a/...in/java/CreateClusterWithAutoscaling.java → ...in/java/CreateClusterWithAutoscaling.java b/...in/java/CreateClusterWithAutoscaling.java → ...in/java/CreateClusterWithAutoscaling.java
diff --git a/...va/InstantiateInlineWorkflowTemplate.java → ...va/InstantiateInlineWorkflowTemplate.java b/...va/InstantiateInlineWorkflowTemplate.java → ...va/InstantiateInlineWorkflowTemplate.java
diff --git a/...oc/snippets/src/main/java/Quickstart.java → dataproc/src/main/java/Quickstart.java b/...oc/snippets/src/main/java/Quickstart.java → dataproc/src/main/java/Quickstart.java
diff --git a/...pets/src/main/java/SubmitHadoopFsJob.java → ...proc/src/main/java/SubmitHadoopFsJob.java b/...pets/src/main/java/SubmitHadoopFsJob.java → ...proc/src/main/java/SubmitHadoopFsJob.java
diff --git a/...roc/snippets/src/main/java/SubmitJob.java → dataproc/src/main/java/SubmitJob.java b/...roc/snippets/src/main/java/SubmitJob.java → dataproc/src/main/java/SubmitJob.java
diff --git a/...pets/src/test/java/CreateClusterTest.java → ...proc/src/test/java/CreateClusterTest.java b/...pets/src/test/java/CreateClusterTest.java → ...proc/src/test/java/CreateClusterTest.java
diff --git a/...ava/CreateClusterWithAutoscalingTest.java → ...ava/CreateClusterWithAutoscalingTest.java b/...ava/CreateClusterWithAutoscalingTest.java → ...ava/CreateClusterWithAutoscalingTest.java
diff --git a/...nstantiateInlineWorkflowTemplateTest.java → ...nstantiateInlineWorkflowTemplateTest.java b/...nstantiateInlineWorkflowTemplateTest.java → ...nstantiateInlineWorkflowTemplateTest.java
diff --git a/...nippets/src/test/java/QuickstartTest.java → dataproc/src/test/java/QuickstartTest.java b/...nippets/src/test/java/QuickstartTest.java → dataproc/src/test/java/QuickstartTest.java
diff --git a/.../src/test/java/SubmitHadoopFsJobTest.java → .../src/test/java/SubmitHadoopFsJobTest.java b/.../src/test/java/SubmitHadoopFsJobTest.java → .../src/test/java/SubmitHadoopFsJobTest.java
diff --git a/...snippets/src/test/java/SubmitJobTest.java → dataproc/src/test/java/SubmitJobTest.java b/...snippets/src/test/java/SubmitJobTest.java → dataproc/src/test/java/SubmitJobTest.java