Skip to content

Commit 99602e4

Browse files
Justintime50Justintime50
committed
chore: put back the things
1 parent 64b1ffd commit 99602e4

File tree

5 files changed

+77
-76
lines changed

5 files changed

+77
-76
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/setup-java@v4
1818
with:
1919
distribution: "zulu"
20-
java-version: "21" # Always use the latest JDK for building
20+
java-version: "21" # Always use the latest stable JDK for building
2121
cache: "maven"
2222
- name: Install dependencies
2323
run: make install
@@ -30,42 +30,42 @@ jobs:
3030
java-version: ${{ matrix.javaversion }}
3131
- name: Run test with Java ${{ matrix.javaversion }}
3232
run: EASYPOST_TEST_API_KEY=123 EASYPOST_PROD_API_KEY=123 make test-ci
33-
# coverage:
34-
# runs-on: ubuntu-latest
35-
# steps:
36-
# - uses: actions/checkout@v4
37-
# - uses: actions/setup-java@v4
38-
# with:
39-
# distribution: "zulu"
40-
# java-version: "23" # Always use the latest JDK for building
41-
# cache: "maven"
42-
# - name: Install dependencies
43-
# run: make install
44-
# - name: Test coverage
45-
# run: EASYPOST_TEST_API_KEY=123 EASYPOST_PROD_API_KEY=123 make coverage
46-
# - name: Load Rust cache
47-
# if: github.ref == 'refs/heads/master'
48-
# uses: Swatinem/rust-cache@v2
49-
# - name: Install grcov
50-
# if: github.ref == 'refs/heads/master'
51-
# run: cargo install grcov --version 0.8.13
52-
# - name: Convert coverage report
53-
# if: github.ref == 'refs/heads/master'
54-
# run: grcov target/site/jacoco/jacoco.xml --source-dir ./ --ignore "target/*" > coverage.lcov
55-
# - name: Coveralls
56-
# if: github.ref == 'refs/heads/master'
57-
# uses: coverallsapp/github-action@master
58-
# with:
59-
# github-token: ${{ secrets.GITHUB_TOKEN }}
60-
# path-to-lcov: "./coverage.lcov"
33+
coverage:
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/checkout@v4
37+
- uses: actions/setup-java@v4
38+
with:
39+
distribution: "zulu"
40+
java-version: "21" # Always use the latest stable JDK for building
41+
cache: "maven"
42+
- name: Install dependencies
43+
run: make install
44+
- name: Test coverage
45+
run: EASYPOST_TEST_API_KEY=123 EASYPOST_PROD_API_KEY=123 make coverage
46+
- name: Load Rust cache
47+
if: github.ref == 'refs/heads/master'
48+
uses: Swatinem/rust-cache@v2
49+
- name: Install grcov
50+
if: github.ref == 'refs/heads/master'
51+
run: cargo install grcov --version 0.8.13
52+
- name: Convert coverage report
53+
if: github.ref == 'refs/heads/master'
54+
run: grcov target/site/jacoco/jacoco.xml --source-dir ./ --ignore "target/*" > coverage.lcov
55+
- name: Coveralls
56+
if: github.ref == 'refs/heads/master'
57+
uses: coverallsapp/github-action@master
58+
with:
59+
github-token: ${{ secrets.GITHUB_TOKEN }}
60+
path-to-lcov: "./coverage.lcov"
6161
lint:
6262
runs-on: ubuntu-latest
6363
steps:
6464
- uses: actions/checkout@v4
6565
- uses: actions/setup-java@v4
6666
with:
6767
distribution: "zulu"
68-
java-version: "21" # Always use the latest JDK for building
68+
java-version: "21" # Always use the latest stable JDK for building
6969
cache: "maven"
7070
- name: Install checkstyle and style guide
7171
run: make install-checkstyle
@@ -84,7 +84,7 @@ jobs:
8484
- uses: actions/setup-java@v4
8585
with:
8686
distribution: "zulu"
87-
java-version: "21" # Always use the latest JDK for building
87+
java-version: "21" # Always use the latest stable JDK for building
8888
cache: "maven"
8989
- name: Install Dependencies
9090
run: make install

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/setup-java@v4
3737
with:
3838
distribution: "zulu"
39-
java-version: "23" # Always use the latest JDK
39+
java-version: "21" # Always use the latest stable JDK for building
4040
server-id: "ossrh"
4141
# define environmental variable names
4242
server-username: MAVEN_USERNAME

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
## Next Release
4+
5+
- Bumps dependencies
6+
37
## v7.4.4 (2025-01-03)
48

59
- Fixes how params are passed to the API when buying a pickup and providing a pickup rate (closes #340)

‎Makefile‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ help:
44

55
## build - Builds the project for development
66
build:
7-
mvn install -DskipTests=true -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djavadoc.skip=true -Djacoco.skip=true -X -e
7+
mvn install -DskipTests=true -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djavadoc.skip=true -Djacoco.skip=true
88

99
## clean - Cleans the project
1010
clean:
1111
mvn clean
1212

1313
## coverage - Test (and build) the project to generate a coverage report
1414
coverage:
15-
mvn verify -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djavadoc.skip=true jacoco:report -X -e
15+
mvn verify -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djavadoc.skip=true jacoco:report
1616

1717
## checkstyle - Check if project follows CheckStyle rules (must run install-checkstyle first)
1818
checkstyle:
1919
java -jar checkstyle.jar src -c examples/style_guides/java/easypost_java_style.xml -d
2020

2121
## docs - Generates library documentation
2222
docs:
23-
mvn install -DskipTests=true -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djacoco.skip=true -X -e
23+
mvn install -DskipTests=true -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djacoco.skip=true
2424
cp -R target/apidocs/ ./docs/
2525

2626
## install-checkstyle - Install the Checkstyle tool (Unix only)
@@ -39,9 +39,8 @@ init-examples-submodule:
3939
## install - Install requirements
4040
install: | install-checkstyle
4141

42-
# TODO: Add back in the scan target to lint
4342
## lint - Lints the project
44-
lint: checkstyle
43+
lint: checkstyle scan
4544

4645
## publish - Publish a release of the project (will build the project via the `mvn deploy` command)
4746
# @parameters:
@@ -63,11 +62,11 @@ release:
6362

6463
## scan - Scan the project for serious security issues
6564
scan:
66-
mvn verify -DskipTests=true -Dgpg.skip=true -Dcheckstyle.skip=true -Djavadoc.skip=true -Djacoco.skip=true -Ddependency-check.failBuildOnCVSS=0 -Ddependency-check.junitFailOnCVSS=0 -X -e
65+
mvn verify -DskipTests=true -Dgpg.skip=true -Dcheckstyle.skip=true -Djavadoc.skip=true -Djacoco.skip=true -Ddependency-check.failBuildOnCVSS=0 -Ddependency-check.junitFailOnCVSS=0
6766

6867
## test - Test the project
6968
test:
70-
mvn test -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djavadoc.skip=true -Djacoco.skip=true -X -e
69+
mvn test -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djavadoc.skip=true -Djacoco.skip=true
7170

7271
## test-ci - Test the project on CI (does not rebuild the project)
7372
test-ci:

‎pom.xml‎

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@
127127
</properties>
128128
</configuration>
129129
</plugin>
130-
<!-- <plugin>
130+
<plugin>
131131
<groupId>org.jacoco</groupId>
132132
<artifactId>jacoco-maven-plugin</artifactId>
133133
<version>0.8.12</version>
134134
<configuration>
135135
<excludes>
136-
<!- Exclude all the getters in model for code coverage ->
136+
<!-- Exclude all the getters in model for code coverage -->
137137
<exclude>**/model/**</exclude>
138138
</excludes>
139139
</configuration>
@@ -171,21 +171,21 @@
171171
</configuration>
172172
</execution>
173173
</executions>
174-
</plugin> -->
175-
<!-- <plugin>
174+
</plugin>
175+
<plugin>
176176
<groupId>org.apache.maven.plugins</groupId>
177177
<artifactId>maven-source-plugin</artifactId>
178178
<version>3.3.1</version>
179179
<executions>
180180
<execution>
181181
<id>attach-sources</id>
182182
<goals>
183-
<goal>jar</goal>
183+
<goal>jar-no-fork</goal>
184184
</goals>
185185
</execution>
186186
</executions>
187-
</plugin> -->
188-
<!-- <plugin>
187+
</plugin>
188+
<plugin>
189189
<groupId>org.apache.maven.plugins</groupId>
190190
<artifactId>maven-javadoc-plugin</artifactId>
191191
<configuration>
@@ -202,13 +202,13 @@
202202
</goals>
203203
</execution>
204204
</executions>
205-
</plugin> -->
206-
<!-- <plugin>
205+
</plugin>
206+
<plugin>
207207
<groupId>org.apache.maven.plugins</groupId>
208208
<artifactId>maven-gpg-plugin</artifactId>
209209
<version>3.2.7</version>
210210
<configuration>
211-
<!- Needed to read passphrase from settings.xml ->
211+
<!-- Needed to read passphrase from settings.xml -->
212212
<gpgArguments>
213213
<arg>-pinentry-mode</arg>
214214
<arg>loopback</arg>
@@ -223,7 +223,7 @@
223223
</goals>
224224
</execution>
225225
</executions>
226-
</plugin> -->
226+
</plugin>
227227
<plugin>
228228
<groupId>org.apache.maven.plugins</groupId>
229229
<artifactId>maven-compiler-plugin</artifactId>
@@ -232,8 +232,6 @@
232232
<release>8</release>
233233
<encoding>UTF-8</encoding>
234234
<fork>true</fork>
235-
<meminitial>256m</meminitial>
236-
<maxmem>1024m</maxmem>
237235
<compilerArgs>
238236
<arg>-XDcompilePolicy=simple</arg>
239237
<arg>-Xplugin:ErrorProne</arg>
@@ -264,7 +262,7 @@
264262
</annotationProcessorPaths>
265263
</configuration>
266264
</plugin>
267-
<!-- <plugin>
265+
<plugin>
268266
<groupId>org.sonatype.plugins</groupId>
269267
<artifactId>nexus-staging-maven-plugin</artifactId>
270268
<version>1.7.0</version>
@@ -274,7 +272,7 @@
274272
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
275273
<autoReleaseAfterClose>true</autoReleaseAfterClose>
276274
</configuration>
277-
</plugin> -->
275+
</plugin>
278276
<plugin>
279277
<groupId>org.codehaus.mojo</groupId>
280278
<artifactId>templating-maven-plugin</artifactId>
@@ -288,7 +286,7 @@
288286
</execution>
289287
</executions>
290288
</plugin>
291-
<!-- <plugin>
289+
<plugin>
292290
<groupId>org.apache.maven.plugins</groupId>
293291
<artifactId>maven-checkstyle-plugin</artifactId>
294292
<version>3.6.0</version>
@@ -302,7 +300,7 @@
302300
<dependency>
303301
<groupId>com.puppycrawl.tools</groupId>
304302
<artifactId>checkstyle</artifactId>
305-
<!- Cannot update to v10 due to requiring Java 11+ ->
303+
<!-- Cannot update to v10 due to requiring Java 11+ -->
306304
<version>9.3</version>
307305
</dependency>
308306
</dependencies>
@@ -316,8 +314,8 @@
316314
</goals>
317315
</execution>
318316
</executions>
319-
</plugin> -->
320-
<!-- <plugin>
317+
</plugin>
318+
<plugin>
321319
<groupId>org.apache.maven.plugins</groupId>
322320
<artifactId>maven-enforcer-plugin</artifactId>
323321
<version>3.5.0</version>
@@ -336,26 +334,26 @@
336334
</configuration>
337335
</execution>
338336
</executions>
339-
</plugin> -->
340-
<!-- <plugin>
337+
</plugin>
338+
<plugin>
341339
<groupId>org.owasp</groupId>
342340
<artifactId>dependency-check-maven</artifactId>
343-
<!- Can't upgrade to newer versions as it requires Java 11 -->
344-
<!-- TODO: API key now recommended to avoid rate limiting: https://github.com/dependency-check/DependencyCheck?tab=readme-ov-file#nvd-api-key-highly-recommended ->
345-
<version>10.0.2</version>
346-
<configuration>
347-
<suppressionFile>dependency-check-suppressions.xml</suppressionFile>
348-
<failBuildOnCVSS>7</failBuildOnCVSS>
349-
<junitFailOnCVSS>7</junitFailOnCVSS>
350-
</configuration>
351-
<executions>
352-
<execution>
353-
<goals>
354-
<goal>check</goal>
355-
</goals>
356-
</execution>
357-
</executions>
358-
</plugin> -->
341+
<!-- Can't upgrade to `v11` or newer versions as it requires Java 11 -->
342+
<!-- TODO: API key now recommended to avoid rate limiting: https://github.com/dependency-check/DependencyCheck?tab=readme-ov-file#nvd-api-key-highly-recommended -->
343+
<version>9.2.0</version>
344+
<configuration>
345+
<suppressionFile>dependency-check-suppressions.xml</suppressionFile>
346+
<failBuildOnCVSS>7</failBuildOnCVSS>
347+
<junitFailOnCVSS>7</junitFailOnCVSS>
348+
</configuration>
349+
<executions>
350+
<execution>
351+
<goals>
352+
<goal>check</goal>
353+
</goals>
354+
</execution>
355+
</executions>
356+
</plugin>
359357
</plugins>
360358
</build>
361359
</project>

0 commit comments

Comments
 (0)