Merge branch 'stable-2.15'
* stable-2.15:
Fix dependencies in pom.xml
Remove usless 'TODO' comment from workspace-status.sh
Change-Id: I6c4501861674a65422fc57cfcbcf73d424f277d5
diff --git a/pom.xml b/pom.xml
index 4c7f0e4..fecdcb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>com.googlesource.gerrit.plugins.batch</groupId>
<artifactId>batch</artifactId>
<packaging>jar</packaging>
- <version>2.15</version>
+ <version>2.15.7</version>
<name>batch</name>
<properties>
@@ -59,7 +59,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -76,18 +76,6 @@
<version>${Gerrit-ApiVersion}</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit</artifactId>
- <version>3.4.1.201406201815-r</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
- <version>0.14.0</version>
- </dependency>
</dependencies>
<repositories>
@@ -96,4 +84,4 @@
<url>https://gerrit-api.commondatastorage.googleapis.com/release/</url>
</repository>
</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/tools/workspace-status.sh b/tools/workspace-status.sh
index 6670f2c..71b2eeb 100755
--- a/tools/workspace-status.sh
+++ b/tools/workspace-status.sh
@@ -13,5 +13,4 @@
function rev() {
git describe --always --match "v[0-9].*" --dirty
}
-# TODO
echo STABLE_BUILD_BATCH_LABEL $(rev)
