Skip to content

Commit 770a2a7

Browse files
angusdavisdennishuo
angusdavis
authored and
dennishuo
committed
When artifacts are deployed, they do not retain profile information such as
dependencies added as part of the profile. Move all dependencies up to direct dependencies in the *-hadoopN.pom.xml files. Separate out hadoop.version into hadoop.one.version and hadoop.two.version Make util's parent artifact consistent with GCS and BQ by appending -parent. Change on 2015/04/01 by angusdavis <angusdavis@google.com> ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=90084304
1 parent 6eadb91 commit 770a2a7

10 files changed

Lines changed: 176 additions & 184 deletions

‎bigquery/bigquery-hadoop1.pom.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,38 @@
3232
</description>
3333
<version>0.6.1-SNAPSHOT-hadoop1</version>
3434

35+
<dependencies>
36+
<dependency>
37+
<groupId>org.apache.hadoop</groupId>
38+
<artifactId>hadoop-core</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.hadoop</groupId>
42+
<artifactId>hadoop-test</artifactId>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>com.google.cloud.bigdataoss</groupId>
47+
<artifactId>util</artifactId>
48+
<version>${bigdataoss.util.version}-hadoop1</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>com.google.cloud.bigdataoss</groupId>
52+
<artifactId>gcs-connector</artifactId>
53+
<version>${bigdataoss.gcs.version}-hadoop1</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>com.google.cloud.bigdataoss</groupId>
57+
<artifactId>gcs-connector</artifactId>
58+
<version>${bigdataoss.gcs.version}-hadoop1</version>
59+
<scope>test</scope>
60+
<type>test-jar</type>
61+
</dependency>
62+
</dependencies>
63+
3564
<build>
3665
<plugins>
66+
3767
<plugin>
3868
<groupId>org.apache.maven.plugins</groupId>
3969
<artifactId>maven-shade-plugin</artifactId>

‎bigquery/bigquery-hadoop2.pom.xml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,55 @@
3232
</description>
3333
<version>0.6.1-SNAPSHOT-hadoop2</version>
3434

