Remove dead /jetty-spring/ module

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Nov 18, 2020 · 9e444a9 · 9e444a9
1 parent 899e5fc
commit 9e444a9
Show file tree

Hide file tree

Showing 21 changed files with 3 additions and 1,009 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
                                ',**/org/eclipse/jetty/demo/**' +
                                // special environments / late integrations
                                ',**/org/eclipse/jetty/gcloud/**' + ',**/org/eclipse/jetty/infinispan/**' +
-                               ',**/org/eclipse/jetty/osgi/**' + ',**/org/eclipse/jetty/spring/**' +
+                               ',**/org/eclipse/jetty/osgi/**' +
                                ',**/org/eclipse/jetty/http/spi/**' +
                                // test classes
                                ',**/org/eclipse/jetty/tests/**' + ',**/org/eclipse/jetty/test/**',

diff --git a/javadoc/pom.xml b/javadoc/pom.xml
@@ -330,12 +330,6 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-spring</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-start</artifactId>

diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml
@@ -292,11 +292,6 @@
         <artifactId>jetty-servlets</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-spring</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-unixsocket-common</artifactId>

diff --git a/jetty-documentation/src/main/asciidoc/old_docs/frameworks/chapter.adoc b/jetty-documentation/src/main/asciidoc/old_docs/frameworks/chapter.adoc
@@ -21,6 +21,5 @@
 
 include::cdi.adoc[]
 include::weld.adoc[]
-include::spring-usage.adoc[]
 include::osgi.adoc[]
 include::metro.adoc[]
diff --git a/jetty-documentation/src/main/asciidoc/old_docs/frameworks/spring-usage.adoc b/jetty-documentation/src/main/asciidoc/old_docs/frameworks/spring-usage.adoc
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
@@ -126,7 +126,7 @@
                 org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
               </excludeGroupIds>
               <excludeArtifactIds>
-                apache-jsp,apache-jstl,jetty-start,jetty-spring,jetty-slf4j-impl
+                apache-jsp,apache-jstl,jetty-start,jetty-slf4j-impl
               </excludeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib</outputDirectory>
@@ -144,7 +144,7 @@
                 org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
               </excludeGroupIds>
               <excludeArtifactIds>
-                apache-jsp,apache-jstl,jetty-start,jetty-spring
+                apache-jsp,apache-jstl,jetty-start
               </excludeArtifactIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
@@ -282,33 +282,6 @@
               <outputDirectory>${source-assembly-directory}/lib/fcgi</outputDirectory>
             </configuration>
           </execution>
-          <execution>
-            <id>copy-lib-spring-deps</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeGroupIds>org.eclipse.jetty</includeGroupIds>
-              <includeArtifactIds>jetty-spring</includeArtifactIds>
-              <includeTypes>jar</includeTypes>
-              <outputDirectory>${assembly-directory}/lib/spring</outputDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-lib-spring-src-deps</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeGroupIds>org.eclipse.jetty</includeGroupIds>
-              <includeArtifactIds>jetty-spring</includeArtifactIds>
-              <includeTypes>jar</includeTypes>
-              <classifier>sources</classifier>
-              <outputDirectory>${source-assembly-directory}/lib/spring</outputDirectory>
-            </configuration>
-          </execution>
           <execution>
             <id>copy-servlet-api-deps</id>
             <phase>generate-resources</phase>
@@ -702,12 +675,6 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-spring</artifactId>
-      <version>${project.version}</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>

diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
@@ -308,10 +308,6 @@
           <groupId>org.eclipse.jetty.fcgi</groupId>
           <artifactId>fcgi-server</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-spring</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-start</artifactId>

diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml
diff --git a/jetty-spring/src/main/config/etc/jetty-spring.xml b/jetty-spring/src/main/config/etc/jetty-spring.xml
diff --git a/jetty-spring/src/main/config/modules/spring.mod b/jetty-spring/src/main/config/modules/spring.mod