Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

This commit is contained in:
Greg Wilkins 2011-08-31 17:08:08 +10:00
commit 582655ef52
3 changed files with 5 additions and 32 deletions

View File

@ -26,7 +26,7 @@
<name>Jetty :: Monitoring</name> <name>Jetty :: Monitoring</name>
<description>Performance monitoring artifact for jetty.</description> <description>Performance monitoring artifact for jetty.</description>
<properties> <properties>
<bundle-symbolic-name>${project.groupId}.jmx</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.monitor</bundle-symbolic-name>
</properties> </properties>
<build> <build>
<plugins> <plugins>
@ -83,39 +83,11 @@
<forkMode>always</forkMode> <forkMode>always</forkMode>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-jetty-distro</id>
<phase>process-test-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-distribution</artifactId>
<version>${project.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
</artifactItem>
</artifactItems>
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
<outputDirectory>${test-dist-dir}</outputDirectory>
<overWriteSnapshots>true</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>
<configuration> <configuration>
<onlyAnalyze>org.eclipse.jetty.jmx.*</onlyAnalyze> <onlyAnalyze>org.eclipse.jetty.monitor.*</onlyAnalyze>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

View File

@ -10,7 +10,8 @@
<properties> <properties>
<jetty-version>${project.version}</jetty-version> <jetty-version>${project.version}</jetty-version>
<junit4-version>${junit-version}</junit4-version> <junit4-version>${junit-version}</junit4-version>
<bundle-symbolic-name>${project.groupId}.mongodb</bundle-symbolic-name> </properties> <bundle-symbolic-name>${project.groupId}.nosql</bundle-symbolic-name>
</properties>
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<plugins> <plugins>

View File

@ -350,6 +350,7 @@
<module>jetty-nested</module> <module>jetty-nested</module>
<module>jetty-overlay-deployer</module> <module>jetty-overlay-deployer</module>
<module>jetty-nosql</module> <module>jetty-nosql</module>
<module>jetty-distribution</module>
<module>test-continuation</module> <module>test-continuation</module>
<module>test-continuation-jetty6</module> <module>test-continuation-jetty6</module>
<module>test-jetty-servlet</module> <module>test-jetty-servlet</module>
@ -437,7 +438,6 @@
</activation> </activation>
<modules> <modules>
<module>jetty-aggregate</module> <module>jetty-aggregate</module>
<module>jetty-distribution</module>
</modules> </modules>
</profile> </profile>
<profile> <profile>