Skip to content

Commit c62b2b2

Browse files
zoewanggzoewangg
committed
Add manifest entry
1 parent 2f0cdc4 commit c62b2b2

File tree

155 files changed

+2116
-81
lines changed

Some content is hidden

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

155 files changed

+2116
-81
lines changed

‎.changes/next-release/feature-AWSSDKforJavav2-960e4da.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"category": "AWS SDK for Java v2",
3+
"type": "feature",
4+
"description": "Add `Automatic-Module-Name` manifest entry."
5+
}

‎build-tools/src/main/resources/software/amazon/awssdk/checkstyle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384
<!-- Checks for imports of certain packages -->
385385
<!-- See http://checkstyle.sf.net/config_imports.html -->
386386
<module name="IllegalImport">
387-
<property name="illegalPkgs" value="org.apache.http.annotation"/>
387+
<property name="illegalPkgs" value="org.apache.http.annotation,javax.annotation.Generated"/>
388388
</module>
389389

390390
<!-- Checks that the override annotation is specified when using @inheritDoc javadoc. -->

‎codegen/src/main/resources/macros/marshaller/json/ModelMarshallerMacro.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package ${dataModel.transformPackage};
99

1010
import java.util.Map;
1111
import java.util.List;
12-
import javax.annotation.Generated;
12+
import software.amazon.awssdk.annotations.Generated;
1313

1414
import software.amazon.awssdk.core.exception.SdkClientException;
1515
import ${metadata.fullModelPackageName}.*;

‎codegen/src/main/resources/macros/marshaller/rest-json/RequestMarshallerMacro.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import java.util.HashMap;
2020
import java.util.Map;
2121
import java.util.List;
2222
import java.util.regex.Pattern;
23-
import javax.annotation.Generated;
23+
import software.amazon.awssdk.annotations.Generated;
2424

2525
import software.amazon.awssdk.core.exception.SdkClientException;
2626
import software.amazon.awssdk.core.Request;

‎codegen/src/main/resources/templates/api-gateway/base-exception-class.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package ${metadata.fullModelPackageName};
44
import software.amazon.awssdk.opensdk.SdkErrorHttpMetadata;
55
import software.amazon.awssdk.opensdk.internal.BaseException;
66
import software.amazon.awssdk.annotations.SdkInternalApi;
7-
import javax.annotation.Generated;
7+
import software.amazon.awssdk.annotations.Generated;
88

