Merge branch 'stable-2.10'
* stable-2.10:
Bump plugin version to 0.4
Add support for hosted domain to Google OAuth provider
Conflicts:
VERSION
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..34878aa
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,32 @@
+# Copyright (C) 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+language: java
+
+install:
+ - cd ..
+ - mkdir -p build
+ - cd build
+ - git clone https://github.com/facebook/buck
+ - cd buck
+ - ant
+ - export PATH=$PATH:$TRAVIS_BUILD_DIR/../build/buck/bin
+ - cd $TRAVIS_BUILD_DIR
+
+script:
+ - buck build plugin > buck.log
+
+after_failure:
+ - cat buck.log
diff --git a/README.md b/README.md
index df85b97..8ebb744 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
Gerrit OAuth2 authentication provider
=====================================
+[](https://travis-ci.org/davido/gerrit-oauth-provider)
+
+
With this plugin Gerrit can use OAuth2 protocol for authentication.
Supported OAuth providers:
@@ -9,8 +12,13 @@
See the [Wiki](https://github.com/davido/gerrit-oauth-provider/wiki) what it can do for you.
-Installation
-------------
+Prebuilt artifacts
+------------------
+
+Prebuilt binary artifacts are available on [release page](https://github.com/davido/gerrit-oauth-provider/releases). Make sure to pick the right JAR for your Gerrit version.
+
+Build
+-----
To build the plugin, install [Buck](http://facebook.github.io/buck/setup/install.html)
and run the following:
@@ -20,6 +28,9 @@
cd gerrit-oauth-provider && buck build plugin
```
+Install
+-------
+
Copy the `buck-out/gen/gerrit-oauth-provider.jar` to
`$gerit_site/plugins` and re-run init to configure it:
@@ -34,7 +45,12 @@
confirm password :
Link to OpenID accounts? [true]:
Use GitHub OAuth provider for Gerrit login ? [Y/n]? n
-```
+```
+
+Reporting bugs
+--------------
+
+Make sure to read the [FAQ](https://github.com/davido/gerrit-oauth-provider/wiki/FAQ) before reporting issues.
License
-------
diff --git a/VERSION b/VERSION
index 33b4391..8026f1e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
# Used by BUCK to include "Implementation-Version" in plugin Manifest.
# If this file doesn't exist the output of 'git describe' is used
# instead.
-PLUGIN_VERSION = '0.4'
+PLUGIN_VERSION = '2.11.1'
diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index 3702f04..96d016a 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,12 @@
include_defs('//bucklets/maven_jar.bucklet')
-VER = '2.10.2'
+VER = '2.11'
REPO = MAVEN_CENTRAL
maven_jar(
name = 'plugin-api',
id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
- sha1 = '4086f90b4d7be9101e84e8e3e76262496d2e12fe',
+ sha1 = 'be80ff991f7b9f8669b7a2a399003ec1ae69ed31',
license = 'Apache2.0',
attach_source = False,
repository = REPO,
diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java
index 85fb6f3..14c60a9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/InitOAuth.java
@@ -14,9 +14,9 @@
package com.googlesource.gerrit.plugins.oauth;
import com.google.gerrit.extensions.annotations.PluginName;
-import com.google.gerrit.pgm.util.ConsoleUI;
-import com.google.gerrit.pgm.init.InitStep;
-import com.google.gerrit.pgm.init.Section;
+import com.google.gerrit.pgm.init.api.ConsoleUI;
+import com.google.gerrit.pgm.init.api.InitStep;
+import com.google.gerrit.pgm.init.api.Section;
import com.google.inject.Inject;
class InitOAuth implements InitStep {
