Author: lhein
Date: Fri Nov 12 07:08:50 2010
New Revision: 1034280
URL: http://svn.apache.org/viewvc?rev=1034280&view=rev
Log:
applied patch for jetty bundle 6.1.26 on behalf of Willem Jiang (SMX4-672)
Added:
servicemix/smx4/bundles/trunk/jetty-bundle-6.1.26/
servicemix/smx4/bundles/trunk/jetty-bundle-6.1.26/pom.xml (with props)
Modified:
servicemix/smx4/bundles/trunk/pom.xml
Added: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.26/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-bundle-6.1.26/pom.xml?rev=1034280&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-bundle-6.1.26/pom.xml (added)
+++ servicemix/smx4/bundles/trunk/jetty-bundle-6.1.26/pom.xml Fri Nov 12
07:08:50 2010
@@ -0,0 +1,144 @@
+<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/maven-v4_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>4</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
+ <packaging>bundle</packaging>
+ <version>6.1.26_1-SNAPSHOT</version>
+ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </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>
+ !org.mortbay,
+ *
+ </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>
+ </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>
+ </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>
+ </filters>
+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+
<createDependencyReducedPom>false</createDependencyReducedPom>
+
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.26/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.26/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.26/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: servicemix/smx4/bundles/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1034280&r1=1034279&r2=1034280&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Fri Nov 12 07:08:50 2010
@@ -47,7 +47,8 @@
<module>jasypt-1.7</module>
<module>jaxb-impl-2.2.1</module>
<module>jaxb-xjc-2.2.1</module>
- <module>jaxp-ri-1.4.4</module>
+ <module>jaxp-ri-1.4.4</module>
+ <module>jetty-bundle-6.1.26</module>
</modules>
</project>
