Skip to content

Commit 6d2fdc6

Browse files
author
Stepheny Perez
authored
Merge pull request podaac#241 from podaac/release/2.2.0
Release/2.2.0
2 parents 99bb577 + 5024267 commit 6d2fdc6

5 files changed

Lines changed: 170 additions & 82 deletions

File tree

‎.github/workflows/build-pipeline.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
- uses: actions/setup-java@v2
2525
with:
2626
distribution: 'adopt'
27-
java-version: '8.0.232'
27+
java-version: '11.0.6'
2828
- uses: gradle/gradle-build-action@v1
2929
with:
30-
gradle-version: 4.0.1
30+
gradle-version: 8.0.1
3131
- name: Install Python 3
3232
uses: actions/setup-python@v2
3333
with:

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
# [2.2.0]
9+
### Added
10+
### Changed
11+
- **PODAAC-5921**
12+
- Support java 11
13+
- SonarQube and Jacoco report
14+
### Deprecated
15+
### Removed
16+
### Fixed
17+
### Security
818

919
# [2.1.0]
1020
### Added

‎README.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,19 @@
22

33
## Installation
44

5-
To build the Lambda code:
5+
To build the Lambda code, Refer to following Confluence page:
6+
https://wiki.jpl.nasa.gov/pages/viewpage.action?spaceKey=PD&title=SonarQube%2C+Jacoco+and+Java+17+upgrade
67

78
```shell
9+
* Build with sonarQube and Jacoco report
10+
mvn clean verify sonar:sonar \
11+
-Dsonar.projectKey=cnm-response-opensource \
12+
-Dsonar.projectName='cnm-response-opensource' \
13+
-Dsonar.host.url=http://localhost:9000 \
14+
-Dsonar.token=sqp_fc2271c4ddba6507fb38ea64d52e6912e2c6e14d
15+
16+
* Make sure java 11 and gradle 8.3 are adopted.
17+
818
mvn clean dependency:copy-dependencies
919
gradle build
1020
```

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apply plugin: 'java'
2-
sourceCompatibility = 1.8
3-
targetCompatibility = 1.8
2+
sourceCompatibility = 1.11
3+
targetCompatibility = 1.11
44

