You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2020/02/02 13:14:38 UTC
[uima-uimafit] branch
UIMA-6184-Move-code-quality-profiles-to-parent-POM created (now a1e8c02)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch UIMA-6184-Move-code-quality-profiles-to-parent-POM
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git.
at a1e8c02 [UIMA-6184] Move code quality profiles to parent POM
This branch includes the following new commits:
new a1e8c02 [UIMA-6184] Move code quality profiles to parent POM
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[uima-uimafit] 01/01: [UIMA-6184] Move code quality profiles to
parent POM
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch UIMA-6184-Move-code-quality-profiles-to-parent-POM
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit a1e8c02f9b0cb20f28119c8316c899a0a8a4d532
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Sun Feb 2 14:14:31 2020 +0100
[UIMA-6184] Move code quality profiles to parent POM
- Remove profiles which are already declared in UIMA parent POM from this one
- Renamed property "compat.previous.version" to "api_check_oldVersion" to be in-line with UIMA parent POM
- Define japcmp.postAnalysisScript property as required by UIMA parent POM enforce-compatibility profile
- Renamed marker files to activate compatibility check profile to be in-line with UIMA parent POM
- Upgrade to UIMA parent POM 14-SNAPSHOT
---
...marker-file-identifying-api-compatibility-check | 0
...marker-file-identifying-api-compatibility-check | 0
...marker-file-identifying-api-compatibility-check | 0
uimafit-parent/pom.xml | 175 ++-------------------
...marker-file-identifying-api-compatibility-check | 0
5 files changed, 16 insertions(+), 159 deletions(-)
diff --git a/uimafit-spring/.activate-enforce-compatibility b/uimafit-core/marker-file-identifying-api-compatibility-check
similarity index 100%
rename from uimafit-spring/.activate-enforce-compatibility
rename to uimafit-core/marker-file-identifying-api-compatibility-check
diff --git a/uimafit-legacy-support/.activate-enforce-compatibility b/uimafit-cpe/marker-file-identifying-api-compatibility-check
similarity index 100%
rename from uimafit-legacy-support/.activate-enforce-compatibility
rename to uimafit-cpe/marker-file-identifying-api-compatibility-check
diff --git a/uimafit-cpe/.activate-enforce-compatibility b/uimafit-legacy-support/marker-file-identifying-api-compatibility-check
similarity index 100%
rename from uimafit-cpe/.activate-enforce-compatibility
rename to uimafit-legacy-support/marker-file-identifying-api-compatibility-check
diff --git a/uimafit-parent/pom.xml b/uimafit-parent/pom.xml
index 9802a26..c08dc1e 100644
--- a/uimafit-parent/pom.xml
+++ b/uimafit-parent/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
<relativePath />
- <version>13</version>
+ <version>14-SNAPSHOT</version>
</parent>
<artifactId>uimafit-parent</artifactId>
<version>2.5.0-SNAPSHOT</version>
@@ -23,7 +23,7 @@
NON_BACKWARD_COMPATIBLE - major version (+.0.0)
-->
<compat.level>BACKWARD_COMPATIBLE_USER</compat.level>
- <compat.previous.version>2.4.0</compat.previous.version>
+ <api_check_oldVersion>2.4.0</api_check_oldVersion>
</properties>
<!--
- Only required while uimaFIT depends on unreleased versions of UIMA.
@@ -195,12 +195,11 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
<executions>
<execution>
<id>default-cli</id>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<!-- Plain documentation -->
<exclude>README*</exclude>
<!-- Release files -->
@@ -225,7 +224,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@@ -235,7 +233,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -307,36 +304,15 @@
</build>
<profiles>
<profile>
- <id>spotbugs</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.1.12.2</version>
- <executions>
- <execution>
- <id>default</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>enforce-compatibility</id>
<activation>
<file>
- <exists>.activate-enforce-compatibility</exists>
+ <exists>marker-file-identifying-api-compatibility-check</exists>
</file>
</activation>
+ <properties>
+ <japicmp.postAnalysisScript>${project.basedir}/../uimafit-parent/src/main/groovy/api-report.groovy</japicmp.postAnalysisScript>
+ </properties>
<build>
<pluginManagement>
<plugins>
@@ -359,7 +335,7 @@
<configuration>
<rules>
<requireBackwardCompatibility implementation="org.semver.enforcer.RequireBackwardCompatibility">
- <previousVersion>${compat.previous.version}</previousVersion>
+ <previousVersion>${api_check_oldVersion}</previousVersion>
<dumpDetails>true</dumpDetails>
<compatibilityType>${compat.level}</compatibilityType>
</requireBackwardCompatibility>
@@ -368,135 +344,16 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <configuration>
- <excludes combine.children="append">
- <exclude>**/api-change-report/**/*.*</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <!-- https://siom79.github.io/japicmp/MavenPlugin.html -->
- <plugin>
- <groupId>com.github.siom79.japicmp</groupId>
- <artifactId>japicmp-maven-plugin</artifactId>
- <version>0.9.3</version>
- <configuration>
- <oldVersion>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${compat.previous.version}</version>
- </dependency>
- </oldVersion>
- <parameter>
- <onlyModified>true</onlyModified>
- <!-- filter out classes with impl in their package or class name -->
- <postAnalysisScript>${project.basedir}/../uimafit-parent/src/main/groovy/api-report.groovy</postAnalysisScript>
- <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>
- <reportOnlyFilename>true</reportOnlyFilename>
- </parameter>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>cmp</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- This copy is to have the api change report included in the source distribution -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-API-change-report</id>
- <phase>install</phase> <!-- must follow verify -->
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <taskdef name="if" classname="net.sf.antcontrib.logic.IfTask" />
- <if>
- <available file="${project.build.directory}/japicmp/" />
- <then>
- <copy toDir="${basedir}/api-change-report">
- <fileset dir="${project.build.directory}/japicmp" />
- </copy>
- </then>
- </if>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>m2e</id>
- <activation>
- <property>
- <name>m2e.version</name>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <!--
- - This plugin's configuration is used to store Eclipse m2e settings only.
- - It has no influence on the Maven build itself.
- -->
+
+ <!-- https://siom79.github.io/japicmp/MavenPlugin.html -->
<plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
<configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <versionRange>[1.5,)</versionRange>
- <goals>
- <goal>execute</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <versionRange>[3.5.2,)</versionRange>
- <goals>
- <goal>descriptor</goal>
- <goal>helpmojo</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
+ <parameter combine.children="append">
+ <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>
+ <reportOnlyFilename>true</reportOnlyFilename>
+ </parameter>
</configuration>
</plugin>
</plugins>
diff --git a/uimafit-core/.activate-enforce-compatibility b/uimafit-spring/marker-file-identifying-api-compatibility-check
similarity index 100%
rename from uimafit-core/.activate-enforce-compatibility
rename to uimafit-spring/marker-file-identifying-api-compatibility-check