Skip to content

Commit 1e5d0b6

Browse files
authored
Add target to publish dev snapshots to a maven repository (aws#386)
Add target to publish dev snapshots to a maven repository
1 parent 3527af5 commit 1e5d0b6

File tree

6 files changed

+60
-6
lines changed

6 files changed

+60
-6
lines changed

.github/workflows/aws-lambda-java-runtime-interface-client.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ jobs:
2323
- name: Set up JDK 1.8
2424
uses: actions/setup-java@v3
2525
with:
26-
java-version: 1.8
26+
java-version: 8
27+
distribution: corretto
2728

2829
- name: Runtime Interface Client smoke tests - Run 'pr' target
2930
working-directory: ./aws-lambda-java-runtime-interface-client
@@ -37,7 +38,8 @@ jobs:
3738
- name: Set up JDK 1.8
3839
uses: actions/setup-java@v3
3940
with:
40-
java-version: 1.8
41+
java-version: 8
42+
distribution: corretto
4143

4244
- name: Set up QEMU
4345
uses: docker/setup-qemu-action@v2
@@ -58,5 +60,5 @@ jobs:
5860
uses: actions/upload-artifact@v3
5961
with:
6062
name: the-jar
61-
path: ./aws-lambda-java-runtime-interface-client/target/aws-lambda-java-runtime-interface-client-2.1.0.jar
63+
path: ./aws-lambda-java-runtime-interface-client/target/aws-lambda-java-runtime-interface-client-*.jar
6264

Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
compile-flags.txt
2+
ric-dev-environment/dev-maven-repo.mk

aws-lambda-java-runtime-interface-client/Makefile

+8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ ARCHITECTURE := $(shell arch)
44
ARCHITECTURE_ALIAS := $($(shell echo "$(ARCHITECTURE)_ALIAS"))
55
ARCHITECTURE_ALIAS := $(or $(ARCHITECTURE_ALIAS),amd64) # on any other archs defaulting to amd64
66

7+
# This optional module exports MAVEN_REPO_URL, MAVEN_REPO_USERNAME and MAVEN_REPO_PASSWORD environment variables
8+
# making it possible to publish resulting artifacts to a development maven repository
9+
-include ric-dev-environment/dev-maven-repo.mk
10+
711
.PHONY: target
812
target:
913
$(info ${HELP_MESSAGE})
@@ -42,6 +46,10 @@ pr: test test-smoke
4246
build:
4347
mvn clean install
4448

49+
.PHONY: publish
50+
publish:
51+
mvn deploy --settings ric-dev-environment/settings.xml
52+
4553
define HELP_MESSAGE
4654

4755
Usage: $ make [TARGETS]

aws-lambda-java-runtime-interface-client/pom.xml

+14-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3737
<maven.compiler.source>1.8</maven.compiler.source>
3838
<maven.compiler.target>1.8</maven.compiler.target>
39-
<jacoco.maven.plugin.version>0.8.7</jacoco.maven.plugin.version>
39+
<jacoco.maven.plugin.version>0.8.8</jacoco.maven.plugin.version>
4040
<!--
4141
The test/integration/codebuild/buildspec.*.yml files will set -DmultiArch=false
4242
as a workaround for executing within Github Actions. At time of writing (2022-04-08) the
@@ -115,7 +115,7 @@
115115
<plugin>
116116
<groupId>org.apache.maven.plugins</groupId>
117117
<artifactId>maven-compiler-plugin</artifactId>
118-
<version>3.8.1</version>
118+
<version>3.10.1</version>
119119
<configuration>
120120
<encoding>UTF-8</encoding>
121121
<source>${maven.compiler.source}</source>
@@ -125,6 +125,7 @@
125125
<plugin>
126126
<groupId>org.apache.maven.plugins</groupId>
127127
<artifactId>maven-jar-plugin</artifactId>
128+
<version>3.3.0</version>
128129
<configuration>
129130
<archive>
130131
<manifest>
@@ -183,6 +184,17 @@
183184
<profiles>
184185
<profile>
185186
<id>dev</id>
187+
<activation>
188+
<file>
189+
<exists>ric-dev-environment/dev-maven-repo.mk</exists>
190+
</file>
191+
</activation>
192+
<distributionManagement>
193+
<snapshotRepository>
194+
<id>dev-snapshot-repo</id>
195+
<url>${env.MAVEN_REPO_URL}</url>
196+
</snapshotRepository>
197+
</distributionManagement>
186198
<build>
187199
<plugins>
188200
<plugin>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<settings>
2+
<profiles>
3+
<profile>
4+
<id>dev</id>
5+
<activation>
6+
<file>
7+
<exists>dev-maven-repo.mk</exists>
8+
</file>
9+
</activation>
10+
<repositories>
11+
<repository>
12+
<id>dev-snapshot-repo</id>
13+
<url>${env.MAVEN_REPO_URL}</url>
14+
</repository>
15+
</repositories>
16+
</profile>
17+
</profiles>
18+
<servers>
19+
<server>
20+
<id>dev-snapshot-repo</id>
21+
<username>${env.MAVEN_REPO_USERNAME}</username>
22+
<password>${env.MAVEN_REPO_PASSWORD}</password>
23+
</server>
24+
</servers>
25+
</settings>

aws-lambda-java-runtime-interface-client/test/integration/codebuild-local/Dockerfile.agent

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,18 @@ FROM public.ecr.aws/amazoncorretto/amazoncorretto:8
33
ARG ARCHITECTURE="amd64"
44

55
ENV DOCKER_CLI_PLUGIN_DIR="/root/.docker/cli-plugins"
6+
ENV PATH="$PATH:/tmp/apache-maven-3.8.6/bin"
67

78
RUN amazon-linux-extras enable docker && \
89
yum clean metadata && \
9-
yum install -y docker tar maven unzip file wget
10+
yum install -y docker tar gzip unzip file wget
11+
1012
RUN mkdir -p "${DOCKER_CLI_PLUGIN_DIR}"
1113
RUN wget \
1214
"$(curl https://api.github.com/repos/docker/buildx/releases/latest | grep browser_download_url | grep "linux-${ARCHITECTURE}" | cut -d '"' -f 4)" \
1315
-O "${DOCKER_CLI_PLUGIN_DIR}"/docker-buildx
1416
RUN chmod +x "${DOCKER_CLI_PLUGIN_DIR}"/docker-buildx
17+
18+
WORKDIR /tmp
19+
RUN curl -O https://dlcdn.apache.org/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.tar.gz && \
20+
tar xf apache-maven-3.8.6-bin.tar.gz

0 commit comments

Comments
 (0)