aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.http.test
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2017-03-27 01:14:59 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2017-03-30 13:56:16 +0200
commit7395c7af59f9adf770a51748e03774d53c10ea97 (patch)
tree0c713e70d38acfab8f0018ab74b307757dc3026e /org.eclipse.jgit.http.test
parentf32d65759c9afdcbec28eb3051ed9138b8e03271 (diff)
downloadjgit-7395c7af59f9adf770a51748e03774d53c10ea97.tar.gz
jgit-7395c7af59f9adf770a51748e03774d53c10ea97.zip
Require jetty 9.4.0 consistently
Change-Id: If9de4c0e43850dec46858bd58e9692a7e099cbc3
Diffstat (limited to 'org.eclipse.jgit.http.test')
-rw-r--r--org.eclipse.jgit.http.test/META-INF/MANIFEST.MF24
1 files changed, 12 insertions, 12 deletions
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 8e7d3510d7..11a5d14df0 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -8,20 +8,20 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
- org.eclipse.jetty.continuation;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.http;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.io;version="[9.0.0,10.0.0)",
+ org.eclipse.jetty.continuation;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.http;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.io;version="[9.4.0,10.0.0)",
org.eclipse.jetty.security;version="[9.4.0,10.0.0)",
org.eclipse.jetty.security.authentication;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.server.handler;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.server.nio;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.servlet;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
- org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)",
+ org.eclipse.jetty.server;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.server.handler;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.server.nio;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.servlet;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.component;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.log;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.security;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.util.thread;version="[9.4.0,10.0.0)",
org.eclipse.jgit.errors;version="[4.7.0,4.8.0)",
org.eclipse.jgit.http.server;version="[4.7.0,4.8.0)",
org.eclipse.jgit.http.server.glue;version="[4.7.0,4.8.0)",
d='n34' href='#n34'>34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
<?xml version="1.0"?>
<!--
  ~ 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.
  -->
<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">
  <modelVersion>4.0.0</modelVersion>
  <parent>
    <artifactId>archiva-base</artifactId>
    <groupId>org.apache.archiva</groupId>
    <version>1.4-M3-SNAPSHOT</version>
  </parent>
  <artifactId>archiva-proxy-common</artifactId>
  <packaging>bundle</packaging>
  <name>Archiva Base :: Proxy Common</name>
  <dependencies>
    <dependency>
      <groupId>org.apache.archiva</groupId>
      <artifactId>archiva-plexus-bridge</artifactId>
    </dependency>
    <dependency>
      <groupId>org.apache.maven.wagon</groupId>
      <artifactId>wagon-provider-api</artifactId>
    </dependency>
    <dependency>
      <groupId>org.apache.maven.wagon</groupId>
      <artifactId>wagon-file</artifactId>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.maven.wagon</groupId>
      <artifactId>wagon-http-lightweight</artifactId>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.apache.maven.wagon</groupId>
      <artifactId>wagon-http</artifactId>
      <scope>test</scope>
      <exclusions>
        <exclusion>
          <groupId>commons-logging</groupId>
          <artifactId>commons-logging</artifactId>
        </exclusion>
      </exclusions>
    </dependency>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging-api</artifactId>
    </dependency>
    <dependency>
      <groupId>org.apache.archiva</groupId>
      <artifactId>archiva-test-utils</artifactId>
      <version>${project.version}</version>
      <scope>test</scope>
    </dependency>    
  </dependencies>
  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.felix</groupId>
        <artifactId>maven-bundle-plugin</artifactId>
        <configuration>
          <instructions>
            <Bundle-SymbolicName>org.apache.archiva.proxy.common</Bundle-SymbolicName>
            <Bundle-Version>${project.version}</Bundle-Version>
            <Export-Package>
              org.apache.archiva.proxy.common;version=${project.version}
            </Export-Package>
            <Import-Package>
              javax.inject,
              org.apache.archiva.common.plexusbridge;version=${project.version},
              org.apache.commons.lang;version="[2.4,3)",
              org.springframework.stereotype;version="[3,4)",
              org.springframework.context;version="[3,4)",
              org.springframework.beans;version="[3,4)",
              org.apache.maven.wagon*,
              org.slf4j;resolution:=optional
            </Import-Package>
          </instructions>
        </configuration>
      </plugin>
    </plugins>
  </build>
</project>