Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2010-04-27 10:35:42 -0400
committerSimone Bordet2010-04-27 10:35:42 -0400
commit9245ebff82d4ad76922c14b9393d2d6f4fcdf64a (patch)
tree0cfe68cb6520d5586e7165756d774e590e70f518 /pom.xml
parentdcca9fe13dda7a3ee601272e7e0816f491559594 (diff)
downloadorg.eclipse.jetty.project-9245ebff82d4ad76922c14b9393d2d6f4fcdf64a.tar.gz
org.eclipse.jetty.project-9245ebff82d4ad76922c14b9393d2d6f4fcdf64a.tar.xz
org.eclipse.jetty.project-9245ebff82d4ad76922c14b9393d2d6f4fcdf64a.zip
Fixes #308848 (Update test suite to JUnit4 - Module jetty-ajp).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1594 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml11
1 files changed, 6 insertions, 5 deletions
diff --git a/pom.xml b/pom.xml
index 590d589276..fa42acd099 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
<ant-version>1.6.5</ant-version>
<jta-spec-version>1.1.1</jta-spec-version>
<junit-version>3.8.2</junit-version>
+ <junit4-version>4.8.1</junit4-version>
<mail-version>1.4</mail-version>
<slf4j-version>1.5.10</slf4j-version>
<eclipse-compiler-version>3.1.1</eclipse-compiler-version>
@@ -65,7 +66,7 @@
</execution>
</executions>
</plugin>
-
+
<!-- Build helper maven plugin sets the parsedVersion.osgiVersion property -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -80,7 +81,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -110,7 +111,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>2.0.0</version>
<extensions>true</extensions>
- <configuration>
+ <configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Bundle-DocURL>${jetty.url}</Bundle-DocURL>
@@ -134,7 +135,7 @@
</dependency>
</dependencies>
</plugin>
-
+
<!-- source maven plugin creates the source bundle and adds manifest -->
<plugin>
<inherited>true</inherited>
@@ -254,7 +255,7 @@
</dependency>
</dependencies>
</dependencyManagement>
- <!--
+ <!--
Usage:
configure settings.xml for jetty.eclipse.website server entry
> mvn -Paggregate-site javadoc:aggregate jxr:jxr

Back to the top