Issue #29: adapt to Gerrit 2.14

Adapt to new API, switch to Java 8, update version number. Some trailing whitespace removed.
tomaswolf · Jun 5, 2017 · 2b6a5dc · 2b6a5dc
1 parent feb51c2
commit 2b6a5dc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/docu/index.md b/docu/index.md
@@ -5,7 +5,7 @@ with full SSO through Gerrit.
 
 * License: [Apache Public License 2.0](http://www.apache.org/licenses/LICENSE-2.0)
 * [Home page](https://github.com/tomaswolf/gerrit-gitblit-plugin)
-* Installed plugin version: <em id='gerrit-gitblit-current-version'>2.13.171.2-SNAPSHOT</em> &mdash; <a id='gerrit-gitblit-version-check' style='display:none;' href='#'>Check for updates</a>
+* Installed plugin version: <em id='gerrit-gitblit-current-version'>2.14.171.0-SNAPSHOT</em> &mdash; <a id='gerrit-gitblit-version-check' style='display:none;' href='#'>Check for updates</a>
 
 For a list of contributors, see at [GitHub](https://github.com/tomaswolf/gerrit-gitblit-plugin/graphs/contributors).
 
@@ -111,6 +111,6 @@ Report bugs or make feature requests at the [GitHub issue tracker](https://githu
 
 <hr style="color: #C0C0C0; background-color: #C0C0C0; border-color: #C0C0C0; height: 2px;" />
 <div style="float:right;">
-<a href="https://github.com/tomaswolf/gerrit-gitblit-plugin" target="_blank">GitBlit plugin 2.13.171.2-SNAPSHOT</a>
+<a href="https://github.com/tomaswolf/gerrit-gitblit-plugin" target="_blank">GitBlit plugin 2.14.171.0-SNAPSHOT</a>
 </div>
 <script type="text/javascript" src="version_check.js"></script>
diff --git a/pom.xml b/pom.xml
@@ -20,16 +20,16 @@ limitations under the License.
   <artifactId>gitblit-plugin</artifactId>
   <description>GitBlit for Gerrit integrated as a plugin</description>
   <name>Gerrit - GitBlit Plugin</name>
-  <version>2.13.171.2-SNAPSHOT</version><!-- Gerrit API version followed by collapsed GitBlit version, followed by plugin version -->
+  <version>2.14.171.0-SNAPSHOT</version><!-- Gerrit API version followed by collapsed GitBlit version, followed by plugin version -->
   <licenses>
     <license>
       <name>Apache License 2.0</name>
       <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
     </license>
-  </licenses>  
+  </licenses>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>2.13</Gerrit-ApiVersion>
+    <Gerrit-ApiVersion>2.14</Gerrit-ApiVersion>
     <GitBlit-Version>1.7.1</GitBlit-Version>
     <Wicket-Version>1.4.22</Wicket-Version>
     <Gerrit-ReloadMode>restart</Gerrit-ReloadMode>
@@ -125,17 +125,17 @@ limitations under the License.
                   </includes>
                 </resource>
               </resources>
-			</configuration>   
-	      </execution>     	
+			</configuration>
+	      </execution>
         </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.5.1</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <plugin>
@@ -175,8 +175,8 @@ limitations under the License.
               <!-- We can't exclude org.apache.lucene:* because gitblit uses also lucene-memory and lucene-highlighter, which apparently are not in the Gerrit API -->
               <exclude>org.apache.lucene:lucene-core</exclude><!-- In Gerrit API. GitBlit 4.6.0, Gerrit 5.3.0 -->
               <exclude>org.apache.lucene:lucene-analyzers-commons</exclude><!-- In Gerrit API. GitBlit 4.6.0, Gerrit 5.3.0 -->
-              <exclude>org.apache.lucene:lucene-queries</exclude><!-- In Gerrit API. -->             
-              <exclude>org.apache.lucene:lucene-queryparser</exclude><!-- In Gerrit API. GitBlit 4.6.0, Gerrit 5.3.0 -->             
+              <exclude>org.apache.lucene:lucene-queries</exclude><!-- In Gerrit API. -->
+              <exclude>org.apache.lucene:lucene-queryparser</exclude><!-- In Gerrit API. GitBlit 4.6.0, Gerrit 5.3.0 -->
               <exclude>commons-codec:commons-codec</exclude><!-- In Gerrit API. GitBlit 1.7, Gerrit 1.4 -->
               <exclude>org.tukaani:*</exclude><!-- In Gerrit API. GitBlit 1.0, Gerrit 1.4 -->
               <exclude>com.toedter:*</exclude><!-- Used only in GitBlit client, which doesn't run -->
@@ -233,7 +233,7 @@ limitations under the License.
                     <exclude>com/gitblit/models/RepositoryCommit.class</exclude><!-- StackOverflowError; issue #21 -->
                     <exclude>com/gitblit/models/RepositoryCommit$*.class</exclude>
                     <exclude>com/gitblit/wicket/SessionlessForm.class</exclude><!-- Non-transient logger; issue #21 -->
-                    <exclude>com/gitblit/wicket/SessionlessForm$*.class</exclude>    
+                    <exclude>com/gitblit/wicket/SessionlessForm$*.class</exclude>
                     <exclude>com/gitblit/wicket/pages/BasePage.class</exclude><!-- Gerrit footer link -->
                     <exclude>com/gitblit/wicket/pages/BasePage$*.class</exclude>
                     <exclude>com/gitblit/wicket/pages/BlamePage.class</exclude><!-- Non-transient logger; issue #21 -->
@@ -297,7 +297,7 @@ limitations under the License.
                     <exclude>com/gitblit/wicket/panels/ChoiceOption.class</exclude>
                     <exclude>com/gitblit/wicket/panels/ChoiceOption$*.class</exclude>
                     <exclude>com/gitblit/wicket/SafeTextModel.class</exclude>
-                    <exclude>com/gitblit/wicket/SafeTextModel$*.class</exclude>    
+                    <exclude>com/gitblit/wicket/SafeTextModel$*.class</exclude>
                   </excludes>
                 </filter>
                 <filter>
@@ -313,7 +313,7 @@ limitations under the License.
                 </filter>
               </filters>
             </configuration>
-            
+
           </execution>
         </executions>
       </plugin>

diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/GitBlitUrlsConfig.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/GitBlitUrlsConfig.java
@@ -27,7 +27,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableSet;
-import com.google.gerrit.reviewdb.client.AuthType;
+import com.google.gerrit.extensions.client.AuthType;
 import com.google.gerrit.server.ssh.SshAddressesModule;
 
 public class GitBlitUrlsConfig {
@@ -62,7 +62,7 @@ public GitBlitUrlsConfig(Config config, List<SocketAddress> sshListenAddresses,
 	/**
 	 * Gets the login Url to use for GitBlit. If non-null, the plugin will only display a "Log in" link going to this Url instead of GitBlit's normal
 	 * username-password login form. This makes it possible to use the plugin with an external authentication provider as configured for Gerrit.
-	 * 
+	 *
 	 * @return the login Url to use, if any, or {@code null} if GitBlit's normal login form shall be used (for instance, if Gerrit uses LDAP for
 	 *         authentication).
 	 */
@@ -72,7 +72,7 @@ public String getLoginUrl() {
 
 	/**
 	 * Gets Gerrit's canonical web URL.
-	 * 
+	 *
 	 * @return the Url
 	 */
 	public String getCanonicalWebUrl() {