35+
<dependencies>
36+
<dependency>
37+
<groupId>org.apache.hadoop</groupId>
38+
<artifactId>hadoop-common</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.hadoop</groupId>
42+
<artifactId>hadoop-common</artifactId>
43+
<classifier>tests</classifier>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.apache.hadoop</groupId>
47+
<artifactId>hadoop-mapreduce-client-core</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.google.cloud.bigdataoss</groupId>
51+
<artifactId>util</artifactId>
52+
<version>${bigdataoss.util.version}-hadoop2</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>com.google.cloud.bigdataoss</groupId>
56+
<artifactId>gcs-connector</artifactId>
57+
<version>${bigdataoss.gcs.version}-hadoop2</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.google.cloud.bigdataoss</groupId>
61+
<artifactId>gcs-connector</artifactId>
62+
<version>${bigdataoss.gcs.version}-hadoop2</version>
63+
<scope>test</scope>
64+
<type>test-jar</type>
65+
</dependency>
66+
</dependencies>
67+
3568
<build>
3669
<plugins>
70+
<plugin>
71+
<groupId>org.apache.maven.plugins</groupId>
72+
<artifactId>maven-compiler-plugin</artifactId>
73+
<version>3.1</version>
74+
<configuration>
75+
<excludes>
76+
<exclude>**/mapred/*.java</exclude>
77+
</excludes>
78+
<testExcludes>
79+
<!-- Exclude hadoop 2 specific tests -->
80+
<exclude>**/mapred/*.java</exclude>
81+
</testExcludes>
82+
</configuration>
83+
</plugin>
3784
<plugin>
3885
<groupId>org.apache.maven.plugins</groupId>
3986
<artifactId>maven-shade-plugin</artifactId>

‎bigquery/pom.xml‎

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -32,92 +32,6 @@
3232
</description>
3333
<version>0.6.1-SNAPSHOT</version>
3434

35-
<profiles>
36-
<profile>
37-
<id>hadoop1</id>
38-
<dependencies>
39-
<dependency>
40-
<groupId>org.apache.hadoop</groupId>
41-
<artifactId>hadoop-core</artifactId>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.apache.hadoop</groupId>
45-
<artifactId>hadoop-test</artifactId>
46-
<scope>test</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>com.google.cloud.bigdataoss</groupId>
50-
<artifactId>util</artifactId>
51-
<version>${bigdataoss.util.version}-hadoop1</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>com.google.cloud.bigdataoss</groupId>
55-
<artifactId>gcs-connector</artifactId>
56-
<version>${bigdataoss.gcs.version}-hadoop1</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>com.google.cloud.bigdataoss</groupId>
60-
<artifactId>gcs-connector</artifactId>
61-
<version>${bigdataoss.gcs.version}-hadoop1</version>
62-
<scope>test</scope>
63-
<type>test-jar</type>
64-
</dependency>
65-
</dependencies>
66-
</profile>
67-
<profile>
68-
<id>hadoop2</id>
69-
<dependencies>
70-
<dependency>
71-
<groupId>org.apache.hadoop</groupId>
72-
<artifactId>hadoop-common</artifactId>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.apache.hadoop</groupId>
76-
<artifactId>hadoop-common</artifactId>
77-
<classifier>tests</classifier>
78-
</dependency>
79-
<dependency>
80-
<groupId>org.apache.hadoop</groupId>
81-
<artifactId>hadoop-mapreduce-client-core</artifactId>
82-
</dependency>
83-
<dependency>
84-
<groupId>com.google.cloud.bigdataoss</groupId>
85-
<artifactId>util</artifactId>
86-
<version>${bigdataoss.util.version}-hadoop2</version>
87-
</dependency>
88-
<dependency>
89-
<groupId>com.google.cloud.bigdataoss</groupId>
90-
<artifactId>gcs-connector</artifactId>
91-
<version>${bigdataoss.gcs.version}-hadoop2</version>
92-
</dependency>
93-
<dependency>
94-
<groupId>com.google.cloud.bigdataoss</groupId>
95-
<artifactId>gcs-connector</artifactId>
96-
<version>${bigdataoss.gcs.version}-hadoop2</version>
97-
<scope>test</scope>
98-
<type>test-jar</type>
99-
</dependency>
100-
</dependencies>
101-
<build>
102-
<plugins>
103-
<plugin>
104-
<groupId>org.apache.maven.plugins</groupId>
105-
<artifactId>maven-compiler-plugin</artifactId>
106-
<version>3.1</version>
107-
<configuration>
108-
<excludes>
109-
<exclude>**/mapred/*.java</exclude>
110-
</excludes>
111-
<testExcludes>
112-
<!-- Exclude hadoop 2 specific tests -->
113-
<exclude>**/mapred/*.java</exclude>
114-
</testExcludes>
115-
</configuration>
116-
</plugin>
117-
</plugins>
118-
</build>
119-
</profile>
120-
</profiles>
12135
<dependencies>
12236
<dependency>
12337
<groupId>com.google.api-client</groupId>

‎gcs/gcs-hadoop1.pom.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,23 @@
3232
</description>
3333
<version>1.3.4-SNAPSHOT-hadoop1</version>
3434

35+
<dependencies>
36+
<dependency>
37+
<groupId>org.apache.hadoop</groupId>
38+
<artifactId>hadoop-core</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.hadoop</groupId>
42+
<artifactId>hadoop-test</artifactId>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>com.google.cloud.bigdataoss</groupId>
47+
<artifactId>util</artifactId>
48+
<version>${bigdataoss.util.version}-hadoop1</version>
49+
</dependency>
50+
</dependencies>
51+
3552
<build>
3653
<plugins>
3754
<plugin>

‎gcs/gcs-hadoop2.pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,27 @@
3232
</description>
3333
<version>1.3.4-SNAPSHOT-hadoop2</version>
3434

35+
<dependencies>
36+
<dependency>
37+
<groupId>org.apache.hadoop</groupId>
38+
<artifactId>hadoop-common</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.hadoop</groupId>
42+
<artifactId>hadoop-common</artifactId>
43+
<classifier>tests</classifier>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.apache.hadoop</groupId>
47+
<artifactId>hadoop-mapreduce-client-core</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.google.cloud.bigdataoss</groupId>
51+
<artifactId>util</artifactId>
52+
<version>${bigdataoss.util.version}-hadoop2</version>
53+
</dependency>
54+
</dependencies>
55+
3556
<build>
3657
<plugins>
3758
<plugin>

‎gcs/pom.xml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,6 @@
3535
<profiles>
3636
<profile>
3737
<id>hadoop1</id>
38-
<dependencies>
39-
<dependency>
40-
<groupId>org.apache.hadoop</groupId>
41-
<artifactId>hadoop-core</artifactId>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.apache.hadoop</groupId>
45-
<artifactId>hadoop-test</artifactId>
46-
<scope>test</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>com.google.cloud.bigdataoss</groupId>
50-
<artifactId>util</artifactId>
51-
<version>${bigdataoss.util.version}-hadoop1</version>
52-
</dependency>
53-
</dependencies>
5438
<build>
5539
<plugins>
5640
<plugin>
@@ -72,26 +56,6 @@
7256
</profile>
7357
<profile>
7458
<id>hadoop2</id>
75-
<dependencies>
76-
<dependency>
77-
<groupId>org.apache.hadoop</groupId>
78-
<artifactId>hadoop-common</artifactId>
79-
</dependency>
80-
<dependency>
81-
<groupId>org.apache.hadoop</groupId>
82-
<artifactId>hadoop-common</artifactId>
83-
<classifier>tests</classifier>
84-
</dependency>
85-
<dependency>
86-
<groupId>org.apache.hadoop</groupId>
87-
<artifactId>hadoop-mapreduce-client-core</artifactId>
88-
</dependency>
89-
<dependency>
90-
<groupId>com.google.cloud.bigdataoss</groupId>
91-
<artifactId>util</artifactId>
92-
<version>${bigdataoss.util.version}-hadoop2</version>
93-
</dependency>
94-
</dependencies>
9559
<build>
9660
<plugins>
9761
<plugin>

0 commit comments

Comments
 (0)