Skip to content

Commit 2b6a5dc

Browse files
committed
Issue #29: adapt to Gerrit 2.14
Adapt to new API, switch to Java 8, update version number. Some trailing whitespace removed.
1 parent feb51c2 commit 2b6a5dc

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

docu/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ with full SSO through Gerrit.
55

66
* License: [Apache Public License 2.0](http://www.apache.org/licenses/LICENSE-2.0)
77
* [Home page](https://github.com/tomaswolf/gerrit-gitblit-plugin)
8-
* 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>
8+
* 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>
99

1010
For a list of contributors, see at [GitHub](https://github.com/tomaswolf/gerrit-gitblit-plugin/graphs/contributors).
1111

@@ -111,6 +111,6 @@ Report bugs or make feature requests at the [GitHub issue tracker](https://githu
111111

112112
<hr style="color: #C0C0C0; background-color: #C0C0C0; border-color: #C0C0C0; height: 2px;" />
113113
<div style="float:right;">
114-
<a href="https://github.com/tomaswolf/gerrit-gitblit-plugin" target="_blank">GitBlit plugin 2.13.171.2-SNAPSHOT</a>
114+
<a href="https://github.com/tomaswolf/gerrit-gitblit-plugin" target="_blank">GitBlit plugin 2.14.171.0-SNAPSHOT</a>
115115
</div>
116116
<script type="text/javascript" src="version_check.js"></script>

pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ limitations under the License.
2020
<artifactId>gitblit-plugin</artifactId>
2121
<description>GitBlit for Gerrit integrated as a plugin</description>
2222
<name>Gerrit - GitBlit Plugin</name>
23-
<version>2.13.171.2-SNAPSHOT</version><!-- Gerrit API version followed by collapsed GitBlit version, followed by plugin version -->
23+
<version>2.14.171.0-SNAPSHOT</version><!-- Gerrit API version followed by collapsed GitBlit version, followed by plugin version -->
2424
<licenses>
2525
<license>
2626
<name>Apache License 2.0</name>
2727
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
2828
</license>
29-
</licenses>
29+
</licenses>
3030
<properties>
3131
<Gerrit-ApiType>plugin</Gerrit-ApiType>
32-
<Gerrit-ApiVersion>2.13</Gerrit-ApiVersion>
32+
<Gerrit-ApiVersion>2.14</Gerrit-ApiVersion>
3333
<GitBlit-Version>1.7.1</GitBlit-Version>
3434
<Wicket-Version>1.4.22</Wicket-Version>
3535
<Gerrit-ReloadMode>restart</Gerrit-ReloadMode>
@@ -125,17 +125,17 @@ limitations under the License.
125125
</includes>
126126
</resource>
127127
</resources>
128-
</configuration>
129-
</execution>
128+
</configuration>
129+
</execution>
130130
</executions>
131131
</plugin>
132132
<plugin>
133133
<groupId>org.apache.maven.plugins</groupId>
134134
<artifactId>maven-compiler-plugin</artifactId>
135135
<version>2.5.1</version>
136136
<configuration>
137-
<source>1.7</source>
138-
<target>1.7</target>
137+
<source>1.8</source>
138+
<target>1.8</target>
139139
</configuration>
140140
</plugin>
141141
<plugin>
@@ -175,8 +175,8 @@ limitations under the License.
175175
<!-- We can't exclude org.apache.lucene:* because gitblit uses also lucene-memory and lucene-highlighter, which apparently are not in the Gerrit API -->
176176
<exclude>org.apache.lucene:lucene-core</exclude><!-- In Gerrit API. GitBlit 4.6.0, Gerrit 5.3.0 -->
177177
<exclude>org.apache.lucene:lucene-analyzers-commons</exclude><!-- In Gerrit API. GitBlit 4.6.0, Gerrit 5.3.0 -->
178-
<exclude>org.apache.lucene:lucene-queries</exclude><!-- In Gerrit API. -->
179-
<exclude>org.apache.lucene:lucene-queryparser</exclude><!-- In Gerrit API. GitBlit 4.6.0, Gerrit 5.3.0 -->
178+
<exclude>org.apache.lucene:lucene-queries</exclude><!-- In Gerrit API. -->
179+
<exclude>org.apache.lucene:lucene-queryparser</exclude><!-- In Gerrit API. GitBlit 4.6.0, Gerrit 5.3.0 -->
180180
<exclude>commons-codec:commons-codec</exclude><!-- In Gerrit API. GitBlit 1.7, Gerrit 1.4 -->
181181
<exclude>org.tukaani:*</exclude><!-- In Gerrit API. GitBlit 1.0, Gerrit 1.4 -->
182182
<exclude>com.toedter:*</exclude><!-- Used only in GitBlit client, which doesn't run -->
@@ -233,7 +233,7 @@ limitations under the License.
233233
<exclude>com/gitblit/models/RepositoryCommit.class</exclude><!-- StackOverflowError; issue #21 -->
234234
<exclude>com/gitblit/models/RepositoryCommit$*.class</exclude>
235235
<exclude>com/gitblit/wicket/SessionlessForm.class</exclude><!-- Non-transient logger; issue #21 -->
236-
<exclude>com/gitblit/wicket/SessionlessForm$*.class</exclude>
236+
<exclude>com/gitblit/wicket/SessionlessForm$*.class</exclude>
237237
<exclude>com/gitblit/wicket/pages/BasePage.class</exclude><!-- Gerrit footer link -->
238238
<exclude>com/gitblit/wicket/pages/BasePage$*.class</exclude>
239239
<exclude>com/gitblit/wicket/pages/BlamePage.class</exclude><!-- Non-transient logger; issue #21 -->
@@ -297,7 +297,7 @@ limitations under the License.
297297
<exclude>com/gitblit/wicket/panels/ChoiceOption.class</exclude>
298298
<exclude>com/gitblit/wicket/panels/ChoiceOption$*.class</exclude>
299299
<exclude>com/gitblit/wicket/SafeTextModel.class</exclude>
300-
<exclude>com/gitblit/wicket/SafeTextModel$*.class</exclude>
300+
<exclude>com/gitblit/wicket/SafeTextModel$*.class</exclude>
301301
</excludes>
302302
</filter>
303303
<filter>
@@ -313,7 +313,7 @@ limitations under the License.
313313
</filter>
314314
</filters>
315315
</configuration>
316-
316+
317317
</execution>
318318
</executions>
319319
</plugin>

src/main/java/com/googlesource/gerrit/plugins/gitblit/GitBlitUrlsConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.slf4j.LoggerFactory;
2828

2929
import com.google.common.collect.ImmutableSet;
30-
import com.google.gerrit.reviewdb.client.AuthType;
30+
import com.google.gerrit.extensions.client.AuthType;
3131
import com.google.gerrit.server.ssh.SshAddressesModule;
3232

3333
public class GitBlitUrlsConfig {
@@ -62,7 +62,7 @@ public GitBlitUrlsConfig(Config config, List<SocketAddress> sshListenAddresses,
6262
/**
6363
* 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
6464
* username-password login form. This makes it possible to use the plugin with an external authentication provider as configured for Gerrit.
65-
*
65+
*
6666
* @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
6767
* authentication).
6868
*/
@@ -72,7 +72,7 @@ public String getLoginUrl() {
7272

7373
/**
7474
* Gets Gerrit's canonical web URL.
75-
*
75+
*
7676
* @return the Url
7777
*/
7878
public String getCanonicalWebUrl() {

0 commit comments

Comments
 (0)