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

Commit acd26ae

Browse files
ArloLArloL
committed
Merge branch 'release/1.0.1'
2 parents 61387f7 + b8103a4 commit acd26ae

File tree

17 files changed

+529
-28
lines changed

17 files changed

+529
-28
lines changed

‎.travis.yml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1+
language: java
2+
jdk: oraclejdk8
3+
14
cache:
25
directories:
3-
- $HOME/.m2
6+
- $HOME/.m2/repository
7+
48
install: mvn install -DskipTests=true -Dinvoker.skip=true
5-
jdk: oraclejdk8
6-
language: java
7-
script: mvn verify
9+
before_script:
10+
- openssl aes-256-cbc -K $encrypted_086d1daf36ef_key -iv $encrypted_086d1daf36ef_iv -in gnupg.tar.enc -out gnupg.tar -d
11+
- tar xvf gnupg.tar
12+
script:
13+
- echo "<settings><servers><server><id>ossrh</id><username>\${env.SONATYPE_USERNAME}</username><password>\${env.SONATYPE_PASSWORD}</password></server></servers></settings>" > ~/.m2/settings.xml
14+
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then mvn deploy; fi'
15+
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mvn deploy -Dgpg.passphrase=$GPG_PASSPHRASE -Dgpg.homedir=.; fi'
16+
17+
env:
18+
global:
19+
- secure: "fFmu5pJ2BX7hCBQpCaIUiylCQpB+YV5CzIe2SAqyYWEPKoHnF5SlfPxGhyP8WH314GEhJNcYTibatSx0e9W3JujEOI3YTW1hp/FzuXOQn+ZcgQaGrNMfUYlWhfSgWpSiP9LY+IvtId+dVZrw9lfFywLcGch4iP8wk3NBcnYqla0oBMpSZyyfb1QqQruyWZ5pmh4HKgfs6JMRzqq/9PSqJlmTU7DRdySFVKhFeUSQHtAjrSCrGgeE4HlyZ5w+/bO8zek3Hy3JHpEP3oCYv5Qswck/9rqwKayf+cqNQcW7w7iY3qfphtnv7MTpAmNluU879UdAFW7iW55ptSleh8Rk/KU7XgGJy4S8Iq2w/mgDuuBv0E2o5/vyMeQ+9k8/1n+DOf402/usclft2eEhKrkQ0zCQbApMO8El1l4ZBXyOU147DoInkSzpPCoqHYjVbL4moJ+JpNFd4K3u2lVFwMC3fsAoOwLheSSvg08+g68H0rN/hSXE3J1LjNOU5FmvcdxkXBxKAQK9ny8VpqNM7g6QRLbld/X2bgqCmtgXBi8C8nW3TvZ86WLK9ZN5gKKInXn2ULqF6TWcTju3AwgJs7VSfRUc50HDUj6nNM/i5e5CFi/KqcV/Snc5GUv5JalVqM0D9UJdNJgMcnboqWlHyaIaKJkM2yUK4IQ4kejUtiIU9Z0="
20+
- secure: "KcvCri19/bNmTu82+mMvKCpgSgPZRopFT31f/3J2J3ArGjG+yaVi1ypHTM2e5EoyoLL/K1Y3nXjpg2sdv9i2UFyFxeV1p6R5W3jUNW2jsbknBmCHQRGjW0X+PLosmm2iQOjfVgb7JG397dLw0yLKVTIxNQxhZgUKwHiziS9fM+QeMjDiUpjA/lIvpYII7skjdiCoWiAwwkYFDJHaMLeAFlngKg7CgW/w60zuZnQe2PIvl3vr1lJSBU00R2R5J9S8RtYqGPmB/ZctAv2Ewyd8/gJyFDk9RXKDzEJEeEAU80VzDBJ1RGcJVbLT+ILyFzGOj9xp5vG7+V2jy1e6QHzhGuJTNACz3W51veBbyGx/PozRL1ea842WBnjiABvRNmVNMkJeMddWXJ9oHIBN2V49wQyT9/TDiNNSHt15oyCXLZ95tSOv3sPyhIEvXQm+3DhdPN3DF8VgiK4uyHW2O1i8ls7jqEc9L+BEPPfhBmZikX84tuUHLw8ijDx+Z6z49rBHKZkkzdHlfXii6jYZCa1KI+7iEMeQlEvE2xsUuj3sYWykTdGGF4816yVBuM82Zb81yY4xRYeRBc0JOPACGlIO9HELDn7forAwOpXocj9YziIAsJ5XEaIOXy9+Apv1MuhPoFfp+OTPmUD0MHVDvU+v5ntmIdDEd5gLsBOV7YpesyA="
21+
- secure: "FcET73GHOCEeM5nqZpkL857F6lw8hlkNEILOgqjXPNXGjtRbEIYVZ48oOcn21RPNpOmeR8uf+PTaKGAVkXslOudh/LoKeF2Uu7OdYjKY/HHKMHj/MhnhsHzpYAkqz4PzjqUkITnNn3wlzB+fcDiJ40paZiRYToR0k7/rqY3kz9cO+fnCxccyijX2bAPgeJdAUIZNV64V7OOnIHQ8VSAPi3vy+aDfUk4u88/EHZk+MxNCqnwr7ddDwQPiY1bZ7kW1Ji5L5QHM164KnuRLFEo6uDM//Li8V+5OOdeWNKgJBG5szzdkvE6Y1lsrPaJpDy1FEhFEkR9aTdPGCVY75dV1nUnUitWFeoq53ysq+qaMdZaqIkTnSvrwz6Fjv9Nzz+E7XXDN/FLGBYl5fiOseo2T82i7TrF07ErSNkNRoC5rUP0WPoNTmNqsW2uW/yYJo5xa0qsUh2EbspMx1lH6/tMhlpmwHp6YqFdDoUHzqWR9Z7nLTjaAa0elPRxtAUROlvV2A6KdhZPv8GcQmOe5ygxgb4Gu2+hAdbDuER4qfH15L7/wLLgJmfFGYkGdxUAq3ZjDTDeNKJnXX0xB/wlIRq0U7W5hiNM6ocTzin1gpR7Kzy7oIns+VHhePoWmg9KxYc1UCTiy/acyAmS53os7Ou9PtAqmICq5XKjNES8sd3Llsnw="

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "automatic"
3+
}

