Skip to content

Commit 15fa2e0

Browse files
stevehouelstevehouel
committed
fix: Rename Java ArtifactId and GroupId to be compliant with new AWS standard.
1 parent 527e61f commit 15fa2e0

File tree

2 files changed

+12
-121
lines changed

2 files changed

+12
-121
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,4 @@ jobs:
2525
with:
2626
java-version: ${{ matrix.java }}
2727
- name: Build with Maven
28-
run: mvn -B package --file pom.xml -P release-github
29-
- name: Publish to GitHub Packages Apache Maven
30-
run: mvn deploy -P release-github
31-
env:
32-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # GITHUB_TOKEN is the default env for the password
33-
34-
35-
# - name: Set up Apache Maven Central
36-
# uses: actions/setup-java@v1
37-
# with: # running setup-java again overwrites the settings.xml
38-
# java-version: 1.8
39-
# server-id: maven # Value of the distributionManagement/repository/id field of the pom.xml
40-
# server-username: MAVEN_USERNAME # env variable for username in deploy
41-
# server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy
42-
#
43-
# - name: Publish to Apache Maven Central
44-
# run: mvn deploy -P release-maven
45-
# env:
46-
# MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
47-
# MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
28+
run: mvn -B package --file pom.xml -P release

‎pom.xml‎

Lines changed: 11 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>com.amazonaws</groupId>
7+
<groupId>software.aws.lambda</groupId>
88
<artifactId>aws-lambda-powertools-java</artifactId>
99
<version>0.1.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
@@ -42,10 +42,13 @@
4242
</properties>
4343

4444
<distributionManagement>
45+
<snapshotRepository>
46+
<id>ossrh</id>
47+
<url>https://aws.oss.sonatype.org/content/repositories/snapshots</url>
48+
</snapshotRepository>
4549
<repository>
46-
<id>github</id>
47-
<name>GitHub OWNER Apache Maven Packages</name>
48-
<url>https://maven.pkg.github.com/awslabs/aws-lambda-powertools-java</url>
50+
<id>ossrh</id>
51+
<url>https://aws.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
4952
</repository>
5053
</distributionManagement>
5154

@@ -114,14 +117,7 @@
114117
</build>
115118
</profile>
116119
<profile>
117-
<id>release-github</id>
118-
<distributionManagement>
119-
<repository>
120-
<id>github</id>
121-
<name>GitHub OWNER Apache Maven Packages</name>
122-
<url>https://maven.pkg.github.com/awslabs/aws-lambda-powertools-java</url>
123-
</repository>
124-
</distributionManagement>
120+
<id>release</id>
125121
<build>
126122
<plugins>
127123
<plugin>
@@ -181,7 +177,7 @@
181177
<plugin>
182178
<groupId>org.apache.maven.plugins</groupId>
183179
<artifactId>maven-gpg-plugin</artifactId>
184-
<version>1.5</version>
180+
<version>1.6</version>
185181
<executions>
186182
<execution>
187183
<id>sign-artifacts</id>
@@ -195,97 +191,11 @@
195191
<plugin>
196192
<groupId>org.sonatype.plugins</groupId>
197193
<artifactId>nexus-staging-maven-plugin</artifactId>
198-
<version>1.6.3</version>
194+
<version>1.6.8</version>
199195
<extensions>true</extensions>
200196
<configuration>
201197
<serverId>sonatype-nexus-staging</serverId>
202-
<nexusUrl>https://aws.oss.sonatype.org/</nexusUrl>
203-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
204-
</configuration>
205-
</plugin>
206-
</plugins>
207-
</build>
208-
</profile>
209-
<profile>
210-
<id>release-maven</id>
211-
<build>
212-
<plugins>
213-
<plugin>
214-
<groupId>org.apache.maven.plugins</groupId>
215-
<artifactId>maven-surefire-plugin</artifactId>
216-
<version>2.22.1</version>
217-
</plugin>
218-
<plugin>
219-
<groupId>org.jacoco</groupId>
220-
<artifactId>jacoco-maven-plugin</artifactId>
221-
<version>0.8.2</version>
222-
<executions>
223-
<execution>
224-
<goals>
225-
<goal>prepare-agent</goal>
226-
</goals>
227-
</execution>
228-
<!-- attached to Maven test phase -->
229-
<execution>
230-
<id>report</id>
231-
<phase>test</phase>
232-
<goals>
233-
<goal>report</goal>
234-
</goals>
235-
</execution>
236-
</executions>
237-
</plugin>
238-
<plugin>
239-
<groupId>org.apache.maven.plugins</groupId>
240-
<artifactId>maven-source-plugin</artifactId>
241-
<version>2.2.1</version>
242-
<executions>
243-
<execution>
244-
<id>attach-sources</id>
245-
<goals>
246-
<goal>jar-no-fork</goal>
247-
</goals>
248-
</execution>
249-
</executions>
250-
</plugin>
251-
<plugin>
252-
<groupId>org.apache.maven.plugins</groupId>
253-
<artifactId>maven-javadoc-plugin</artifactId>
254-
<version>2.9.1</version>
255-
<configuration>
256-
<additionalparam>-Xdoclint:none</additionalparam>
257-
</configuration>
258-
<executions>
259-
<execution>
260-
<id>attach-javadocs</id>
261-
<goals>
262-
<goal>jar</goal>
263-
</goals>
264-
</execution>
265-
</executions>
266-
</plugin>
267-
<plugin>
268-
<groupId>org.apache.maven.plugins</groupId>
269-
<artifactId>maven-gpg-plugin</artifactId>
270-
<version>1.5</version>
271-
<executions>
272-
<execution>
273-
<id>sign-artifacts</id>
274-
<phase>verify</phase>
275-
<goals>
276-
<goal>sign</goal>
277-
</goals>
278-
</execution>
279-
</executions>
280-
</plugin>
281-
<plugin>
282-
<groupId>org.sonatype.plugins</groupId>
283-
<artifactId>nexus-staging-maven-plugin</artifactId>
284-
<version>1.6.3</version>
285-
<extensions>true</extensions>
286-
<configuration>
287-
<serverId>sonatype-nexus-staging</serverId>
288-
<nexusUrl>https://aws.oss.sonatype.org/</nexusUrl>
198+
<nexusUrl>https://aws.oss.sonatype.org</nexusUrl>
289199
<autoReleaseAfterClose>false</autoReleaseAfterClose>
290200
</configuration>
291201
</plugin>

0 commit comments

Comments
 (0)