[271150] updates to allow for deploying jetty javadoc and jxr info to website, also adjust osgi bundle info

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@128 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Jesse McConnell 2009-04-10 18:40:51 +00:00
parent 5223f5b8bd
commit 7e772a6078
2 changed files with 32 additions and 18 deletions

View File

@ -22,11 +22,6 @@
<goals> <goals>
<goal>manifest</goal> <goal>manifest</goal>
</goals> </goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="[2.5,3.0)",*</Import-Package>
</instructions>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>

45
pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-parent</artifactId> <artifactId>jetty-parent</artifactId>
<version>8</version> <version>9-SNAPSHOT</version>
</parent> </parent>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId> <artifactId>jetty-project</artifactId>
@ -74,12 +74,13 @@
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Bundle-DocURL>${jetty.url}</Bundle-DocURL> <Bundle-DocURL>${jetty.url}</Bundle-DocURL>
<Bundle-Vendor>Eclipse.org - Jetty</Bundle-Vendor> <Bundle-Vendor>Eclipse.org - Jetty</Bundle-Vendor>
<Bundle-Localization>plugin</Bundle-Localization>
<Bundle-Classpath>.</Bundle-Classpath>
<Bundle-Copyright>Copyright (c) 2008-2009 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright> <Bundle-Copyright>Copyright (c) 2008-2009 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy> <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions> </instructions>
@ -179,14 +180,32 @@
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<reporting> <profiles>
<plugins> <profile>
<plugin> <id>aggregate-site</id>
<groupId>org.apache.maven.plugins</groupId> <build>
<artifactId>maven-project-info-reports-plugin</artifactId> <plugins>
<version>2.0</version> <plugin>
</plugin> <groupId>org.apache.maven.plugins</groupId>
</plugins> <artifactId>maven-jxr-plugin</artifactId>
</reporting> <configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<excludePackageNames>com.acme</excludePackageNames>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
<link>http://java.sun.com/javaee/5/docs/api</link>
<link>http://junit.sourceforge.net/javadoc/</link>
</links>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>