‎Gemfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source "https://rubygems.org"
2+
3+
gem "travis"

‎Gemfile.lock‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
addressable (2.3.8)
5+
backports (3.6.6)
6+
coderay (1.1.0)
7+
ethon (0.8.0)
8+
ffi (>= 1.3.0)
9+
faraday (0.9.1)
10+
multipart-post (>= 1.2, < 3)
11+
faraday_middleware (0.10.0)
12+
faraday (>= 0.7.4, < 0.10)
13+
ffi (1.9.10)
14+
gh (0.14.0)
15+
addressable
16+
backports
17+
faraday (~> 0.8)
18+
multi_json (~> 1.0)
19+
net-http-persistent (>= 2.7)
20+
net-http-pipeline
21+
highline (1.7.6)
22+
json (1.8.3)
23+
launchy (2.4.3)
24+
addressable (~> 2.3)
25+
method_source (0.8.2)
26+
multi_json (1.11.2)
27+
multipart-post (2.0.0)
28+
net-http-persistent (2.9.4)
29+
net-http-pipeline (1.0.1)
30+
pry (0.9.12.6)
31+
coderay (~> 1.0)
32+
method_source (~> 0.8)
33+
slop (~> 3.4)
34+
pusher-client (0.6.2)
35+
json
36+
websocket (~> 1.0)
37+
slop (3.6.0)
38+
travis (1.8.0)
39+
addressable (~> 2.3)
40+
backports
41+
faraday (~> 0.9)
42+
faraday_middleware (~> 0.9, >= 0.9.1)
43+
gh (~> 0.13)
44+
highline (~> 1.6)
45+
launchy (~> 2.1)
46+
pry (~> 0.9, < 0.10)
47+
pusher-client (~> 0.4)
48+
typhoeus (~> 0.6, >= 0.6.8)
49+
typhoeus (0.8.0)
50+
ethon (>= 0.8.0)
51+
websocket (1.2.2)
52+
53+
PLATFORMS
54+
ruby
55+
56+
DEPENDENCIES
57+
travis
58+
59+
BUNDLED WITH
60+
1.10.6

