Skip to content

Commit c175873

Browse files
zoewanggzoewangg
committed
Clean up pom files
1 parent 27a5ea3 commit c175873

File tree

41 files changed

+783
-372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+783
-372
lines changed

‎auth/pom.xml

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@
1717
</description>
1818
<url>https://aws.amazon.com/sdkforjava</url>
1919
<dependencies>
20+
<dependency>
21+
<groupId>software.amazon.awssdk</groupId>
22+
<artifactId>annotations</artifactId>
23+
<version>${awsjavasdk.version}</version>
24+
</dependency>
25+
<dependency>
26+
<groupId>software.amazon.awssdk</groupId>
27+
<artifactId>utils</artifactId>
28+
<version>${awsjavasdk.version}</version>
29+
</dependency>
2030
<dependency>
2131
<groupId>software.amazon.awssdk</groupId>
2232
<artifactId>core</artifactId>
@@ -32,10 +42,18 @@
3242
<artifactId>profiles</artifactId>
3343
<version>${awsjavasdk.version}</version>
3444
</dependency>
45+
<dependency>
46+
<groupId>software.amazon.awssdk</groupId>
47+
<artifactId>http-client-spi</artifactId>
48+
<version>${awsjavasdk.version}</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.slf4j</groupId>
52+
<artifactId>slf4j-api</artifactId>
53+
</dependency>
3554
<dependency>
3655
<groupId>com.fasterxml.jackson.core</groupId>
3756
<artifactId>jackson-databind</artifactId>
38-
<version>${jackson.version}</version>
3957
</dependency>
4058

4159
<dependency>
@@ -73,6 +91,16 @@
7391
<artifactId>commons-io</artifactId>
7492
<scope>test</scope>
7593
</dependency>
94+
<dependency>
95+
<groupId>org.assertj</groupId>
96+
<artifactId>assertj-core</artifactId>
97+
<scope>test</scope>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.hamcrest</groupId>
101+
<artifactId>hamcrest-all</artifactId>
102+
<scope>test</scope>
103+
</dependency>
76104
<dependency>
77105
<groupId>org.mockito</groupId>
78106
<artifactId>mockito-core</artifactId>
@@ -89,34 +117,4 @@
89117
<scope>test</scope>
90118
</dependency>
91119
</dependencies>
92-
<build>
93-
<plugins>
94-
<plugin>
95-
<groupId>org.apache.maven.plugins</groupId>
96-
<artifactId>maven-compiler-plugin</artifactId>
97-
</plugin>
98-
<plugin>
99-
<groupId>org.apache.maven.plugins</groupId>
100-
<artifactId>maven-javadoc-plugin</artifactId>
101-
</plugin>
102-
<plugin>
103-
<groupId>org.codehaus.mojo</groupId>
104-
<artifactId>build-helper-maven-plugin</artifactId>
105-
</plugin>
106-
</plugins>
107-
108-
<pluginManagement>
109-
<plugins>
110-
<plugin>
111-
<groupId>org.apache.maven.plugins</groupId>
112-
<artifactId>maven-surefire-plugin</artifactId>
113-
<version>2.19.1</version>
114-
<configuration>
115-
<!-- Run multiple tests in parallel. -->
116-
<forkCount>1C</forkCount>
117-
</configuration>
118-
</plugin>
119-
</plugins>
120-
</pluginManagement>
121-
</build>
122120
</project>

‎aws-core/pom.xml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@
1818
</description>
1919
<url>https://aws.amazon.com/sdkforjava</url>
2020
<dependencies>
21+
<dependency>
22+
<groupId>software.amazon.awssdk</groupId>
23+
<artifactId>annotations</artifactId>
24+
<version>${awsjavasdk.version}</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>software.amazon.awssdk</groupId>
28+
<artifactId>regions</artifactId>
29+
<version>${awsjavasdk.version}</version>
30+
</dependency>
2131
<dependency>
2232
<groupId>software.amazon.awssdk</groupId>
2333
<artifactId>auth</artifactId>
@@ -38,6 +48,22 @@
3848
<artifactId>utils</artifactId>
3949
<version>${awsjavasdk.version}</version>
4050
</dependency>
51+
<dependency>
52+
<groupId>org.slf4j</groupId>
53+
<artifactId>slf4j-api</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>com.fasterxml.jackson.core</groupId>
57+
<artifactId>jackson-databind</artifactId>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.fasterxml.jackson.core</groupId>
61+
<artifactId>jackson-core</artifactId>
62+
</dependency>
63+
<dependency>
64+
<groupId>software.amazon.ion</groupId>
65+
<artifactId>ion-java</artifactId>
66+
</dependency>
4167

