Skip to content

add Automatic-Module-Name to the pom files #775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

add Automatic-Module-Name to the pom files #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/next-release/feature-AWSSDKforJavav2-0484769.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"category": "AWS SDK for Java v2",
"type": "feature",
"description": "Add `Automatic-Module-Name` to all modules."
}
2 changes: 1 addition & 1 deletion codegen/src/main/resources/macros/marshaller/json/ModelMarshallerMacro.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package ${dataModel.transformPackage};

import java.util.Map;
import java.util.List;
import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;

import software.amazon.awssdk.core.exception.SdkClientException;
import ${metadata.fullModelPackageName}.*;
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/main/resources/macros/marshaller/rest-json/RequestMarshallerMacro.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.List;
import java.util.regex.Pattern;
import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;

import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.core.Request;
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/main/resources/templates/api-gateway/base-exception-class.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package ${metadata.fullModelPackageName};
import software.amazon.awssdk.opensdk.SdkErrorHttpMetadata;
import software.amazon.awssdk.opensdk.internal.BaseException;
import software.amazon.awssdk.annotations.SdkInternalApi;
import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;

/**
* Base exception for all service exceptions thrown by ${metadata.serviceFullName}
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/main/resources/templates/api-gateway/custom-request-signer-interface.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ${fileHeader}
<#assign hasPlacement=authorizer.hasTokenPlacement()>
package ${metadata.fullAuthPolicyPackageName};

import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;
<#if hasPlacement>
import software.amazon.awssdk.core.ImmutableRequest;
import software.amazon.awssdk.core.SignableRequest;
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/main/resources/templates/cucumber/ModuleInjector.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
${fileHeader}
package ${metadata.fullSmokeTestsPackageName};

import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;

import com.google.inject.AbstractModule;
import com.google.inject.Guice;
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/main/resources/templates/json/ModelJsonUnmarshaller.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.math.*;
import software.amazon.awssdk.core.SdkBytes;
import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;

import ${metadata.fullModelPackageName}.*;
import software.amazon.awssdk.core.runtime.transform.SimpleTypeJsonUnmarshallers.*;
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/main/resources/templates/json/ModelMarshaller.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package ${transformPackage};

import java.util.Map;
import java.util.List;
import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;

import software.amazon.awssdk.core.exception.SdkClientException;
import ${metadata.fullModelPackageName}.*;
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/main/resources/templates/query/ModelStaxUnmarshaller.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import java.util.ArrayList;
import java.util.Map.Entry;

import javax.xml.stream.events.XMLEvent;
import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;

import ${metadata.fullModelPackageName}.*;
import software.amazon.awssdk.awscore.protocol.xml.StaxUnmarshallerContext;
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/main/resources/templates/query/exception-unmarshaller.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ${fileHeader}
package ${transformPackage};

import org.w3c.dom.Node;
import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;

import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.core.util.XpathUtils;
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/main/resources/templates/query/request-marshaller.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package ${transformPackage};
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;

import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.core.Request;
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/main/resources/templates/rest-xml/request-marshaller.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;

import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.core.Request;
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/main/resources/templates/rest-xml/s3/ExceptionUnmarshaller.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ${fileHeader}
package ${transformPackage};

import org.w3c.dom.Node;
import javax.annotation.Generated;
import software.amazon.awssdk.annotations.Generated;

import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.core.util.XpathUtils;
Expand Down
15 changes: 15 additions & 0 deletions core/annotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,19 @@
<artifactId>annotations</artifactId>
<name>AWS Java SDK :: Annotations</name>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.annotations</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
15 changes: 15 additions & 0 deletions core/auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,19 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.auth</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
11 changes: 11 additions & 0 deletions core/aws-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,17 @@
<forkCount>1C</forkCount>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.awscore</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
16 changes: 16 additions & 0 deletions core/profiles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,20 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.profiles</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
16 changes: 16 additions & 0 deletions core/regions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,20 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.regions</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
11 changes: 11 additions & 0 deletions core/sdk-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,17 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.core</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>

<pluginManagement>
Expand Down
13 changes: 4 additions & 9 deletions flow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,17 @@
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<finalName>aws-flow-java</finalName>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<finalName>aws-flow-java</finalName>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
<Automatic-Module-Name>software.amazon.eventstream</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
Expand Down
3 changes: 3 additions & 0 deletions http-client-spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.http</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
Expand Down
15 changes: 11 additions & 4 deletions http-clients/apache-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
<version>${awsjavasdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand Down Expand Up @@ -91,6 +87,17 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.http.apache</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
11 changes: 11 additions & 0 deletions http-clients/netty-nio-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,17 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.http.nio.netty</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
11 changes: 11 additions & 0 deletions http-clients/url-connection-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,17 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.http.urlconnection</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@
<failsOnError>true</failsOnError>
<logViolationsToConsole>true</logViolationsToConsole>
<failOnViolation>true</failOnViolation>
<excludes>**/module-info.java</excludes>
</configuration>
</plugin>
<plugin>
Expand Down
15 changes: 15 additions & 0 deletions services/acm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,19 @@
communicating with AWS Certificate Manager service.
</description>
<url>https://aws.amazon.com/sdkforjava</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.services.acm</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
15 changes: 15 additions & 0 deletions services/apigateway/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,19 @@
Gateway
</description>
<url>https://aws.amazon.com/sdkforjava</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>software.amazon.awssdk.services.apigateway</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading