Skip to content
This repository was archived by the owner on Apr 23, 2021. It is now read-only.

Commit b65f422

Browse files
ssung88ssung88
authored
Update maven auto-deploy & security vulnerability (#46)
Update maven auto-deploy security vulnerability
1 parent 70c6e83 commit b65f422

File tree

8 files changed

+119
-22
lines changed

8 files changed

+119
-22
lines changed

Diff for: ‎.travis.yml

+14-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,20 @@ before_cache:
66
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
77
cache:
88
directories:
9-
- $HOME/.gradle/caches/
10-
- $HOME/.gradle/wrapper/
9+
- "$HOME/.gradle/caches/"
10+
- "$HOME/.gradle/wrapper/"
1111
before_install:
12-
- openssl aes-256-cbc -K $encrypted_cef8742a9861_key -iv $encrypted_cef8742a9861_iv -in ./travis-ci/accounts.enc -out ./travis-ci/accounts.json -d
12+
- openssl aes-256-cbc -K $encrypted_849008ab3eb3_key -iv $encrypted_849008ab3eb3_iv
13+
-in ./travis-ci/accounts.enc -out ./travis-ci/accounts.json -d
1314
- chmod a+x ./gradlew
1415
script:
15-
- ./gradlew test
16+
- "./gradlew test"
17+
env:
18+
global:
19+
- secure: QNOKQNPsnGsl4VsR45mkSti2oeh0jm1mfzhuSIPuK255gOQ4avtzVmDoW9k8Ou4smj8SJvAysXU52cAI/udcDYsVl5K64vtg3flj7c2GO3qjrKwf+EDvR//NMiJEyVZiKcZ81MyhcNtTx3xQIVmS3d8UNMVVJJvSb8jDK1Y5OF/jqGWp6s2IkATOhCfHdQOhmqVokBs6YWiaX3jXJ0/eo26xD5OOYvrvEvMPU6oOImmiPRWN1lm7Fh3zGq/4+cPOBcrk4jHOWCe2Gkhv8sfpK98PLOgo8l8i5nkgxhfWG03d6S/wTSUfFeGdXKhGWxGrNZsKW50xDfMQi7YQwkpLP9zI3Yr3vyCAzVNsv5Sp53ycWBMLWuS7hfD2PGSxG4Iu7y9odFBT/PwNVeAgDGnOLO1SQdVcmoFqPBuPwBATbB31Ry6AkXR3OmC1TGfV7LniFHNPKAfRyLFrHLnfERzDoofeJ2cyunNN7M+5oBRE/+VKlfrYJDP89+dgOyZ8MCWrJMPKQpb5kyUp+CtUvzGRJ3Pffg87nhVDQOCKhkBP5bg5yJZsRv5tMdHwCS59B0nlfWw08cKdm7iCdYAXUa712DZtJSMXutrNKdcapHz7WJNJymeuRE1YFYBrt01TSIdGkb3A69XjuLL/nuVKlthv+Da5uzhK2929JDTxaSjSuyg=
20+
- secure: pIIWvqwqgnbqg1yUr/lMlQ81BUIOBV7htbWKenSNvCIX6529rDpLE+WzGanDW/Lf/I+HcpesS1QAZc+o698tadfKLvUIf0HwRqCKowZtifIQWT3PZ/ZSEghhyTImPcaNznoJ7+mIyeJIJ/ILWaXGvnRJUAyi5R7XPAz8vn0dMzA9qzYl5MW82dWvscYnHcVExmlvjRbO/WOc/BguibPGGQ0d8cZHXou7zdH4YLQaaCqcUZGR2D3SDXggxWeMDnBIFCkkKlVvqtsTPl5GhOJaoWni6D0sNjuctC8qklbyyNO6asMEl9QVoB1UbHpygUCnvuVwVoksSizELO6Of0DSyNgZ/cynnRUD6J+lMycL5YOh0xdGV6TH6O0FDwqQ3XeZDCHhDzdst88l0JCqCo3p5GFneST6/aApN12FI4wECGVLGVGQKDZ/GeTl/GW9KS5TRhxX1RuYP5NH5JvDiuFLf9dLlVVhI5rpC0Q8uGgirarQmXsGwGi6hrm51fQC6RJnP+YJbt7ZqcPtDDRykCUFG2VIre7ZyZX977bEajlVt9HNwlyCGnszw1CYShDoChuIbihQtJBHckvoCAuKQzDlFmQNqASRX2e7q8AlAAz+OlFx+bOOUvUCwk6/E6WbwCnY4A02ItKR2rRObe2Gia32Pgk2Ox+csZfYzUsfW0Gphks=
21+
- secure: CUH0+HGYFSW31EbcI2MLQSrer7VZHugKryjROodHKN7RFfSc0rDAE3SngaN3o329ypjdmb2d8DS9A+ZGm7icLWsF//cU8/mZR225AmyRtQCaw9MHRj/z93ghdwmX4vWCXDQCBrcqAzXFL1xThkoAT+E9vgO8hYYs9DkQINbWE9taetYzYp5uDMtLV67D6aYlEuAgd6ru8QzJYIPGbKZuw1wXkqaZ0pjrkHbyBn9csweSf8qoNZ2Uk2/i4mlRKTBNc0b+NDSMtVBt+2Z8kBzX3wO+Ei0etd5jvoWODbCzOi6fcA1veDuRVH1Pvg3hHC3UMIffJKD5UXk4hJPZJ/Qr93GYHffzAS2tLYmv0g+10nIL/nXttibnfyJMObIwma4tjO7nSIQgmiaF7/aDvSybaYaU5Wv4vNhUPB/rTSQ+QnJpGrIKNGKm3ZV1WakEMGdU9sdRKWiKJ+dVvoIUKXQerBzwO5OvBwnaOI3qaQtxYmeI8ZdPKx/srhw9+BhFs2kpRLmGnhVaNwt5lrVZnjWojptgEXl194nFsi93oWxYKrUH4JcumsOH8qFCuVVcagaGBbV9IQ9DfTviSZ0zo7HPE6YTFZ0X3EwQ6zSOFX21uYyw28riRZ/pFNSnREh5AHMjEULUnuCjbzhCrV67aux9To0sNYhdOm5Na3BQhtQKt2Q=
22+
- secure: sYrJu1lqCFhaXlkat15ywFPRfZDxN8yFI0Qkp+8SDW13TvCSH2AGl4x4Wt2wvdz4A1CAsi4w8k7ou2PGJtVmJEzmMIyccxgQXVd/+qwrIdLkIaYK0pQTackr514bSem3IVgGhKkjAQciGxgowNyaHDlKWq97LpnUYbWP/06sNcBk8LA5ywNbs2JLPg8iK6rXxM3mxDn4q5k4ymsOZn6r5R9KHORHmZvRxOgqSD96LTSeRyKbW/O5Oa6Rp/xr81vG0twbDdYnBuUApEF+r+kYUtXdCb9L0v0n/XWuYRoR9lKD+QXEkIeCsye81d679xhQxau0uRR0cR0JQVbj95qf2j1RBirRp+5f0HtNSv3efpnS96Qw9jyN6ssPSh79Wy01vnJxP8oiEs+tCCg4E4K494iJ+jo1L+phccaDMFzvs1q3w9KADjNJ/cWefavRGscnltEpVdGggYakOkFYbbVbcB6JkBhIwFkibw0MJYnnGVzyQuyAY95gjFexSawg1jzJ41p6OCMtxLGcmX6JTUuI+GjUSgWdXdv3H1iM11wYsYhpw5E2Tkl/iufvJ7xI6NHf7Ly0OI1SpGeeXa5qN7BmUebM8HUBF9BMfCnnCeHW2VgNX7w0LB5ZdiUYqKDcTp5mHxLxaa1WtbCfUjalQAxcR+Cwbn/h+GAxOxxwG37vmGs=
23+
after_success:
24+
- "./maven/before_deploy.sh"
25+
- "./maven/deploy.sh"

Diff for: ‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
9494

9595
ext {
9696
swagger_annotations_version = "1.5.8"
97-
jackson_version = "2.7.5"
97+
jackson_version = "2.9.6"
9898
jersey_version = "2.22.2"
9999
junit_version = "4.12"
100100

Diff for: ‎maven/before_deploy.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
3+
openssl aes-256-cbc -K $encrypted_cef8742a9861_key -iv $encrypted_cef8742a9861_iv -in maven/codesigning.asc.enc -out maven/codesigning.asc -d
4+
gpg --fast-import maven/codesigning.asc
5+
fi

Diff for: ‎maven/codesigning.asc.enc

9.97 KB
Binary file not shown.

Diff for: ‎maven/deploy.sh

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
3+
mvn deploy -P sign,build-extras --settings maven/mvnsettings.xml
4+
fi

Diff for: ‎maven/mvnsettings.xml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<settings>
2+
<servers>
3+
<server>
4+
<id>ossrh</id>
5+
<username>${env.OSSRH_JIRA_USERNAME}</username>
6+
<password>${env.OSSRH_JIRA_PASSWORD}</password>
7+
</server>
8+
</servers>
9+
10+
<profiles>
11+
<profile>
12+
<id>ossrh</id>
13+
<activation>
14+
<activeByDefault>true</activeByDefault>
15+
</activation>
16+
<properties>
17+
<gpg.executable>gpg</gpg.executable>
18+
<gpg.keyname>${env.GPG_KEY_NAME}</gpg.keyname>
19+
<gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
20+
</properties>
21+
22+
</profile>
23+
</profiles>
24+
</settings>

Diff for: ‎pom.xml

+71-17
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@
3434
</developer>
3535
</developers>
3636

37+
<distributionManagement>
38+
<snapshotRepository>
39+
<id>ossrh</id>
40+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
41+
</snapshotRepository>
42+
</distributionManagement>
43+
3744
<build>
3845
<plugins>
3946
<plugin>
@@ -52,6 +59,17 @@
5259
<forkMode>pertest</forkMode>
5360
</configuration>
5461
</plugin>
62+
<plugin>
63+
<groupId>org.sonatype.plugins</groupId>
64+
<artifactId>nexus-staging-maven-plugin</artifactId>
65+
<version>1.6.8</version>
66+
<extensions>true</extensions>
67+
<configuration>
68+
<serverId>ossrh</serverId>
69+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
70+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
71+
</configuration>
72+
</plugin>
5573
<plugin>
5674
<artifactId>maven-dependency-plugin</artifactId>
5775
<executions>
@@ -154,24 +172,24 @@
154172

155173
<profiles>
156174
<profile>
157-
<id>sign-artifacts</id>
175+
<id>sign</id>
158176
<build>
159-
<plugins>
160-
<plugin>
161-
<groupId>org.apache.maven.plugins</groupId>
162-
<artifactId>maven-gpg-plugin</artifactId>
163-
<version>1.5</version>
164-
<executions>
165-
<execution>
166-
<id>sign-artifacts</id>
167-
<phase>verify</phase>
168-
<goals>
169-
<goal>sign</goal>
170-
</goals>
171-
</execution>
172-
</executions>
173-
</plugin>
174-
</plugins>
177+
<plugins>
178+
<plugin>
179+
<groupId>org.apache.maven.plugins</groupId>
180+
<artifactId>maven-gpg-plugin</artifactId>
181+
<version>1.6</version>
182+
<executions>
183+
<execution>
184+
<id>sign-artifacts</id>
185+
<phase>verify</phase>
186+
<goals>
187+
<goal>sign</goal>
188+
</goals>
189+
</execution>
190+
</executions>
191+
</plugin>
192+
</plugins>
175193
</build>
176194
</profile>
177195
<profile>
@@ -191,6 +209,42 @@
191209
</plugins>
192210
</build>
193211
</profile>
212+
<profile>
213+
<id>build-extras</id>
214+
<activation>
215+
<activeByDefault>true</activeByDefault>
216+
</activation>
217+
<build>
218+
<plugins>
219+
<plugin>
220+
<groupId>org.apache.maven.plugins</groupId>
221+
<artifactId>maven-source-plugin</artifactId>
222+
<version>2.4</version>
223+
<executions>
224+
<execution>
225+
<id>attach-sources</id>
226+
<goals>
227+
<goal>jar-no-fork</goal>
228+
</goals>
229+
</execution>
230+
</executions>
231+
</plugin>
232+
<plugin>
233+
<groupId>org.apache.maven.plugins</groupId>
234+
<artifactId>maven-javadoc-plugin</artifactId>
235+
<version>2.10.3</version>
236+
<executions>
237+
<execution>
238+
<id>attach-javadocs</id>
239+
<goals>
240+
<goal>jar</goal>
241+
</goals>
242+
</execution>
243+
</executions>
244+
</plugin>
245+
</plugins>
246+
</build>
247+
</profile>
194248
</profiles>
195249

196250
<dependencies>

Diff for: ‎travis-ci/accounts.enc

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)