Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2009-04-01 18:06:52 +0000
committerJesse McConnell2009-04-01 18:06:52 +0000
commit4048a3f2ed76c65d0a677d127658d91907409a1e (patch)
tree7611fd7f386d979d7934271222a2cf6e29a6750e
parent9cc04501ec4a5d8eda120bf3aff60ed68b6bf3dd (diff)
downloadorg.eclipse.jetty.project-4048a3f2ed76c65d0a677d127658d91907409a1e.tar.gz
org.eclipse.jetty.project-4048a3f2ed76c65d0a677d127658d91907409a1e.tar.xz
org.eclipse.jetty.project-4048a3f2ed76c65d0a677d127658d91907409a1e.zip
updating osgi plugin and manifest information, also fixing svn property on two dirs
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@75 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--jetty-ajp/pom.xml10
-rw-r--r--jetty-annotations/pom.xml10
-rw-r--r--jetty-client/pom.xml10
-rw-r--r--jetty-continuation/pom.xml10
-rw-r--r--jetty-deploy/pom.xml10
-rw-r--r--jetty-embedded-examples/pom.xml2
-rw-r--r--jetty-http/pom.xml9
-rw-r--r--jetty-io/pom.xml9
-rw-r--r--jetty-jaspi/pom.xml12
-rw-r--r--jetty-jmx/pom.xml10
-rw-r--r--jetty-jndi/pom.xml10
-rw-r--r--jetty-plus/pom.xml10
-rw-r--r--jetty-rewrite/pom.xml10
-rw-r--r--jetty-security/pom.xml12
-rw-r--r--jetty-server/pom.xml12
-rw-r--r--jetty-servlet/pom.xml10
-rw-r--r--jetty-servlets/pom.xml12
-rw-r--r--jetty-util/pom.xml6
-rw-r--r--jetty-webapp/pom.xml11
-rw-r--r--jetty-xml/pom.xml12
-rw-r--r--pom.xml105
21 files changed, 56 insertions, 246 deletions
diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml
index 4ebf95ccd9..6449d89fb2 100644
--- a/jetty-ajp/pom.xml
+++ b/jetty-ajp/pom.xml
@@ -12,21 +12,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.ajp</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- <Export-Package>org.eclipse.jetty.ajp;version=${project.version}</Export-Package>
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index e01487aed5..7e22cae7ee 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- <Import-Package>!org.eclipse.jetty.annotations.*,*</Import-Package>
- <!-- <Export-Package>org.eclipse.jetty.annotations.*</Export-Package> -->
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index 3e6093e2bd..62e6bddba7 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -7,25 +7,19 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-client</artifactId>
<name>Jetty :: Asynchronous HTTP Client</name>
+ <url>{$jetty.url}</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
- <Export-Package>!org.eclipse.jetty.client.webdav,org.eclipse.jetty.client.*</Export-Package>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index eb9887e9d7..c13a87cdbb 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.continuation</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- <Import-Package></Import-Package>
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index a4df177f34..4b702c05fa 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.deploy</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Export-Package>org.eclipse.jetty.deploy;version=${project.version}</Export-Package>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-embedded-examples/pom.xml b/jetty-embedded-examples/pom.xml
index 7753390ca8..dab5c4c25e 100644
--- a/jetty-embedded-examples/pom.xml
+++ b/jetty-embedded-examples/pom.xml
@@ -5,7 +5,7 @@
<version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jetty-embedded</artifactId>
+ <artifactId>jetty-embedded-examples</artifactId>
<name>Jetty :: Embedded Examples</name>
<description>Jetty Embedded Examples</description>
<build>
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index c34e8c32aa..c38632f257 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -25,20 +25,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.http</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index 645ce13f0c..13c1ee4891 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -25,20 +25,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.io</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml
index 0f28ce181d..56c6a6490c 100644
--- a/jetty-jaspi/pom.xml
+++ b/jetty-jaspi/pom.xml
@@ -13,22 +13,14 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.security</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Export-Package>org.eclipse.jetty.security;version=${project.version}</Export-Package>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
- </execution>
+ </execution>
</executions>
</plugin>
<plugin>
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index 9f657c5b1c..428b2973bf 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.jmx</Bundle-SymbolicName>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Import-Package>!org.eclipse.component.management.*,!org.eclipse.jetty.deployer.management.*,!org.eclipse.jetty.nio.management.*,!org.eclipse.log.management.*,!org.eclipse.jetty.jmx.*,!org.eclipse.thread.management.*,!org.eclipse.jetty.jmx.handler.*,!org.eclipse.jetty.jmx.*,!org.eclipse.jetty.jmx.servlet.*,!org.eclipse.jetty.jmx.webapp.*,*</Import-Package>
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index 13211520a9..238f173411 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Import-Package>!org.eclipse.jetty.jndi.*,*</Import-Package>
- <Bundle-SymbolicName>org.eclipse.jetty.jndi</Bundle-SymbolicName>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index d8b9e7aa5d..3fc9e3100e 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -13,20 +13,14 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Import-Package>!org.eclipse.jetty.plus.*,*</Import-Package>
- </instructions>
- </configuration>
- </execution>
+ </execution>
</executions>
</plugin>
<plugin>
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index f3a0d4b995..fb1fd5b142 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -13,21 +13,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.rewrite</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Export-Package>org.eclipse.jetty.rewrite.handler;version=${project.version}</Export-Package>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index 1bca7faea9..b33fb9157b 100644
--- a/jetty-security/pom.xml
+++ b/jetty-security/pom.xml
@@ -13,22 +13,14 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.security</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Export-Package>org.eclipse.jetty.security;version=${project.version}</Export-Package>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
- </execution>
+ </execution>
</executions>
</plugin>
<plugin>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index bdb2e0428f..6388ab154c 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -8,26 +8,20 @@
<artifactId>jetty-server</artifactId>
<name>Jetty :: Server Core</name>
<description>The core jetty server artifact.</description>
+ <url>${jetty.url}</url>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
+ <id>generate-manifest</id>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.server</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- <!-- <Import-Package>!org.eclipse.jetty.*,!org.eclipse.xml.*,!org.eclipse.resource.*,!org.eclipse.io.*,!org.eclipse.servlet.jetty.*,javax.servlet.resources;resolution:=optional,javax.servlet.jsp;resolution:=optional,org.apache.jasper.servlet;resolution:=optional,org.eclipse.jetty.handler.management;resolution:=optional,*</Import-Package> -->
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index 26b3ae98d7..80b4881e9c 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -14,21 +14,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.servlet</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Export-Package>org.eclipse.jetty.servlet;version=${project.version}</Export-Package>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index cbd6fc45ec..43d5ecdb8e 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -14,22 +14,14 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.servlets</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Export-Package>org.eclipse.jetty.servlets;version=${project.version}</Export-Package>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
- </execution>
+ </execution>
</executions>
</plugin>
<plugin>
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 329e89b87c..31f1e43417 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -22,11 +22,7 @@
</goals>
<configuration>
<instructions>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Export-Package>org.eclipse.jetty.util.*</Export-Package>
- <Private-Package></Private-Package>
<Import-Package>org.slf4j;resolution:=optional,*</Import-Package>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
</instructions>
</configuration>
</execution>
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 376bf138f9..59629abf78 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -30,21 +30,14 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Export-Package>org.eclipse.jetty.webapp;version=${project.version}</Export-Package>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
- </execution>
+ </execution>
</executions>
</plugin>
<plugin>
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index e4bf929c08..ddb27b6ff6 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -13,22 +13,14 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>${felix.bundle.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>manifest</goal>
</goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.xml</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Export-Package>org.eclipse.jetty.xml;version=${project.version}</Export-Package>
- <Bundle-DocURL>http://jetty.eclipse.org</Bundle-DocURL>
- </instructions>
- </configuration>
- </execution>
+ </execution>
</executions>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index cefd070da4..8011b0e03f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,23 +10,26 @@
<artifactId>jetty-project</artifactId>
<version>7.0.0.M0-SNAPSHOT</version>
<name>Jetty :: Project</name>
+ <url>${jetty.url}</url>
<packaging>pom</packaging>
<properties>
+ <jetty.url>http://www.eclipse.org/jetty</jetty.url>
+ <felix.bundle.version>2.0.0</felix.bundle.version>
<activation-version>1.1</activation-version>
<ant-version>1.6.5</ant-version>
<jta-spec-version>1.1.1</jta-spec-version>
<junit-version>3.8.2</junit-version>
<mail-version>1.4</mail-version>
- <slf4j-version>[1.4,1.6)</slf4j-version>
+ <slf4j-version>1.5.6</slf4j-version>
<eclipse-compiler-version>3.1.1</eclipse-compiler-version>
<glassfish-version-tag>9.1.02.B04.p0</glassfish-version-tag>
<cometd-version>1.0.beta4</cometd-version>
</properties>
<scm>
- <connection>scm:svn:https://svn.codehaus.org/jetty/jetty/trunk</connection>
- <developerConnection>scm:svn:https://svn.codehaus.org/jetty/jetty/trunk</developerConnection>
- <url>scm:svn:https://svn.codehaus.org/jetty/jetty/trunk</url>
+ <connection>scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</connection>
+ <developerConnection>scm:svn:svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</developerConnection>
+ <url>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</url>
</scm>
<build>
<defaultGoal>install</defaultGoal>
@@ -42,55 +45,41 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <tagBase>https://svn.codehaus.org/jetty/jetty/tags</tagBase>
+ <tagBase>svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/tags</tagBase>
</configuration>
</plugin>
- <plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
- <mode>development</mode>
- <url>${pom.url}</url>
- <implementation-version>${pom.version}</implementation-version>
- <package>org.eclipse</package>
+ <Eclipse-Status>Incubation</Eclipse-Status>
</manifestEntries>
</archive>
</configuration>
- </plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.eclipse.jetty:jetty-build-resources:1.0.1</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
- </plugins>
- <pluginManagement>
- <plugins>
+ </plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.2</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.2</version>
+ <version>2.0.0</version>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <Bundle-DocURL>${jetty.url}</Bundle-DocURL>
+ <Bundle-Vendor>Eclipse.org - Jetty</Bundle-Vendor>
+ <Bundle-Copyright>Copyright (c) 2008-2009 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -132,47 +121,6 @@
<module>jetty-test-webapp</module>
<module>jetty-distribution</module>
</modules>
- <repositories>
- <repository>
- <id>codehaus.org</id>
- <name>Jetty Snapshot Repository</name>
- <layout>default</layout>
- <url>http://snapshots.repository.codehaus.org</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- <repository>
- <id>apache.plugin.snapshot</id>
- <name>Apache Snapshot Repository</name>
- <layout>default</layout>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
-
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.plugin.snapshot</id>
- <name>Apache Plugin Snapshot Repository</name>
- <layout>default</layout>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
@@ -237,3 +185,4 @@
</plugins>
</reporting>
</project>
+

Back to the top