4268
<dependency>
4369
<groupId>junit</groupId>
@@ -101,6 +127,17 @@
101127
<artifactId>assertj-core</artifactId>
102128
<scope>test</scope>
103129
</dependency>
130+
<dependency>
131+
<groupId>com.google.guava</groupId>
132+
<artifactId>guava</artifactId>
133+
<scope>test</scope>
134+
</dependency>
135+
<dependency>
136+
<groupId>commons-lang</groupId>
137+
<artifactId>commons-lang</artifactId>
138+
<version>${commons-lang.verson}</version>
139+
<scope>test</scope>
140+
</dependency>
104141
</dependencies>
105142
<build>
106143
<plugins>
@@ -123,7 +160,7 @@
123160
<plugin>
124161
<groupId>org.apache.maven.plugins</groupId>
125162
<artifactId>maven-surefire-plugin</artifactId>
126-
<version>2.19.1</version>
163+
<version>${maven.surefire.version}</version>
127164
<configuration>
128165
<!-- Run multiple tests in parallel. -->
129166
<forkCount>1C</forkCount>

‎bom/pom.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,21 @@
8383
<groupId>software.amazon.awssdk</groupId>
8484
<version>${awsjavasdk.version}</version>
8585
</dependency>
86+
<dependency>
87+
<artifactId>sagemaker</artifactId>
88+
<groupId>software.amazon.awssdk</groupId>
89+
<version>${awsjavasdk.version}</version>
90+
</dependency>
8691
<dependency>
8792
<artifactId>route53</artifactId>
8893
<groupId>software.amazon.awssdk</groupId>
8994
<version>${awsjavasdk.version}</version>
9095
</dependency>
96+
<dependency>
97+
<artifactId>route53domains</artifactId>
98+
<groupId>software.amazon.awssdk</groupId>
99+
<version>${awsjavasdk.version}</version>
100+
</dependency>
91101
<dependency>
92102
<artifactId>s3</artifactId>
93103
<groupId>software.amazon.awssdk</groupId>
@@ -238,6 +248,21 @@
238248
<groupId>software.amazon.awssdk</groupId>
239249
<version>${awsjavasdk.version}</version>
240250
</dependency>
251+
<dependency>
252+
<artifactId>kinesisfirehose</artifactId>
253+
<groupId>software.amazon.awssdk</groupId>
254+
<version>${awsjavasdk.version}</version>
255+
</dependency>
256+
<dependency>
257+
<artifactId>kinesisanalytics</artifactId>
258+
<groupId>software.amazon.awssdk</groupId>
259+
<version>${awsjavasdk.version}</version>
260+
</dependency>
261+
<dependency>
262+
<artifactId>kinesisvideo</artifactId>
263+
<groupId>software.amazon.awssdk</groupId>
264+
<version>${awsjavasdk.version}</version>
265+
</dependency>
241266
<dependency>
242267
<artifactId>opsworks</artifactId>
243268
<groupId>software.amazon.awssdk</groupId>
@@ -258,6 +283,11 @@
258283
<groupId>software.amazon.awssdk</groupId>
259284
<version>${awsjavasdk.version}</version>
260285
</dependency>
286+
<dependency>
287+
<artifactId>cloudsearchdomain</artifactId>
288+
<groupId>software.amazon.awssdk</groupId>
289+
<version>${awsjavasdk.version}</version>
290+
</dependency>
261291
<dependency>
262292
<artifactId>codedeploy</artifactId>
263293
<groupId>software.amazon.awssdk</groupId>
@@ -358,6 +388,11 @@
358388
<groupId>software.amazon.awssdk</groupId>
359389
<version>${awsjavasdk.version}</version>
360390
</dependency>
391+
<dependency>
392+
<artifactId>iotdata</artifactId>
393+
<groupId>software.amazon.awssdk</groupId>
394+
<version>${awsjavasdk.version}</version>
395+
</dependency>
361396
<dependency>
362397
<artifactId>api-gateway</artifactId>
363398
<groupId>software.amazon.awssdk</groupId>

‎build-tools/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,26 @@
2525
<description>This package holds the resources used for checkstyle and spotbugs.
2626
</description>
2727

