aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Whiteside2012-04-14 19:33:33 (EDT)
committerGlyn Normington2012-05-21 09:23:00 (EDT)
commit6684ab104bae97d705f8b1560af18e52a601494d (patch)
treed706661c15f2cbadbfa4019e97295d894a9cc035
parent6e38b784ba380cff838399b01fb61fd36d13c70b (diff)
downloadorg.eclipse.gemini.blueprint-6684ab104bae97d705f8b1560af18e52a601494d.zip
org.eclipse.gemini.blueprint-6684ab104bae97d705f8b1560af18e52a601494d.tar.gz
org.eclipse.gemini.blueprint-6684ab104bae97d705f8b1560af18e52a601494d.tar.bz2
More maven build fixes
- Updated clover to latest stable release 2.5.1 -> 3.1.4 - removed resource definition that included spring's license.txt and notice.txt as they no longer exist in the repository - updated various maven plugin to there latest versions - added missing maven plugin definitions (needed to stop maven complaining about potential unstable builds) - forced the surefire plugin to use a junit 4.7+ style runner. - in the jarjar execution of the antrun plugin updated <tasks/> to <target/> as tasks is deprecated. - removed commented out surefire plugin definition - removed assembly plugin definition, as the assembly file it points to no longer exists - moved the <reporting/> section to the maven site plugin (this is the correct way to do it in maven 3.0+) - changed the spring-test dependency in core/pom.xml from scope provided to test
-rw-r--r--core/pom.xml2
-rw-r--r--pom.xml365
2 files changed, 193 insertions, 174 deletions
diff --git a/core/pom.xml b/core/pom.xml
index 3b08633..6958e4a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.aopalliance</groupId>
diff --git a/pom.xml b/pom.xml
index a7d6a79..7cecad2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
<!-- javadoc configuration -->
<javadoc.loc>${basedir}/docs/src/javadoc</javadoc.loc>
- <clover.ver>2.5.1</clover.ver>
+ <clover.ver>3.1.4</clover.ver>
<clover.argLine></clover.argLine>
<clover.skip>false</clover.skip>
@@ -379,73 +379,99 @@
<filtering>true</filtering>
<directory>src/main/resources</directory>
</resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <filtering>false</filtering>
- <directory>${spring.osgi.license.loc}</directory>
- <includes>
- <include>license.txt</include>
- <include>notice.txt</include>
- </includes>
- </resource>
</resources>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.3</version>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.12</version>
+ <dependencies>
+ <!-- force surefire to use new junit 4.7+ runner, it would normally auto detect this -->
+ <!-- but since we're not using the official junit dependency it is unable to do so.-->
+ <!-- - this makes things like @Ignore work. -->
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>2.12</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta1</version>
+ <version>2.0-beta-2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.1</version>
+ <version>2.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.7</version>
</plugin>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
@@ -458,6 +484,21 @@
<!--<version>1.0.0.RELEASE</version>-->
<version>1.0.0.M6</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.7.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.12</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -472,7 +513,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks if="jarjar.run">
+ <target if="jarjar.run">
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
classpathref="maven.plugin.classpath"/>
<property name="dep.jar" value="${jarjar.dep}"/>
@@ -484,7 +525,7 @@
excludes="META-INF/**,${jarjar.dep.1.exclude}"/>
<keep pattern="${jarjar.keep}"/>
</jarjar>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
@@ -610,20 +651,6 @@ Ignored-Existing-Headers:
<!--</configuration>-->
<!--</plugin>-->
-
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-surefire-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<systemProperties>-->
- <!--<property>-->
- <!--<name>org.eclipse.gemini.blueprint.test.framework</name>-->
- <!--<value>${osgi.test.platform}</value>-->
- <!--</property>-->
- <!--</systemProperties>-->
- <!--</configuration>-->
- <!--</plugin>-->
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -635,15 +662,6 @@ Ignored-Existing-Headers:
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>release/src/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
-
<!-- clover plug-in -->
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
@@ -673,6 +691,134 @@ Ignored-Existing-Headers:
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+
+ <!-- =============== -->
+ <!-- Javadocs -->
+ <!-- =============== -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile>
+ <overview>${javadoc.loc}/overview.html</overview>
+ <groups>
+ <group>
+ <title>OSGi Blueprint Service</title>
+ <packages>org.osgi.service.blueprint*</packages>
+ </group>
+ <group>
+ <title>Eclipse Gemini Blueprint Core</title>
+ <packages>org.eclipse.gemini.blueprint*</packages>
+ </group>
+ <group>
+ <title>Eclipse Gemini Blueprint Extender</title>
+ <packages>org.eclipse.gemini.blueprint.extender*</packages>
+ </group>
+ <group>
+ <title>Eclipse Gemini Blueprint IO</title>
+ <packages>org.eclipse.gemini.blueprint.io*</packages>
+ </group>
+ <group>
+ <title>Eclipse Gemini Blueprint Integration Testing Framework</title>
+ <packages>org.eclipse.gemini.blueprint.test*</packages>
+ </group>
+ <group>
+ <title>Eclipse Gemini Blueprint Mock</title>
+ <packages>org.eclipse.gemini.blueprint.mock*</packages>
+ </group>
+ </groups>
+ <excludePackageNames>
+ *internal:org.eclipse.gemini.blueprint.config:org.eclipse.gemini.blueprint.compendium.config:org.eclipse.gemini.blueprint.blueprint.config:org.eclipse.gemini.blueprint.blueprint.compendium.cm.config:org.eclipse.gemini.blueprint.iandt*
+ </excludePackageNames>
+
+ <breakiterator>true</breakiterator>
+ <quiet>true</quiet>
+ <verbose>false</verbose>
+ <show>protected</show>
+ <source>1.5</source>
+ <links>
+ <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+ <link>http://static.springsource.org/spring/docs/3.0.x/javadoc-api/</link>
+ <link>http://www2.osgi.org/javadoc/r4/</link>
+ <link>http://asm.objectweb.org/asm223/javadoc/user</link>
+ <link>http://cglib.sourceforge.net/apidocs</link>
+ <link>http://logging.apache.org/log4j/docs/api/</link>
+ <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+ <link>http://junit.org/junit/javadoc/4.9.0/</link>
+ <link>http://aopalliance.sourceforge.net/doc/</link>
+ </links>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+
+ <!-- ============== -->
+ <!-- FindBugs -->
+ <!-- ============== -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <!--
+ <xmlOutput>true</xmlOutput>
+ <xmlOutputDirectory>target</xmlOutputDirectory>
+ -->
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ <!--
+ <debug>true</debug>
+ <relaxed>true</relaxed>
+ -->
+ <skip>${findbugs.skip}</skip>
+ </configuration>
+ </plugin>
+
+ <!-- =========== -->
+ <!-- PMD -->
+ <!-- =========== -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+
+ <!-- ============== -->
+ <!-- jDepend -->
+ <!-- ============== -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
@@ -809,135 +955,8 @@ Ignored-Existing-Headers:
<!-- Website and reporting -->
<!-- ======================================= -->
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.12</version>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
-
- <!-- =============== -->
- <!-- Javadocs -->
- <!-- =============== -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <aggregate>true</aggregate>
- <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile>
- <overview>${javadoc.loc}/overview.html</overview>
- <groups>
- <group>
- <title>OSGi Blueprint Service</title>
- <packages>org.osgi.service.blueprint*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Core</title>
- <packages>org.eclipse.gemini.blueprint*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Extender</title>
- <packages>org.eclipse.gemini.blueprint.extender*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint IO</title>
- <packages>org.eclipse.gemini.blueprint.io*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Integration Testing Framework</title>
- <packages>org.eclipse.gemini.blueprint.test*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Mock</title>
- <packages>org.eclipse.gemini.blueprint.mock*</packages>
- </group>
- </groups>
- <excludePackageNames>
- *internal:org.eclipse.gemini.blueprint.config:org.eclipse.gemini.blueprint.compendium.config:org.eclipse.gemini.blueprint.blueprint.config:org.eclipse.gemini.blueprint.blueprint.compendium.cm.config:org.eclipse.gemini.blueprint.iandt*
- </excludePackageNames>
-
- <breakiterator>true</breakiterator>
- <quiet>true</quiet>
- <verbose>false</verbose>
- <show>protected</show>
- <source>1.5</source>
- <links>
- <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
- <link>http://static.springsource.org/spring/docs/3.0.x/javadoc-api/</link>
- <link>http://www2.osgi.org/javadoc/r4/</link>
- <link>http://asm.objectweb.org/asm223/javadoc/user</link>
- <link>http://cglib.sourceforge.net/apidocs</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
- <link>http://junit.org/junit/javadoc/4.9.0/</link>
- <link>http://aopalliance.sourceforge.net/doc/</link>
- </links>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
- </plugin>
-
- <!-- ============== -->
- <!-- FindBugs -->
- <!-- ============== -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <!--
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target</xmlOutputDirectory>
- -->
- <threshold>Normal</threshold>
- <effort>Default</effort>
- <!--
- <debug>true</debug>
- <relaxed>true</relaxed>
- -->
- <skip>${findbugs.skip}</skip>
- </configuration>
- </plugin>
-
- <!-- =========== -->
- <!-- PMD -->
- <!-- =========== -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7</version>
- </plugin>
-
- <!-- ============== -->
- <!-- jDepend -->
- <!-- ============== -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
- </plugin>
- </plugins>
- </reporting>
-
<distributionManagement>
+ <!-- TODO: Update this with eclipse foundation specific data -->
<downloadUrl>http://www.springframework.org/osgi/</downloadUrl>
<site>
<id>static.springframework.org</id>