Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
This commit is contained in:
commit
fea27d9fb8
|
@ -8,7 +8,6 @@
|
||||||
<artifactId>jetty-server</artifactId>
|
<artifactId>jetty-server</artifactId>
|
||||||
<name>Jetty :: Server Core</name>
|
<name>Jetty :: Server Core</name>
|
||||||
<description>The core jetty server artifact.</description>
|
<description>The core jetty server artifact.</description>
|
||||||
<url>${jetty.url}</url>
|
|
||||||
<properties>
|
<properties>
|
||||||
<bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
|
<bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -108,9 +107,9 @@
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.mockito</groupId>
|
<groupId>org.mockito</groupId>
|
||||||
<artifactId>mockito-core</artifactId>
|
<artifactId>mockito-core</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -9,10 +9,6 @@
|
||||||
<artifactId>test-jetty-nested</artifactId>
|
<artifactId>test-jetty-nested</artifactId>
|
||||||
<name>Jetty :: Nested Test</name>
|
<name>Jetty :: Nested Test</name>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
|
|
Loading…
Reference in New Issue