summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-10-22 14:46:54 +0200
committerSimon Rettberg2019-10-22 14:46:54 +0200
commit24604b2db4353d00c70644bb4d915e8a294941b1 (patch)
tree8cd315e47f923478bc05336891bc74448d2eab35
parentJson: Fix deserialization of bools in Thrift classes (diff)
downloadmaster-sync-shared-24604b2db4353d00c70644bb4d915e8a294941b1.tar.gz
master-sync-shared-24604b2db4353d00c70644bb4d915e8a294941b1.tar.xz
master-sync-shared-24604b2db4353d00c70644bb4d915e8a294941b1.zip
Add javax.annotation.Generated dependency for Java 9HEADmaster
-rw-r--r--pom.xml6
-rwxr-xr-xthrift-compile.sh1
2 files changed, 7 insertions, 0 deletions
diff --git a/pom.xml b/pom.xml
index 3f867de..32b6675 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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!"