Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix broken osgi build, update filter targets to 7.2 (which we ought to just standardize so we don't have to change filters based on minor version and found source of issue being an unquoted version in DynamicImport in boot osgi 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2200 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Jesse McConnell 2010-07-30 17:30:49 +00:00
parent 4110df9a06
commit 11d03a6f0b
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Jetty-OSGi-Jasper integration
Fragment-Host: org.eclipse.jetty.osgi.boot
Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.jsp;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-Version: 7.2.0.qualifier
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: com.sun.el;resolution:=optional,

2
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
View File

@ -55,7 +55,7 @@
<phase>process-resources</phase>
<configuration>
<tasks>
<replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.1.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
<replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.2.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
</tasks>
</configuration>
<goals>

2
jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Support for rfc66 war url scheme
Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.warurl;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-Version: 7.2.0.qualifier
Bundle-Activator: org.eclipse.jetty.osgi.boot.warurl.WarUrlActivator
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: J2SE-1.5

2
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
View File

@ -33,7 +33,7 @@
<phase>process-resources</phase>
<configuration>
<tasks>
<replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.1.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
<replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.2.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
</tasks>
</configuration>
<goals>

2
jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Jetty OSGi bootstrap
Bundle-SymbolicName: org.eclipse.jetty.osgi.boot;singleton:=true
Bundle-Vendor: Mort Bay Consulting
Bundle-Version: 7.1.0.qualifier
Bundle-Version: 7.2.0.qualifier
Bundle-Activator: org.eclipse.jetty.osgi.boot.JettyBootstrapActivator
Import-Package: javax.mail;version="1.4.0";resolution:=optional,
javax.mail.event;version="1.4.0";resolution:=optional,

2
jetty-osgi/jetty-osgi-boot/pom.xml
View File

@ -179,7 +179,7 @@
org.xml.sax.helpers,
*
</Import-Package>
<DynamicImport-Package>org.eclipse.jetty.*;version=[7.2,8)</DynamicImport-Package>
<DynamicImport-Package>org.eclipse.jetty.*;version="[7.2,8)"</DynamicImport-Package>
<!--Require-Bundle/-->
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
</instructions>

2
jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: OSGi HttpService provided by equinox HttpServiceServlet deployed on jetty
Bundle-SymbolicName: org.eclipse.jetty.osgi.httpservice
Bundle-Version: 7.1.0.qualifier
Bundle-Version: 7.2.0.qualifier
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: javax.servlet;version="2.5.0",

2
jetty-osgi/jetty-osgi-httpservice/pom.xml
View File

@ -37,7 +37,7 @@
<phase>process-resources</phase>
<configuration>
<tasks>
<replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.1.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
<replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.2.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
<copy todir="target/classes/contexts">
<fileset dir="contexts" />
</copy>