Skip to content

Commit 70a4e8e

Browse files
committed
got the build working, but still errors at init
1 parent b5b7f39 commit 70a4e8e

File tree

12 files changed

+3768
-3125
lines changed

12 files changed

+3768
-3125
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@ jobs:
3939
git clone --depth 1 --branch "${{ env.GRAYLOG_VERSION }}" https://github.com/Graylog2/graylog2-server.git ../graylog2-server
4040
pushd ../graylog2-server
4141
mvn generate-resources -pl graylog2-server -B -V
42-
pushd graylog2-web-interface
43-
yarn install
44-
env disable_plugins=true ./node_modules/.bin/webpack --config webpack.vendor.js
45-
popd; popd
42+
pushd ../graylog2-server
43+
mvn compile
44+
popd
4645
- name: Build
4746
run: mvn -B package --file pom.xml
4847
- name: Package deb

.github/workflows/pr_build.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ jobs:
3636
echo "Checking out Graylog ${{ env.GRAYLOG_VERSION }}"
3737
git clone --depth 1 --branch "${{ env.GRAYLOG_VERSION }}" https://github.com/Graylog2/graylog2-server.git ../graylog2-server
3838
pushd ../graylog2-server
39-
mvn generate-resources -pl graylog2-server -B -V
40-
pushd graylog2-web-interface
41-
yarn install
42-
env disable_plugins=true ./node_modules/.bin/webpack --config webpack.vendor.js
43-
popd; popd
39+
mvn compile
40+
popd
4441
- name: Build
4542
run: mvn -B package --file pom.xml

.mvn/jvm.config

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
2+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
3+
--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
4+
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
5+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
6+
--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
7+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
8+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
9+
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
10+
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

docs/development/README.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,20 @@ echo "Checking out Graylog ${GRAYLOG_VERSION}"
1515
git clone --depth 1 --branch "${GRAYLOG_VERSION}" https://github.com/Graylog2/graylog2-server.git ../graylog2-server
1616
# Build Graylog web interface
1717
pushd ../graylog2-server
18-
mvn generate-resources -pl graylog2-server -B -V
19-
pushd graylog2-web-interface
20-
yarn install
21-
env disable_plugins=true ./node_modules/.bin/webpack --config webpack.vendor.js
22-
popd; popd
18+
mvn compile
19+
popd
2320
```
2421

2522
## Build
2623

2724
Run `mvn clean package` to build a JAR file.
2825

29-
Note: You may need to define the correct Java version for Maven, eg. via `export JAVA_HOME=/usr/lib/jvm/java-17-openjdk`
26+
Note: You may need to define the correct Java version for Maven, eg. via
27+
28+
```bash
29+
export JAVA_HOME="/usr/lib/jvm/java-17-openjdk"
30+
export PATH="/usr/lib/jvm/java-17-openjdk/bin/:$PATH"
31+
```
3032

3133
*Alternatively, the [Graylog documentation](https://go2docs.graylog.org/5-0/what_more_can_graylog_do_for_me/plugins.html?tocpath=What%20More%20Can%20Graylog%20Do%20for%20Me%253F%7CPlugins%7C_____0#WritingPlugins) describes how to create a convenient setup with hot reloading.*
3234

@@ -56,7 +58,7 @@ echo "Checking out Graylog ${GRAYLOG_VERSION}"
5658
git clone --depth 1 --branch "${GRAYLOG_VERSION}" https://github.com/Graylog2/graylog2-server.git ../graylog2-server
5759
# Build Graylog web interface
5860
pushd ../graylog2-server
59-
mvn generate-resources -pl graylog2-server -B -V
61+
mvn compile
6062
popd
6163
```
6264

@@ -65,7 +67,7 @@ or update your graylog-project setup:
6567
```bash
6668
# adjust the path below
6769
cd graylog-project
68-
# replace <VERSION> with the Graylog version (e.g. 5.0.1)
70+
# replace <VERSION> with the Graylog version (e.g. 6.0.1)
6971
graylog-project graylog-version --force-https-repos --set <VERSION>
7072
```
7173

@@ -105,11 +107,11 @@ Ensure that Maven uses the correct Java version by setting the `JAVA_HOME` envir
105107

106108
```bash
107109
pushd ../graylog2-server
108-
mvn generate-resources -pl graylog2-server -B -V
110+
mvn compile
109111
pushd graylog2-web-interface
110112
# Build Vendor Manifest:
111113
yarn install
112-
env disable_plugins=true ./node_modules/.bin/webpack --config webpack.vendor.js
114+
yarn run build
113115
popd; popd
114116
```
115117

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"license": "MIT",
2323
"dependencies": {
2424
"lodash": "^4.17.21",
25-
"react-select": "^4.3.0",
25+
"react-select": "5.8.0",
2626
"styled-components": "^5.2.1"
2727
},
2828
"devDependencies": {

0 commit comments

Comments
 (0)