modules/enterprise/server/jar/pom.xml | 120 ++--------------------------------
pom.xml | 31 +++++---
2 files changed, 28 insertions(+), 123 deletions(-)
New commits:
commit 61803672ded5471c17b57a6d1d7d93646acf0462
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Feb 28 15:01:32 2013 +0100
Getting the API check ready for separately versioned parts of RHQ.
To execute an API check build, you only need to -Psignature-check. No need
specify the base version anymore because that is now resolved per module
from maven as the latest RELEASED and published version (as opposed to
LATEST).
diff --git a/modules/enterprise/server/jar/pom.xml
b/modules/enterprise/server/jar/pom.xml
index d59460f..bd5437a 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -621,6 +621,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Remote</include>
+ <include>**/ServerVersion</include>
+ </includes>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -987,116 +997,6 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>cobertura</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.cobertura</groupId>
- <artifactId>cobertura</artifactId>
- <version>${cobertura.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>cobertura-instrument</id>
- <phase>process-test-classes</phase>
- <configuration>
- <target>
- <!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura"/>
- <mkdir dir="target/cobertura/backup"/>
- <!-- backup all classes so that we can instrument the original
classes-->
- <copy toDir="target/cobertura/backup"
verbose="true" overwrite="true">
- <fileset dir="target/classes">
- <include name="**/*.class"/>
- </fileset>
- </copy>
- <!-- create a properties file and save there location of cobertura
data file-->
- <touch file="target/classes/cobertura.properties"/>
- <echo
file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties"/>
- <!-- instrument all classes in target/classes directory -->
- <cobertura-instrument
datafile="${project.build.directory}/cobertura/cobertura.ser"
- todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/classes">
- <include name="**/*.class"/>
- <exclude
name="**/DynamicConfigurationPropertyLocal.class"/>
- <exclude
name="**/DynamicConfigurationPropertyBean.class"/>
- </fileset>
- </cobertura-instrument>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>cobertura-report</id>
- <phase>prepare-package</phase>
- <configuration>
- <target>
- <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties"/>
- <!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura"/>
- <mkdir dir="target/site/cobertura"/>
- <!-- restore classes from backup folder to classes folder -->
- <copy toDir="target/classes" verbose="true"
overwrite="true">
- <fileset dir="target/cobertura/backup">
- <include name="**/*.class"/>
- </fileset>
- </copy>
- <!-- delete backup folder-->
- <delete dir="target/cobertura/backup"/>
- <!-- create a code coverage report -->
- <cobertura-report format="html"
datafile="${project.build.directory}/cobertura/cobertura.ser"
- destdir="${project.build.directory}/site/cobertura">
- <fileset dir="${basedir}/src/main/java">
- <include name="**/*.java"/>
- </fileset>
- </cobertura-report>
- <!-- delete cobertura.properties file -->
- <delete file="target/classes/cobertura.properties"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>signature-check</id>
- <activation>
- <property>
- <name>signature-check-base-version</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>${clirr.version}</version>
- <configuration>
- <includes>
- <include>**/*Remote</include>
- <include>**/ServerVersion</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
</profiles>
<reporting>
diff --git a/pom.xml b/pom.xml
index afd1a61..b049493 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,10 +230,6 @@
part of our public API and is therefore not API-checked. -->
<rhq.internal>true</rhq.internal>
- <!-- The name of the file in the module's root dir that contains the
intentional
- api changes to be ignored by Clirr api checks -->
-
<intentional-api-changes-file>intentional-api-changes-since-${signature-check-base-version}.xml</intentional-api-changes-file>
-
<jacoco.version>0.6.0.201210061924</jacoco.version>
<jacoco-arquillian-extension.version>1.0.0.Alpha5</jacoco-arquillian-extension.version>
</properties>
@@ -831,7 +827,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.7</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1689,17 +1685,26 @@
<profile>
<id>signature-check</id>
- <activation>
- <property>
- <name>signature-check-base-version</name>
- </property>
- </activation>
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>version-resolver</id>
+ <goals>
+ <goal>released-version</goal>
+ </goals>
+ <configuration>
+
<propertyPrefix>signature-check-base</propertyPrefix>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>${clirr.version}</version>
<executions>
<execution>
<id>signature-check</id>
@@ -1711,7 +1716,7 @@
<comparisonArtifact>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
-
<version>${signature-check-base-version}</version>
+
<version>${signature-check-base.version}</version>
</comparisonArtifact>
</comparisonArtifacts>
<logResults>true</logResults>
@@ -1719,7 +1724,7 @@
<failOnError>true</failOnError>
<failOnWarning>true</failOnWarning>
<skip>${rhq.internal}</skip>
-
<ignoredDifferencesFile>${intentional-api-changes-file}</ignoredDifferencesFile>
+
<ignoredDifferencesFile>intentional-api-changes-since-${signature-check-base.version}.xml</ignoredDifferencesFile>
</configuration>
</execution>
</executions>
Show replies by date