‎README.markdown‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,49 @@ remote_file(
8383
sha1 = 'cce0823396aa693798f8882e64213b1772032b09',
8484
)
8585
~~~~
86+
87+
Then you can use something like the following BUCK file to build your project. That way you can use maven and BUCK in parallel. This eases migration and you can continue using maven to manage your dependencies. Just make sure to call `export-dependencies:buck` before running `buck`.
88+
89+
~~~
90+
java_library(
91+
name = "main",
92+
srcs = glob(["src/main/java/**/*.java"]),
93+
resources = glob(["src/main/resources/**"]),
94+
resources_root = "src/main/resources",
95+
exported_deps = [
96+
"//target:COMPILE",
97+
],
98+
deps = [
99+
"//target:OPTIONAL",
100+
],
101+
provided_deps = [
102+
"//target:PROVIDED",
103+
],
104+
)
105+
106+
java_test(
107+
name = "test",
108+
srcs = glob(["src/test/java/**/*Test.java"]),
109+
resources = glob(["src/test/resources/**"]),
110+
resources_root = "src/test/resources",
111+
source_under_test = [":main"],
112+
deps = [
113+
":main",
114+
":test_utils",
115+
"//target:TEST",
116+
"//target:OPTIONAL",
117+
"//target:PROVIDED",
118+
],
119+
)
120+
121+
java_library(
122+
name = "test_utils",
123+
srcs = glob(["src/test/java/**/*.java"], excludes = ["**/*Test.java"]),
124+
deps = [
125+
":main",
126+
"//target:TEST",
127+
"//target:OPTIONAL",
128+
"//target:PROVIDED",
129+
],
130+
)
131+
~~~~

‎gnupg.tar.enc‎

6.52 KB
Binary file not shown.

‎pom.xml‎

Lines changed: 71 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>de.evosec</groupId>
66
<artifactId>export-dependencies-maven-plugin</artifactId>
7-
<version>1.0.0</version>
7+
<version>1.0.1</version>
88

99
<packaging>maven-plugin</packaging>
1010

@@ -34,6 +34,17 @@
3434
<url>[email protected]:evosec/export-dependencies-maven-plugin.git</url>
3535
</scm>
3636

37+
<distributionManagement>
38+
<snapshotRepository>
39+
<id>ossrh</id>
40+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
41+
</snapshotRepository>
42+
<repository>
43+
<id>ossrh</id>
44+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
45+
</repository>
46+
</distributionManagement>
47+
3748
<properties>
3849

3950
<maven.compiler.source>1.8</maven.compiler.source>
@@ -42,32 +53,47 @@
4253
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4354
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4455

56+
<gpg.skip>true</gpg.skip>
57+
4558
</properties>
4659

60+
<profiles>
61+
<profile>
62+
<activation>
63+
<property>
64+
<name>gpg.passphrase</name>
65+
</property>
66+
</activation>
67+
<properties>
68+
<gpg.skip>false</gpg.skip>
69+
</properties>
70+
</profile>
71+
</profiles>
72+
4773
<dependencies>
4874

4975
<dependency>
5076
<groupId>org.apache.maven</groupId>
5177
<artifactId>maven-plugin-api</artifactId>
52-
<version>3.3.3</version>
78+
<version>3.5.0</version>
5379
</dependency>
5480

5581
<dependency>
5682
<groupId>org.apache.maven</groupId>
5783
<artifactId>maven-core</artifactId>
58-
<version>3.3.3</version>
84+
<version>3.5.0</version>
5985
</dependency>
6086

6187
<dependency>
6288
<groupId>org.apache.maven.shared</groupId>
6389
<artifactId>maven-dependency-tree</artifactId>
64-
<version>2.2</version>
90+
<version>3.0.1</version>
6591
</dependency>
6692

6793
<dependency>
6894
<groupId>org.apache.maven.plugin-tools</groupId>
6995
<artifactId>maven-plugin-annotations</artifactId>
70-
<version>3.4</version>
96+
<version>3.5</version>
7197
<scope>provided</scope>
7298
</dependency>
7399

@@ -80,7 +106,7 @@
80106
<plugin>
81107
<groupId>org.apache.maven.plugins</groupId>
82108
<artifactId>maven-plugin-plugin</artifactId>
83-
<version>3.4</version>
109+
<version>3.5</version>
84110
<executions>
85111
<execution>
86112
<id>mojo-descriptor</id>
@@ -100,7 +126,7 @@
100126
<plugin>
101127
<groupId>org.apache.maven.plugins</groupId>
102128
<artifactId>maven-invoker-plugin</artifactId>
103-
<version>2.0.0</version>
129+
<version>3.0.0</version>
104130
<configuration>
105131
<debug>true</debug>
106132
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -119,7 +145,7 @@
119145
<plugin>
120146
<inherited>true</inherited>
121147
<artifactId>maven-source-plugin</artifactId>
122-
<version>2.4</version>
148+
<version>3.0.1</version>
123149
<executions>
124150
<execution>
125151
<id>attach-sources</id>
@@ -133,7 +159,7 @@
133159
<plugin>
134160
<inherited>true</inherited>
135161
<artifactId>maven-javadoc-plugin</artifactId>
136-
<version>2.10.3</version>
162+
<version>2.10.4</version>
137163
<executions>
138164
<execution>
139165
<id>attach-javadocs</id>
@@ -153,6 +179,42 @@
153179
</configuration>
154180
</plugin>
155181