55
dependencies {
66
implementation fileTree(dir: 'target/dependency/', include: '*.jar')
@@ -13,7 +13,7 @@ task buildZip(type: Zip) {
1313
into('lib') {
1414
from configurations.runtimeClasspath
1515
}
16-
archiveName 'cnmResponse.zip'
16+
archiveFileName.set('cnmResponse.zip')
1717
}
1818

1919
build.dependsOn buildZip

‎pom.xml‎

Lines changed: 144 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,152 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>gov.nasa.cumulus</groupId>
6-
<artifactId>cnm-response</artifactId>
7-
<version>2.1.0</version>
8-
<packaging>jar</packaging>
5+
<groupId>gov.nasa.cumulus</groupId>
6+
<artifactId>cnm-response</artifactId>
7+
<version>2.2.0-rc.0</version>
8+
<packaging>jar</packaging>
99

10-
<name>cnm-response</name>
11-
<url>http://maven.apache.org</url>
10+
<name>cnm-response</name>
11+
<url>http://maven.apache.org</url>
1212

13-
<properties>
14-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
</properties>
13+
<properties>
14+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
</properties>
1616

17-
<repositories>
18-
<repository>
19-
<id>clojars.org</id>
20-
<url>https://repo.clojars.org</url>
21-
</repository>
22-
</repositories>
17+
<repositories>
18+
<repository>
19+
<id>clojars.org</id>
20+
<url>https://repo.clojars.org</url>
21+
</repository>
22+
</repositories>
2323

24-
<dependencies>
24+
<dependencies>
2525

26-
<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-core -->
27-
<dependency>
28-
<groupId>com.amazonaws</groupId>
29-
<artifactId>aws-java-sdk-core</artifactId>
30-
<version>1.12.209</version>
31-
</dependency>
32-
<!-- https://mvnrepository.com/artifact/com.amazonaws/amazon-kinesis-client -->
33-
<dependency>
34-
<groupId>com.amazonaws</groupId>
35-
<artifactId>amazon-kinesis-client</artifactId>
36-
<version>1.14.8</version>
37-
</dependency>
38-
<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-sns -->
39-
<dependency>
40-
<groupId>com.amazonaws</groupId>
41-
<artifactId>aws-java-sdk-sns</artifactId>
42-
<version>1.12.209</version>
43-
</dependency>
44-
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
45-
<dependency>
46-
<groupId>com.google.code.gson</groupId>
47-
<artifactId>gson</artifactId>
48-
<version>2.9.0</version>
49-
</dependency>
50-
<dependency>
51-
<groupId>gov.nasa.earthdata</groupId>
52-
<artifactId>cumulus-message-adapter</artifactId>
53-
<version>1.3.9</version>
54-
</dependency>
55-
<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-kinesis -->
56-
<dependency>
57-
<groupId>com.amazonaws</groupId>
58-
<artifactId>aws-java-sdk-kinesis</artifactId>
59-
<version>1.12.209</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>commons-io</groupId>
63-
<artifactId>commons-io</artifactId>
64-
<version>2.11.0</version>
65-
</dependency>
66-
<dependency>
67-
<groupId>com.amazonaws</groupId>
68-
<artifactId>aws-lambda-java-core</artifactId>
69-
<version>1.2.1</version>
70-
</dependency>
71-
<dependency>
72-
<groupId>junit</groupId>
73-
<artifactId>junit</artifactId>
74-
<version>3.8.1</version>
75-
<scope>test</scope>
76-
</dependency>
77-
<dependency>
78-
<groupId>org.mockito</groupId>
79-
<artifactId>mockito-core</artifactId>
80-
<version>3.6.0</version>
81-
<scope>test</scope>
82-
</dependency>
83-
</dependencies>
26+
<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-core -->
27+
<dependency>
28+
<groupId>com.amazonaws</groupId>
29+
<artifactId>aws-java-sdk-core</artifactId>
30+
<version>1.12.565</version>
31+
</dependency>
32+
<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-kinesis-->
33+
<dependency>
34+
<groupId>com.amazonaws</groupId>
35+
<artifactId>aws-java-sdk-kinesis</artifactId>
36+
<version>1.12.565</version>
37+
</dependency>
38+
<!-- https://mvnrepository.com/artifact/com.amazonaws/amazon-kinesis-client -->
39+
<dependency>
40+
<groupId>com.amazonaws</groupId>
41+
<artifactId>amazon-kinesis-client</artifactId>
42+
<version>1.15.0</version>
43+
</dependency>
44+
<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-sns-->
45+
<dependency>
46+
<groupId>com.amazonaws</groupId>
47+
<artifactId>aws-java-sdk-sns</artifactId>
48+
<version>1.12.565</version>
49+
</dependency>
50+
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
51+
<dependency>
52+
<groupId>com.google.code.gson</groupId>
53+
<artifactId>gson</artifactId>
54+
<version>2.10.1</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>gov.nasa.earthdata</groupId>
58+
<artifactId>cumulus-message-adapter</artifactId>
59+
<version>2.0.0</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>commons-io</groupId>
63+
<artifactId>commons-io</artifactId>
64+
<version>2.11.0</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>com.amazonaws</groupId>
68+
<artifactId>aws-lambda-java-core</artifactId>
69+
<version>1.2.1</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>junit</groupId>
73+
<artifactId>junit</artifactId>
74+
<version>3.8.1</version>
75+
<scope>test</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.mockito</groupId>
79+
<artifactId>mockito-core</artifactId>
80+
<version>3.6.0</version>
81+
<scope>test</scope>
82+
</dependency>
83+
</dependencies>
84+
<build>
85+
<plugins>
86+
<plugin>
87+
<groupId>org.apache.maven.plugins</groupId>
88+
<artifactId>maven-compiler-plugin</artifactId>
89+
<version>3.8.0</version>
90+
<configuration>
91+
<source>11</source>
92+
<target>11</target>
93+
</configuration>
94+
</plugin>
95+
<plugin>
96+
<groupId>org.apache.maven.plugins</groupId>
97+
<artifactId>maven-shade-plugin</artifactId>
98+
<version>3.2.1</version>
99+
<executions>
100+
<execution>
101+
<phase>package</phase>
102+
<goals>
103+
<goal>shade</goal>
104+
</goals>
105+
<configuration>
106+
<transformers>
107+
<transformer
108+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
109+
<mainClass>org.wordinator.xml2docx.MakeDocx</mainClass>
110+
<manifestEntries>
111+
<Multi-Release>true</Multi-Release>
112+
</manifestEntries>
113+
</transformer>
114+
<transformer
115+
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
116+
</transformers>
117+
</configuration>
118+
</execution>
119+
</executions>
120+
</plugin>
121+
<plugin>
122+
<groupId>org.jacoco</groupId>
123+
<artifactId>jacoco-maven-plugin</artifactId>
124+
<version>0.8.7</version>
125+
<executions>
126+
<execution>
127+
<id>prepare-agent</id>
128+
<goals>
129+
<goal>prepare-agent</goal>
130+
</goals>
131+
</execution>
132+
<execution>
133+
<id>report</id>
134+
<goals>
135+
<goal>report</goal>
136+
</goals>
137+
<configuration>
138+
<formats>
139+
<format>XML</format>
140+
</formats>
141+
</configuration>
142+
</execution>
143+
</executions>
144+
</plugin>
145+
<plugin>
146+
<groupId>org.sonarsource.scanner.maven</groupId>
147+
<artifactId>sonar-maven-plugin</artifactId>
148+
<version>3.10.0.2594</version>
149+
</plugin>
150+
</plugins>
151+
</build>
84152
</project>

0 commit comments

Comments
 (0)