99
/**
1010
* Base exception for all service exceptions thrown by ${metadata.serviceFullName}

‎codegen/src/main/resources/templates/api-gateway/custom-request-signer-interface.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ${fileHeader}
22
<#assign hasPlacement=authorizer.hasTokenPlacement()>
33
package ${metadata.fullAuthPolicyPackageName};
44

5-
import javax.annotation.Generated;
5+
import software.amazon.awssdk.annotations.Generated;
66
<#if hasPlacement>
77
import software.amazon.awssdk.core.ImmutableRequest;
88
import software.amazon.awssdk.core.SignableRequest;

‎codegen/src/main/resources/templates/cucumber/ModuleInjector.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
${fileHeader}
22
package ${metadata.fullSmokeTestsPackageName};
33

4-
import javax.annotation.Generated;
4+
import software.amazon.awssdk.annotations.Generated;
55

66
import com.google.inject.AbstractModule;
77
import com.google.inject.Guice;

‎codegen/src/main/resources/templates/cucumber/RunCucumberTest.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
${fileHeader}
22
package ${metadata.smokeTestsPackageName};
33

4-
import javax.annotation.Generated;
4+
import software.amazon.awssdk.annotations.Generated;
55

66
import org.junit.runner.RunWith;
77

‎codegen/src/main/resources/templates/json/ModelJsonUnmarshaller.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.util.Map;
55
import java.util.Map.Entry;
66
import java.math.*;
77
import software.amazon.awssdk.core.SdkBytes;
8-
import javax.annotation.Generated;
8+
import software.amazon.awssdk.annotations.Generated;
99

1010
import ${metadata.fullModelPackageName}.*;
1111
import software.amazon.awssdk.core.runtime.transform.SimpleTypeJsonUnmarshallers.*;

‎codegen/src/main/resources/templates/json/ModelMarshaller.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package ${transformPackage};
99

1010
import java.util.Map;
1111
import java.util.List;
12-
import javax.annotation.Generated;
12+
import software.amazon.awssdk.annotations.Generated;
1313

1414
import software.amazon.awssdk.core.exception.SdkClientException;
1515
import ${metadata.fullModelPackageName}.*;

‎codegen/src/main/resources/templates/json/RequestMarshaller.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import java.util.Collections;
1414
import java.util.Map;
1515
import java.util.List;
1616
import java.util.regex.Pattern;
17-
import javax.annotation.Generated;
17+
import software.amazon.awssdk.annotations.Generated;
1818

1919
import software.amazon.awssdk.core.exception.SdkClientException;
2020
import software.amazon.awssdk.core.Request;

‎codegen/src/main/resources/templates/query/ModelStaxUnmarshaller.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import java.util.ArrayList;
77
import java.util.Map.Entry;
88

99
import javax.xml.stream.events.XMLEvent;
10-
import javax.annotation.Generated;
10+
import software.amazon.awssdk.annotations.Generated;
1111

1212
import ${metadata.fullModelPackageName}.*;
1313
import software.amazon.awssdk.awscore.protocol.xml.StaxUnmarshallerContext;

‎codegen/src/main/resources/templates/query/exception-unmarshaller.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ${fileHeader}
22
package ${transformPackage};
33

44
import org.w3c.dom.Node;
5-
import javax.annotation.Generated;
5+
import software.amazon.awssdk.annotations.Generated;
66

77
import software.amazon.awssdk.awscore.exception.AwsServiceException;
88
import software.amazon.awssdk.core.util.XpathUtils;

‎codegen/src/main/resources/templates/query/request-marshaller.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package ${transformPackage};
44
import java.util.HashMap;
55
import java.util.List;
66
import java.util.Map;
7-
import javax.annotation.Generated;
7+
import software.amazon.awssdk.annotations.Generated;
88

99
import software.amazon.awssdk.core.exception.SdkClientException;
1010
import software.amazon.awssdk.core.Request;

‎codegen/src/main/resources/templates/rest-xml/request-marshaller.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import java.io.UnsupportedEncodingException;
1313
import java.util.HashMap;
1414
import java.util.List;
1515
import java.util.Map;
16-
import javax.annotation.Generated;
16+
import software.amazon.awssdk.annotations.Generated;
1717

1818
import software.amazon.awssdk.core.exception.SdkClientException;
1919
import software.amazon.awssdk.core.Request;

‎codegen/src/main/resources/templates/rest-xml/s3/ExceptionUnmarshaller.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ${fileHeader}
22
package ${transformPackage};
33

44
import org.w3c.dom.Node;
5-
import javax.annotation.Generated;
5+
import software.amazon.awssdk.annotations.Generated;
66

77
import software.amazon.awssdk.awscore.exception.AwsServiceException;
88
import software.amazon.awssdk.core.util.XpathUtils;

‎core/annotations/pom.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,19 @@
1111

1212
<artifactId>annotations</artifactId>
1313
<name>AWS Java SDK :: Annotations</name>
14-
14+
<build>
15+
<plugins>
16+
<plugin>
17+
<groupId>org.apache.maven.plugins</groupId>
18+
<artifactId>maven-jar-plugin</artifactId>
19+
<configuration>
20+
<archive>
21+
<manifestEntries>
22+
<Automatic-Module-Name>software.amazon.awssdk.annotations</Automatic-Module-Name>
23+
</manifestEntries>
24+
</archive>
25+
</configuration>
26+
</plugin>
27+
</plugins>
28+
</build>
1529
</project>

‎core/auth/pom.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,19 @@
113113
<scope>test</scope>
114114
</dependency>
115115
</dependencies>
116-
116+
<build>
117+
<plugins>
118+
<plugin>
119+
<groupId>org.apache.maven.plugins</groupId>
120+
<artifactId>maven-jar-plugin</artifactId>
121+
<configuration>
122+
<archive>
123+
<manifestEntries>
124+
<Automatic-Module-Name>software.amazon.awssdk.auth</Automatic-Module-Name>
125+
</manifestEntries>
126+
</archive>
127+
</configuration>
128+
</plugin>
129+
</plugins>
130+
</build>
117131
</project>

‎core/aws-core/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,17 @@
151151
<groupId>org.codehaus.mojo</groupId>
152152
<artifactId>build-helper-maven-plugin</artifactId>
153153
</plugin>
154+
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
156+
<artifactId>maven-jar-plugin</artifactId>
157+
<configuration>
158+
<archive>
159+
<manifestEntries>
160+
<Automatic-Module-Name>software.amazon.awssdk.awscore</Automatic-Module-Name>
161+
</manifestEntries>
162+
</archive>
163+
</configuration>
164+
</plugin>
154165
</plugins>
155166

156167
<pluginManagement>

‎core/profiles/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,20 @@
5555
<scope>test</scope>
5656
</dependency>
5757
</dependencies>
58+
59+
<build>
60+
<plugins>
61+
<plugin>
62+
<groupId>org.apache.maven.plugins</groupId>
63+
<artifactId>maven-jar-plugin</artifactId>
64+
<configuration>
65+
<archive>
66+
<manifestEntries>
67+
<Automatic-Module-Name>software.amazon.awssdk.profiles</Automatic-Module-Name>
68+
</manifestEntries>
69+
</archive>
70+
</configuration>
71+
</plugin>
72+
</plugins>
73+
</build>
5874
</project>

‎core/regions/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,17 @@
106106
</execution>
107107
</executions>
108108
</plugin>
109+
<plugin>
110+
<groupId>org.apache.maven.plugins</groupId>
111+
<artifactId>maven-jar-plugin</artifactId>
112+
<configuration>
113+
<archive>
114+
<manifestEntries>
115+
<Automatic-Module-Name>software.amazon.awssdk.regions</Automatic-Module-Name>
116+
</manifestEntries>
117+
</archive>
118+
</configuration>
119+
</plugin>
109120
</plugins>
110121
</pluginManagement>
111122
</build>

‎core/sdk-core/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,17 @@
221221
</instructions>
222222
</configuration>
223223
</plugin>
224+
<plugin>
225+
<groupId>org.apache.maven.plugins</groupId>
226+
<artifactId>maven-jar-plugin</artifactId>
227+
<configuration>
228+
<archive>
229+
<manifestEntries>
230+
<Automatic-Module-Name>software.amazon.awssdk.core</Automatic-Module-Name>
231+
</manifestEntries>
232+
</archive>
233+
</configuration>
234+
</plugin>
224235
</plugins>
225236

226237
<pluginManagement>

‎flow/pom.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,18 @@
4848
<target>1.8</target>
4949
</configuration>
5050
</plugin>
51-
<plugin>
52-
<groupId>org.apache.maven.plugins</groupId>
53-
<artifactId>maven-jar-plugin</artifactId>
54-
<version>3.0.2</version>
55-
<configuration>
56-
<finalName>aws-flow-java</finalName>
57-
</configuration>
58-
</plugin>
5951

6052
<plugin>
6153
<groupId>org.apache.maven.plugins</groupId>
6254
<artifactId>maven-jar-plugin</artifactId>
6355
<version>3.1.0</version>
6456
<configuration>
57+
<finalName>aws-flow-java</finalName>
6558
<archive>
6659
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
60+
<manifestEntries>
61+
<Automatic-Module-Name>software.amazon.eventstream</Automatic-Module-Name>
62+
</manifestEntries>
6763
</archive>
6864
</configuration>
6965
</plugin>

‎http-client-spi/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
<configuration>
7070
<archive>
7171
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
72+
<manifestEntries>
73+
<Automatic-Module-Name>software.amazon.awssdk.http</Automatic-Module-Name>
74+
</manifestEntries>
7275
</archive>
7376
</configuration>
7477
</plugin>

‎http-clients/apache-client/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,17 @@
9191
</instructions>
9292
</configuration>
9393
</plugin>
94+
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
96+
<artifactId>maven-jar-plugin</artifactId>
97+
<configuration>
98+
<archive>
99+
<manifestEntries>
100+
<Automatic-Module-Name>software.amazon.awssdk.http.apache</Automatic-Module-Name>
101+
</manifestEntries>
102+
</archive>
103+
</configuration>
104+
</plugin>
94105
</plugins>
95106
</build>
96107

‎http-clients/netty-nio-client/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,17 @@
166166
</instructions>
167167
</configuration>
168168
</plugin>
169+
<plugin>
170+
<groupId>org.apache.maven.plugins</groupId>
171+
<artifactId>maven-jar-plugin</artifactId>
172+
<configuration>
173+
<archive>
174+
<manifestEntries>
175+
<Automatic-Module-Name>software.amazon.awssdk.http.nio.netty</Automatic-Module-Name>
176+
</manifestEntries>
177+
</archive>
178+
</configuration>
179+
</plugin>
169180
</plugins>
170181
</build>
171182
</project>

‎http-clients/url-connection-client/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,17 @@
7171
<groupId>org.codehaus.mojo</groupId>
7272
<artifactId>build-helper-maven-plugin</artifactId>
7373
</plugin>
74+
<plugin>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-jar-plugin</artifactId>
77+
<configuration>
78+
<archive>
79+
<manifestEntries>
80+
<Automatic-Module-Name>software.amazon.awssdk.http.urlconnection</Automatic-Module-Name>
81+
</manifestEntries>
82+
</archive>
83+
</configuration>
84+
</plugin>
7485
</plugins>
7586
</build>
7687
</project>

‎protocols/aws-cbor/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,20 @@
6161
</dependency>
6262
</dependencies>
6363

64+
<build>
65+
<plugins>
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-jar-plugin</artifactId>
69+
<configuration>
70+
<archive>
71+
<manifestEntries>
72+
<Automatic-Module-Name>software.amazon.awssdk.protocols.cbor</Automatic-Module-Name>
73+
</manifestEntries>
74+
</archive>
75+
</configuration>
76+
</plugin>
77+
</plugins>
78+
</build>
79+
6480
</project>

‎protocols/aws-ion/pom.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,19 @@
8080
</dependency>
8181
</dependencies>
8282

83-
83+
<build>
84+
<plugins>
85+
<plugin>
86+
<groupId>org.apache.maven.plugins</groupId>
87+
<artifactId>maven-jar-plugin</artifactId>
88+
<configuration>
89+
<archive>
90+
<manifestEntries>
91+
<Automatic-Module-Name>software.amazon.awssdk.protocols.ion</Automatic-Module-Name>
92+
</manifestEntries>
93+
</archive>
94+
</configuration>
95+
</plugin>
96+
</plugins>
97+
</build>
8498
</project>

0 commit comments

Comments
 (0)