Cleanup jetty as it's now a bundle natively

Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/155da86d
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/155da86d
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/155da86d

Branch: refs/heads/master
Commit: 155da86da2711c3d575983d25a4e499f723a62d6
Parents: 56026ca
Author: Jean-Baptiste Onofré <[email protected]>
Authored: Mon Jul 3 07:33:25 2017 +0200
Committer: Jean-Baptiste Onofré <[email protected]>
Committed: Mon Jul 3 07:33:25 2017 +0200

----------------------------------------------------------------------
 jetty-6.1.26/pom.xml                            | 242 -------------------
 .../src/main/resources/OSGI-INF/bundle.info     |  19 --
 2 files changed, 261 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/155da86d/jetty-6.1.26/pom.xml
----------------------------------------------------------------------
diff --git a/jetty-6.1.26/pom.xml b/jetty-6.1.26/pom.xml
deleted file mode 100644
index bde539a..0000000
--- a/jetty-6.1.26/pom.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>bundles-pom</artifactId>
-        <version>9-SNAPSHOT</version>
-        <relativePath>../bundles-pom/pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.jetty</artifactId>
-    <packaging>bundle</packaging>
-    <version>6.1.26_5-SNAPSHOT</version>
-    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps jetty, jetty-util, jetty-management, 
jetty-client, and jetty-sslengine
-        ${pkgVersion} jar files.
-    </description>
-
-    <properties>
-        <pkgGroupId>org.mortbay.jetty</pkgGroupId>
-        <pkgArtifactId>jetty</pkgArtifactId>
-        <pkgVersion>6.1.26</pkgVersion>
-        <servicemix.osgi.export.pkg>org.mortbay</servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-            javax.mail,
-            javax.management,
-            javax.management.loading,
-            javax.management.modelmbean,
-            javax.naming,
-            javax.naming.spi,
-            javax.net,
-            javax.net.ssl,
-            javax.security.auth,
-            javax.security.auth.callback,
-            javax.security.auth.login,
-            javax.security.auth.spi,
-            javax.security.cert,
-            javax.servlet,
-            javax.servlet.http,
-            javax.sql,
-            javax.transaction,
-            javax.xml.parsers,
-            org.slf4j;resolution:=optional,
-            org.xml.sax,
-            org.xml.sax.helpers
-        </servicemix.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-management</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-sslengine</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-client</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-naming</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-plus</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- sources -->
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-management</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-sslengine</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-client</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-naming</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>jetty-plus</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>${pkgGroupId}:jetty</include>
-                                    <include>${pkgGroupId}:jetty-util</include>
-                                    
<include>${pkgGroupId}:jetty-management</include>
-                                    
<include>${pkgGroupId}:jetty-client</include>
-                                    
<include>${pkgGroupId}:jetty-sslengine</include>
-                                    
<include>${pkgGroupId}:jetty-naming</include>
-                                    <include>${pkgGroupId}:jetty-plus</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>${pkgGroupId}:jetty</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    
<artifact>${pkgGroupId}:jetty-util</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    
<artifact>${pkgGroupId}:jetty-management</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    
<artifact>${pkgGroupId}:jetty-client</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    
<artifact>${pkgGroupId}:jetty-sslengine</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    
<artifact>${pkgGroupId}:jetty-naming</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    
<artifact>${pkgGroupId}:jetty-plus</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            
<createDependencyReducedPom>false</createDependencyReducedPom>
-                            
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/155da86d/jetty-6.1.26/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/jetty-6.1.26/src/main/resources/OSGI-INF/bundle.info 
b/jetty-6.1.26/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index 1b02e3c..0000000
--- a/jetty-6.1.26/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,19 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URLs:
-        \u001B[33mmvn:${pkgGroupId}/jetty/${pkgVersion}\u001B[0m
-        \u001B[33mmvn:${pkgGroupId}/jetty-util/${pkgVersion}\u001B[0m
-        \u001B[33mmvn:${pkgGroupId}/jetty-management/${pkgVersion}\u001B[0m
-        \u001B[33mmvn:${pkgGroupId}/jetty-client/${pkgVersion}\u001B[0m
-        \u001B[33mmvn:${pkgGroupId}/jetty-sslengine/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    Jetty provides an HTTP server, HTTP client, and javax.servlet container. 
These components are open source and
-    available for commercial use and distribution.
-
-    Jetty is used in a wide variety of projects and products. Jetty can be 
embedded in devices, tools, frameworks,
-    application servers, and clusters.
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttp://jetty.codehaus.org/jetty/\u001B[0m

Reply via email to