Skip to content
This repository was archived by the owner on May 27, 2024. It is now read-only.

Commit 35bdbbe

Browse files
committed
Update for Graylog 3.1.0
1 parent 2e7e08f commit 35bdbbe

File tree

5 files changed

+804
-686
lines changed

5 files changed

+804
-686
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ addons:
88
packages:
99
- rpm
1010
install:
11-
- git clone --branch 3.0 --depth=1 --no-single-branch https://github.com/Graylog2/graylog2-server ../graylog2-server
11+
- git clone --branch 3.1 --depth=1 --no-single-branch https://github.com/Graylog2/graylog2-server ../graylog2-server
1212
- (cd ../graylog2-server && mvn -DskipTests=true compile -B -V)
1313
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dskip.web.build=true -B -V
1414
script:

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
This plugins adds SSO (Single Sign-On) capabilities to Graylog. It supports automatic login and user account creation based on trusted HTTP headers set by an authentication proxy.
66

77

8-
**Required Graylog version:** 3.0.0 and later
8+
**Required Graylog version:** 3.1.0 and later
99

1010
Version Compatibility
1111
---------------------
1212

1313
| Plugin Version | Graylog Version |
1414
| -------------- | --------------- |
15+
| 3.1.x | 3.1.x |
1516
| 3.0.x | 3.0.x |
1617
| 2.5.x | 2.5.x |
1718
| 2.4.x | 2.4.x |
@@ -42,7 +43,7 @@ dramatically by making use of hot reloading. To do this, do the following:
4243
Usage
4344
-----
4445

45-
How this Plugin can be used is described in [the Graylog Documentation](http://docs.graylog.org/en/2.1/pages/users_and_roles/external_auth.html#single-sign-on)
46+
How this Plugin can be used is described in [the Graylog Documentation](http://docs.graylog.org/en/stable/pages/users_and_roles/external_auth.html#single-sign-on)
4647

4748

4849
Getting started
@@ -60,7 +61,7 @@ Plugin Release
6061
--------------
6162

6263
- Bump version in `package.json`
63-
- Bump `graylog.version` in pom.xml
64+
- Bump parent version and `graylog.version` in pom.xml
6465
- Change branch name for the graylog2-server checkout in `.travis.yml`
6566

6667
For the rest we are using the maven release plugin:

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SsoAuthPlugin",
3-
"version": "3.0.0",
3+
"version": "3.1.0",
44
"description": "",
55
"repository": {
66
"type": "git",

pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.graylog.plugins</groupId>
1010
<artifactId>graylog-plugin-web-parent</artifactId>
11-
<version>3.0.0</version>
11+
<version>3.1.0</version>
1212
<relativePath>../graylog2-server/graylog-plugin-parent/graylog-plugin-web-parent</relativePath>
1313
</parent>
1414

@@ -35,7 +35,7 @@
3535
</scm>
3636

3737
<properties>
38-
<graylog.version>3.0.0</graylog.version>
38+
<graylog.version>3.1.0</graylog.version>
3939
</properties>
4040

4141
<dependencies>
@@ -74,7 +74,9 @@
7474

7575
<build>
7676
<resources>
77-
<resource><directory>build</directory></resource>
77+
<resource>
78+
<directory>${web.build-dir}</directory>
79+
</resource>
7880
<resource>
7981
<directory>src/main/resources</directory>
8082
<filtering>true</filtering>

0 commit comments

Comments
 (0)