wire monitor into distro, reenable setuid for osx
This commit is contained in:
parent
370df6e723
commit
de0c0910dd
|
@ -161,8 +161,6 @@
|
|||
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
|
||||
<destFileName>libsetuid-linux.so</destFileName>
|
||||
</artifactItem>
|
||||
|
||||
<!-- TODO readd once new version released
|
||||
<artifactItem>
|
||||
<groupId>org.eclipse.jetty.toolchain.setuid</groupId>
|
||||
<artifactId>libsetuid-osx</artifactId>
|
||||
|
@ -172,7 +170,6 @@
|
|||
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
|
||||
<destFileName>libsetuid-osx.so</destFileName>
|
||||
</artifactItem>
|
||||
-->
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
@ -222,7 +219,25 @@
|
|||
<outputDirectory>${assembly-directory}/lib/websocket</outputDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
<execution>
|
||||
<id>copy-lib-monitor-deps</id>
|
||||
<phase>generate-resources</phase>
|
||||
<goals>
|
||||
<goal>copy</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-monitor</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>jar</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${assembly-directory}/lib/monitor</outputDirectory>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>copy-orbit-servlet-api-deps</id>
|
||||
<phase>generate-resources</phase>
|
||||
|
@ -424,6 +439,11 @@
|
|||
<artifactId>jetty-jmx</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-monitor</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-start</artifactId>
|
||||
|
|
Loading…
Reference in New Issue