Skip to content

Commit 274dcfa

Browse files
committed
Fix build issues
1 parent 609618a commit 274dcfa

File tree

2 files changed

+11
-61
lines changed

2 files changed

+11
-61
lines changed

core/src/main/scripts/generate-flatbuffers.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
if ! flatc --version 2>/dev/null | grep -qF "${REQUIRED_FB_VERSION}"; then
3030
echo "****************************************************"
3131
echo "*** flatc ${REQUIRED_FB_VERSION} is not available, check PATH"
32-
echo "*** and ensure that `flatc` is resolvable or install correct"
32+
echo "*** and ensure that 'flatc' is resolvable or install correct"
3333
echo "*** version. Generated code will not be updated"
3434
fail "****************************************************"
35-
35+
3636
# git clone git@github.com:google/flatbuffers.git
3737
# cd flatbuffers
3838
# git checkout v24.3.25
@@ -47,6 +47,6 @@ fi
4747
#
4848
# src/main/scripts/generate-flatbuffers.sh
4949

50-
flatc --java -o src/main/flatbuffers-gen-java src/main/flatbuffers/metric.fbs
50+
flatc --java -o src/main/flatbuffers-gen-java src/main/flatbuffers/metric.fbs
5151

5252
# Be sure to run `mvn package` after generating the files to add the LICENSE headers

server/monitor/pom.xml

+8-58
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@
104104
<groupId>org.apache.zookeeper</groupId>
105105
<artifactId>zookeeper</artifactId>
106106
</dependency>
107+
<dependency>
108+
<groupId>org.checkerframework</groupId>
109+
<artifactId>checker-qual</artifactId>
110+
</dependency>
111+
<dependency>
112+
<groupId>org.eclipse.jetty</groupId>
113+
<artifactId>jetty-io</artifactId>
114+
</dependency>
107115
<dependency>
108116
<groupId>org.eclipse.jetty</groupId>
109117
<artifactId>jetty-server</artifactId>
@@ -220,11 +228,6 @@
220228
</excludes>
221229
</licenseSet>
222230
</licenseSets>
223-
<mapping>
224-
<ts>SLASHSTAR_STYLE</ts>
225-
<tsx>SLASHSTAR_STYLE</tsx>
226-
<tsbuildinfo>NO_STYLE</tsbuildinfo>
227-
</mapping>
228231
</configuration>
229232
</plugin>
230233
<plugin>
@@ -233,62 +236,9 @@
233236
<configuration>
234237
<excludes>
235238
<exclude>src/main/resources/org/apache/accumulo/monitor/resources/external/**/*</exclude>
236-
<exclude>src/main/resources/org/apache/accumulo/newmonitor/dist/**/*</exclude>
237-
<exclude>src/main/resources/org/apache/accumulo/newmonitor/node_modules/**/*</exclude>
238-
<exclude>src/main/resources/org/apache/accumulo/newmonitor/**/*.tsbuildinfo</exclude>
239239
</excludes>
240240
</configuration>
241241
</plugin>
242-
<plugin>
243-
<groupId>com.github.eirslett</groupId>
244-
<artifactId>frontend-maven-plugin</artifactId>
245-
<version>1.15.1</version>
246-
<configuration>
247-
<workingDirectory>src/main/resources/org/apache/accumulo/newmonitor</workingDirectory>
248-
<nodeVersion>v22.11.0</nodeVersion>
249-
<npmVersion>10.9.0</npmVersion>
250-
<installDirectory>target</installDirectory>
251-
</configuration>
252-
<executions>
253-
<execution>
254-
<id>install-node-and-npm</id>
255-
<goals>
256-
<goal>install-node-and-npm</goal>
257-
</goals>
258-
<phase>generate-sources</phase>
259-
</execution>
260-
<execution>
261-
<id>npm-install</id>
262-
<goals>
263-
<goal>npm</goal>
264-
</goals>
265-
<phase>generate-sources</phase>
266-
<configuration>
267-
<arguments>install</arguments>
268-
</configuration>
269-
</execution>
270-
<execution>
271-
<id>npm-run-build</id>
272-
<goals>
273-
<goal>npm</goal>
274-
</goals>
275-
<phase>generate-sources</phase>
276-
<configuration>
277-
<arguments>run build</arguments>
278-
</configuration>
279-
</execution>
280-
<execution>
281-
<id>npm-run-lint</id>
282-
<goals>
283-
<goal>npm</goal>
284-
</goals>
285-
<phase>validate</phase>
286-
<configuration>
287-
<arguments>run lint</arguments>
288-
</configuration>
289-
</execution>
290-
</executions>
291-
</plugin>
292242
</plugins>
293243
</pluginManagement>
294244
<plugins>

0 commit comments

Comments
 (0)