Changes from review

jetty · Nov 18, 2024 · c4e1c16 · c4e1c16
1 parent bfe4293
commit c4e1c16
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 32 deletions.
diff --git a/jetty-core/jetty-compression/jetty-compression-brotli/pom.xml b/jetty-core/jetty-compression/jetty-compression-brotli/pom.xml
@@ -26,7 +26,6 @@
     <dependency>
       <groupId>org.eclipse.jetty.compression</groupId>
       <artifactId>jetty-compression-common</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

diff --git a/...jetty-compression/jetty-compression-brotli/src/main/config/modules/compression-brotli.mod b/...jetty-compression/jetty-compression-brotli/src/main/config/modules/compression-brotli.mod
@@ -10,13 +10,13 @@ compression
 experimental
 
 [depend]
-compression-common
 compression
 
 [files]
 maven://com.aayushatharva.brotli4j/brotli4j/${brotli4j.version}|lib/compression/brotli4j-${brotli4j.version}.jar
 
 [lib]
+lib/compression/jetty-compression-common-${jetty.version}.jar
 lib/compression/brotli4j-${brotli4j.version}.jar
 
 [xml]

diff --git a/jetty-core/jetty-compression/jetty-compression-common/pom.xml b/jetty-core/jetty-compression/jetty-compression-common/pom.xml
@@ -14,7 +14,7 @@
   <name>Core :: Compression :: Common</name>
   <description>Jetty Core Compression Common</description>
   <properties>
-    <bundle-symbolic-name>${project.groupId}</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.groupId}.common</bundle-symbolic-name>
   </properties>
   <dependencies>
     <dependency>

diff --git a/...jetty-compression/jetty-compression-common/src/main/config/modules/compression-common.mod b/...jetty-compression/jetty-compression-common/src/main/config/modules/compression-common.mod
diff --git a/jetty-core/jetty-compression/jetty-compression-gzip/pom.xml b/jetty-core/jetty-compression/jetty-compression-gzip/pom.xml
@@ -20,7 +20,6 @@
     <dependency>
       <groupId>org.eclipse.jetty.compression</groupId>
       <artifactId>jetty-compression-common</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

diff --git a/...ore/jetty-compression/jetty-compression-gzip/src/main/config/modules/compression-gzip.mod b/...ore/jetty-compression/jetty-compression-gzip/src/main/config/modules/compression-gzip.mod
@@ -10,10 +10,10 @@ compression
 experimental
 
 [depend]
-compression-common
 compression
 
 [lib]
+lib/compression/jetty-compression-common-${jetty.version}.jar
 lib/compression/jetty-compression-gzip-${jetty.version}.jar
 
 [xml]

diff --git a/jetty-core/jetty-compression/jetty-compression-server/pom.xml b/jetty-core/jetty-compression/jetty-compression-server/pom.xml
@@ -24,7 +24,6 @@
     <dependency>
       <groupId>org.eclipse.jetty.compression</groupId>
       <artifactId>jetty-compression-common</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

diff --git a/...y-core/jetty-compression/jetty-compression-server/src/main/config/modules/compression.mod b/...y-core/jetty-compression/jetty-compression-server/src/main/config/modules/compression.mod
@@ -14,6 +14,7 @@ experimental
 server
 
 [lib]
+lib/compression/jetty-compression-common-${jetty.version}.jar
 lib/compression/jetty-compression-server-${jetty.version}.jar
 
 [xml]

diff --git a/...pression-server/src/main/java/org/eclipse/jetty/compression/server/CompressionConfig.java b/...pression-server/src/main/java/org/eclipse/jetty/compression/server/CompressionConfig.java
@@ -136,7 +136,7 @@ public Set<String> getCompressExcludeMimeTypes()
      * Get the set of excluded Path Specs for response compression.
      *
      * @return the set of excluded Path Specs
-     * @see #getCompressPathIncludes()
+     * @see #getCompressIncludesPath()
      */
     @ManagedAttribute("Set of Response Compression Path Exclusions")
     public Set<String> getCompressExcludePaths()
@@ -178,7 +178,7 @@ public Set<String> getCompressIncludeMimeTypes()
      * @see #getCompressExcludePaths()
      */
     @ManagedAttribute("Set of Response Compression Path Exclusions")
-    public Set<String> getCompressPathIncludes()
+    public Set<String> getCompressIncludesPath()
     {
         Set<String> includes = compressPaths.getIncluded();
         return Collections.unmodifiableSet(includes);

diff --git a/jetty-core/jetty-compression/jetty-compression-tests/pom.xml b/jetty-core/jetty-compression/jetty-compression-tests/pom.xml
@@ -20,22 +20,18 @@
     <dependency>
       <groupId>org.eclipse.jetty.compression</groupId>
       <artifactId>jetty-compression-brotli</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.compression</groupId>
       <artifactId>jetty-compression-gzip</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.compression</groupId>
       <artifactId>jetty-compression-server</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.compression</groupId>
       <artifactId>jetty-compression-zstandard</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

diff --git a/jetty-core/jetty-compression/jetty-compression-zstandard/pom.xml b/jetty-core/jetty-compression/jetty-compression-zstandard/pom.xml
@@ -26,7 +26,6 @@
     <dependency>
       <groupId>org.eclipse.jetty.compression</groupId>
       <artifactId>jetty-compression-common</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

diff --git a/...compression/jetty-compression-zstandard/src/main/config/modules/compression-zstandard.mod b/...compression/jetty-compression-zstandard/src/main/config/modules/compression-zstandard.mod
@@ -10,13 +10,13 @@ compression
 experimental
 
 [depend]
-compression-common
 compression
 
 [files]
 maven://com.github.luben/zstd-jni/${zstd-jni.version}|lib/compression/zstd-jni-${zstd-jni.version}.jar
 
 [lib]
+lib/compression/jetty-compression-common-${jetty.version}.jar
 lib/compression/zstd-jni-${zstd-jni.version}.jar
 
 [xml]

diff --git a/pom.xml b/pom.xml
@@ -954,6 +954,31 @@
         <artifactId>jetty-xml</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <artifactId>jetty-compression-brotli</artifactId>
+        <groupId>org.eclipse.jetty.compression</groupId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <artifactId>jetty-compression-common</artifactId>
+        <groupId>org.eclipse.jetty.compression</groupId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <artifactId>jetty-compression-gzip</artifactId>
+        <groupId>org.eclipse.jetty.compression</groupId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <artifactId>jetty-compression-server</artifactId>
+        <groupId>org.eclipse.jetty.compression</groupId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <artifactId>jetty-compression-zstandard</artifactId>
+        <groupId>org.eclipse.jetty.compression</groupId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.fcgi</groupId>
         <artifactId>jetty-fcgi-client</artifactId>