diff options
author | Jonathan Bauer | 2019-10-22 14:52:53 +0200 |
---|---|---|
committer | Jonathan Bauer | 2019-10-22 14:52:53 +0200 |
commit | e4e65a84024f1accd1e1bf1dfb50d3b4b6fa829a (patch) | |
tree | 18bbd25281b4a92396d4a47665fd4f2b1b40b7cd | |
parent | Merge branch 'master' into qemu (diff) | |
parent | Add javax.annotation.Generated dependency for Java 9 (diff) | |
download | master-sync-shared-e4e65a84024f1accd1e1bf1dfb50d3b4b6fa829a.tar.gz master-sync-shared-e4e65a84024f1accd1e1bf1dfb50d3b4b6fa829a.tar.xz master-sync-shared-e4e65a84024f1accd1e1bf1dfb50d3b4b6fa829a.zip |
Merge branch 'master' into qemu
-rw-r--r-- | pom.xml | 6 | ||||
-rwxr-xr-x | thrift-compile.sh | 1 |
2 files changed, 7 insertions, 0 deletions
@@ -87,6 +87,12 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.12</version> diff --git a/thrift-compile.sh b/thrift-compile.sh index c47cc86..6c75de1 100755 --- a/thrift-compile.sh +++ b/thrift-compile.sh @@ -30,6 +30,7 @@ if thrift --gen java src/main/thrift/bwlp.thrift; then bn=$(basename "$file") [ -e "gen-java/org/openslx/bwlp/thrift/iface/$bn" ] || git rm "$file" done + [ -e gen-java ] && rm -r gen-java fi echo "All done!" |