Skip to content

Commit

Permalink
Bump jetty-setuid to 2.0.1 (#10406)
Browse files Browse the repository at this point in the history
* Bump jetty-setuid to 2.0.1
  • Loading branch information
joakime authored Aug 25, 2023
1 parent eeee3ca commit 053d44e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 97 deletions.
48 changes: 7 additions & 41 deletions jetty-home/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<properties>
<assembly-directory>${basedir}/target/jetty-home</assembly-directory>
<source-assembly-directory>${basedir}/target/jetty-home-sources</source-assembly-directory>
<jetty-setuid-version>1.0.4</jetty-setuid-version>
<jetty-setuid-version>2.0.1</jetty-setuid-version>
<spotbugs.skip>true</spotbugs.skip>
</properties>

Expand Down Expand Up @@ -85,43 +85,6 @@
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-setuid-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain.setuid</groupId>
<artifactId>jetty-setuid-java</artifactId>
<version>${jetty-setuid-version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain.setuid</groupId>
<artifactId>libsetuid-linux</artifactId>
<version>${jetty-setuid-version}</version>
<type>so</type>
<overWrite>true</overWrite>
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
<destFileName>libsetuid-linux.so</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain.setuid</groupId>
<artifactId>libsetuid-osx</artifactId>
<version>${jetty-setuid-version}</version>
<type>so</type>
<overWrite>true</overWrite>
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
<destFileName>libsetuid-osx.so</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-jetty-core-deps</id>
<phase>generate-resources</phase>
Expand Down Expand Up @@ -304,7 +267,7 @@
<configuration>
<!-- useful for troubleshooting the source archive of a particular file: <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> -->
<includeGroupIds>
org.eclipse.jetty, org.eclipse.jetty.websocket
org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.toolchain.setuid
</includeGroupIds>
<excludeArtifactIds>jetty-infinispan-embedded,jetty-infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation</excludeArtifactIds>
<classifier>config</classifier>
Expand Down Expand Up @@ -629,18 +592,21 @@
<artifactId>jetty-nosql</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-demo-handler</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-keystore</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain.setuid</groupId>
<artifactId>jetty-setuid-jna</artifactId>
<version>${jetty-setuid-version}</version>
</dependency>
</dependencies>
</project>
33 changes: 0 additions & 33 deletions jetty-home/src/main/resources/etc/jetty-setuid.xml

This file was deleted.

23 changes: 0 additions & 23 deletions jetty-home/src/main/resources/modules/setuid.mod

This file was deleted.

0 comments on commit 053d44e

Please sign in to comment.