28+
<properties>
29+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30+
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
31+
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
32+
</properties>
33+
2834
<build>
2935
<plugins>
3036
<plugin>
3137
<groupId>org.apache.maven.plugins</groupId>
3238
<artifactId>maven-deploy-plugin</artifactId>
33-
<version>3.1.1</version>
39+
<version>${maven-deploy-plugin.version}</version>
3440
<configuration>
3541
<skip>true</skip>
3642
</configuration>
3743
</plugin>
3844
<plugin>
3945
<groupId>org.apache.maven.plugins</groupId>
4046
<artifactId>maven-compiler-plugin</artifactId>
47+
<version>${maven-compiler-plugin.version}</version>
4148
<configuration>
4249
<source>1.8</source>
4350
<target>1.8</target>

‎codegen-maven-plugin/src/main/java/software/amazon/awssdk/codegen/maven/plugin/GenerationMojo.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.stream.Stream;
2626
import org.apache.maven.plugin.AbstractMojo;
2727
import org.apache.maven.plugin.MojoExecutionException;
28-
import org.apache.maven.plugins.annotations.Component;
2928
import org.apache.maven.plugins.annotations.Mojo;
3029
import org.apache.maven.plugins.annotations.Parameter;
3130
import org.apache.maven.project.MavenProject;
@@ -59,7 +58,7 @@ public class GenerationMojo extends AbstractMojo {
5958
@Parameter(property = "outputDirectory", defaultValue = "${project.build.directory}")
6059
private String outputDirectory;
6160

62-
@Component
61+
@Parameter(defaultValue = "${project}", readonly = true)
6362
private MavenProject project;
6463

6564
private Path sourcesDirectory;

‎codegen/pom.xml

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,45 @@
3535
</properties>
3636
<!-- The dependencies section in pom.xml is auto generated. No manual changes are allowed -->
3737
<dependencies>
38+
<dependency>
39+
<groupId>software.amazon.awssdk</groupId>
40+
<artifactId>annotations</artifactId>
41+
<version>${awsjavasdk.version}</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>software.amazon.awssdk</groupId>
45+
<artifactId>regions</artifactId>
46+
<version>${awsjavasdk.version}</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>software.amazon.awssdk</groupId>
50+
<artifactId>auth</artifactId>
51+
<version>${awsjavasdk.version}</version>
52+
</dependency>
53+
<dependency>
54+
<artifactId>core</artifactId>
55+
<groupId>software.amazon.awssdk</groupId>
56+
<version>${awsjavasdk.version}</version>
57+
</dependency>
3858
<dependency>
3959
<artifactId>aws-core</artifactId>
4060
<groupId>software.amazon.awssdk</groupId>
4161
<version>${awsjavasdk.version}</version>
4262
</dependency>
63+
<dependency>
64+
<artifactId>utils</artifactId>
65+
<groupId>software.amazon.awssdk</groupId>
66+
<version>${awsjavasdk.version}</version>
67+
</dependency>
4368
<dependency>
4469
<artifactId>org.eclipse.jdt.core</artifactId>
4570
<groupId>org.eclipse.jdt</groupId>
46-
<version>3.10.0</version>
71+
<version>${org.eclipse.jdt.version}</version>
72+
</dependency>
73+
<dependency>
74+
<artifactId>org.eclipse.text</artifactId>
75+
<groupId>org.eclipse.text</groupId>
76+
<version>${org.eclipse.text.version}</version>
4777
</dependency>
4878
<dependency>
4979
<artifactId>freemarker</artifactId>
@@ -53,8 +83,29 @@
5383
<dependency>
5484
<groupId>com.squareup</groupId>
5585
<artifactId>javapoet</artifactId>
56-
<version>1.11.1</version>
86+
<version>${javapoet.verion}</version>
87+
</dependency>
88+
<dependency>
89+
<groupId>com.fasterxml.jackson.core</groupId>
90+
<artifactId>jackson-annotations</artifactId>
91+
</dependency>
92+
<dependency>
93+
<groupId>com.fasterxml.jackson.core</groupId>
94+
<artifactId>jackson-databind</artifactId>
95+
</dependency>
96+
<dependency>
97+
<groupId>com.fasterxml.jackson.core</groupId>
98+
<artifactId>jackson-core</artifactId>
99+
</dependency>
100+
<dependency>
101+
<groupId>org.slf4j</groupId>
102+
<artifactId>slf4j-api</artifactId>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.reactivestreams</groupId>
106+
<artifactId>reactive-streams</artifactId>
57107
</dependency>
108+
58109
<dependency>
59110
<artifactId>junit</artifactId>
60111
<groupId>junit</groupId>

0 commit comments

Comments
 (0)