Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.

Commit e9503e2

Browse files
Update Maven, site skin plugin and dependencies
* Update Maven to 3.9.0 * Update Site Skin Plugin * Bump aws-lambda-java-events from 3.11.1 to 3.11.2 (#66) Bumps [aws-lambda-java-events](https://github.com/aws/aws-lambda-java-libs) from 3.11.1 to 3.11.2. - [Commits](https://github.com/aws/aws-lambda-java-libs/commits) --- updated-dependencies: - dependency-name: com.amazonaws:aws-lambda-java-events dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump maven-source-plugin from 3.2.1 to 3.3.0 (#65) Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.2.1 to 3.3.0. - [Commits](apache/maven-source-plugin@maven-source-plugin-3.2.1...maven-source-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 0b5941d commit e9503e2

File tree

7 files changed

+21
-17
lines changed

7 files changed

+21
-17
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ updates:
1111
schedule:
1212
interval: "weekly"
1313
day: "sunday"
14+
target-branch: "develop"
1415
# Maintain dependencies for GitHub Actions
1516
- package-ecosystem: "github-actions"
1617
directory: "/"
1718
schedule:
1819
interval: "monthly"
19-
day: "sunday"
20+
day: "sunday"
21+
target-branch: "develop"

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ main ]
16+
branches: [ "main", "develop" ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ main ]
19+
branches: [ "main", "develop" ]
2020
schedule:
2121
- cron: '16 22 * * 3'
2222

.gitlab-ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,26 @@ stages:
2222
build:
2323
stage: build
2424
script:
25-
- mvn $MAVEN_CLI_OPTS clean compile
25+
- ./mvnw $MAVEN_CLI_OPTS clean compile
2626
except:
2727
- tags
2828

2929
test:
3030
stage: test
3131
script:
32-
- mvn $MAVEN_CLI_OPTS verify
32+
- ./mvnw $MAVEN_CLI_OPTS verify
3333
artifacts:
3434
reports:
3535
junit:
3636
- core/target/surefire-reports/TEST-*.xml
3737
- logger/target/failsafe-reports/TEST-*.xml
3838
- json-logger/target/failsafe-reports/TEST-*.xml
3939

40+
sast:
41+
stage: test
42+
variables:
43+
SAST_EXCLUDED_PATHS: jacoco-resources,prism.js
44+
4045
coverage:
4146
stage: verify
4247
script:
@@ -52,23 +57,18 @@ codacy:
5257
rules:
5358
- if: $CODACY_PROJECT_TOKEN && $CI_COMMIT_TAG == null
5459

55-
sast:
56-
stage: test
57-
variables:
58-
SAST_EXCLUDED_PATHS: jacoco-resources,prism.js
59-
6060
release:
6161
stage: deploy
6262
script:
63-
- mvn $MAVEN_CLI_OPTS -s ci_settings.xml -pl core,logger,json-logger,. -am deploy -ntp -Dchangelist= -Psources,javadocs,sign-and-deploy
63+
- ./mvnw $MAVEN_CLI_OPTS -s ci_settings.xml -pl core,logger,json-logger,. -am deploy -ntp -Dchangelist= -Psources,javadocs,sign-and-deploy
6464
only:
6565
- tags
6666

6767
pages:
6868
stage: deploy
6969
script:
7070
- cp changelog.md src/site/markdown
71-
- mvn $MAVEN_CLI_OPTS -pl . verify site site:stage -Dchangelist= -Pjavadocs,site
71+
- ./mvnw $MAVEN_CLI_OPTS -pl . verify site site:stage -Dchangelist= -Pjavadocs,site
7272
artifacts:
7373
paths:
7474
- public

.mvn/maven.config

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
-Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Djava.awt.headless=true
1+
-Dhttps.protocols=TLSv1.2
2+
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN
3+
-Djava.awt.headless=true

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
1818
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
<plugin>
211211
<artifactId>maven-source-plugin</artifactId>
212212
<groupId>org.apache.maven.plugins</groupId>
213-
<version>3.2.1</version>
213+
<version>3.3.0</version>
214214
</plugin>
215215
<plugin>
216216
<artifactId>maven-javadoc-plugin</artifactId>
@@ -323,7 +323,7 @@
323323
<dependency>
324324
<artifactId>aws-lambda-java-events</artifactId>
325325
<groupId>com.amazonaws</groupId>
326-
<version>3.11.1</version>
326+
<version>3.11.2</version>
327327
</dependency>
328328
<dependency>
329329
<artifactId>slf4j-api</artifactId>

src/site/site.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<skin>
44
<groupId>com.bernardomg.maven.skins</groupId>
55
<artifactId>docs-maven-skin</artifactId>
6-
<version>2.2.6</version>
6+
<version>2.3.2</version>
77
</skin>
88
<custom>
99
<skinConfig>

0 commit comments

Comments
 (0)