182+
<plugin>
183+
<groupId>org.apache.maven.plugins</groupId>
184+
<artifactId>maven-gpg-plugin</artifactId>
185+
<version>1.6</version>
186+
<executions>
187+
<execution>
188+
<id>sign-artifacts</id>
189+
<phase>verify</phase>
190+
<goals>
191+
<goal>sign</goal>
192+
</goals>
193+
</execution>
194+
</executions>
195+
</plugin>
196+
197+
<plugin>
198+
<groupId>org.sonatype.plugins</groupId>
199+
<artifactId>nexus-staging-maven-plugin</artifactId>
200+
<version>1.6.8</version>
201+
<extensions>true</extensions>
202+
<configuration>
203+
<serverId>ossrh</serverId>
204+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
205+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
206+
</configuration>
207+
</plugin>
208+
209+
<plugin>
210+
<groupId>external.atlassian.jgitflow</groupId>
211+
<artifactId>jgitflow-maven-plugin</artifactId>
212+
<version>1.0-m5.1</version>
213+
<configuration>
214+
<noDeploy>true</noDeploy>
215+
</configuration>
216+
</plugin>
217+
156218
</plugins>
157219

158220
</build>

‎src/it/buck-dependency-with-bad-sha/BUCK‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
java_library(
2+
name = 'COMPILE',
3+
visibility = ['PUBLIC'],
4+
exported_deps = [
5+
':javax.annotation-jsr250-api-jar'
6+
],
7+
)
8+
9+
java_library(
10+
name = 'OPTIONAL',
11+
visibility = ['PUBLIC'],
12+
exported_deps = [
13+
14+
],
15+
)
16+
17+
java_library(
18+
name = 'PROVIDED',
19+
visibility = ['PUBLIC'],
20+
exported_deps = [
21+
22+
],
23+
)
24+
25+
java_library(
26+
name = 'RUNTIME',
27+
visibility = ['PUBLIC'],
28+
exported_deps = [
29+
30+
],
31+
)
32+
33+
java_library(
34+
name = 'TEST',
35+
visibility = ['PUBLIC'],
36+
exported_deps = [
37+
38+
],
39+
)
40+
41+
prebuilt_jar(
42+
name = 'javax.annotation-jsr250-api-jar',
43+
binary_jar = ':remote-javax.annotation-jsr250-api-jar',
44+
)
45+
46+
remote_file(
47+
name = 'remote-javax.annotation-jsr250-api-jar',
48+
out = 'javax.annotation-jsr250-api-jar-1.0.jar',
49+
url = 'mvn:javax.annotation:jsr250-api:jar:1.0',
50+
sha1 = '5025422767732a1ab45d93abfea846513d742dcf',
51+
)
52+

‎src/it/buck-dependency-with-bad-sha/invoker.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
invoker.goals=de.evosec:export-dependencies-maven-plugin:buck

‎src/it/buck-dependency-with-bad-sha/pom.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<project
2+
xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>de.evosec</groupId>
8+
<artifactId>buck-dependency-with-bad-sha</artifactId>
9+
<version>1.0.0-SNAPSHOT</version>
10+
<packaging>jar</packaging>
11+
12+
<dependencies>
13+
<dependency>
14+
<groupId>javax.annotation</groupId>
15+
<artifactId>jsr250-api</artifactId>
16+
<version>1.0</version>
17+
</dependency>
18+
</dependencies>
19+
20+
<build>
21+
<plugins>
22+
<plugin>
23+
<groupId>@project.groupId@</groupId>
24+
<artifactId>@project.artifactId@</artifactId>
25+
<version>@project.version@</version>
26+
</plugin>
27+
</plugins>
28+
</build>
29+
30+
</project>

0 commit comments

Comments
 (0)