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 2022/05/19 15:52:24 UTC
[uima-uimafit] 01/01: [UIMA-6432] Upgrade dependencies
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/UIMA-6432-Upgrade-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit ae232030fb7cf2c3610806015a667921306f72fa
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu May 19 17:52:18 2022 +0200
[UIMA-6432] Upgrade dependencies
- UIMA Parent POM 14 -> 15-SNAPSHOT
- Remove enforcing of Java version - is done in the parent
- Remove explicit configuration of the changes plugin in favor of activating the respective profile from the parent POM using a marker file
- Enable auto-release-staging
---
marker-file-enabling-auto-staging | 0
marker-file-identifying-parent-pom | 0
pom.xml | 33 +----------------------
uimafit-parent/pom.xml | 54 --------------------------------------
4 files changed, 1 insertion(+), 86 deletions(-)
diff --git a/marker-file-enabling-auto-staging b/marker-file-enabling-auto-staging
new file mode 100644
index 0000000..e69de29
diff --git a/marker-file-identifying-parent-pom b/marker-file-identifying-parent-pom
new file mode 100644
index 0000000..e69de29
diff --git a/pom.xml b/pom.xml
index 2c2e350..1cabbcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<relativePath>uimafit-parent</relativePath>
</parent>
<properties>
- <jiraVersion>3.2.0uimaFIT</jiraVersion>
+ <jiraVersion>3.3.0uimaFIT</jiraVersion>
</properties>
<scm>
<connection>scm:git:git://github.com/apache/uima-uimafit</connection>
@@ -145,35 +145,4 @@
<module>uimafit-benchmark</module>
<module>uimafit-parent</module>
</modules>
-
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <!-- Run jira report -->
- <!-- depends on having -DjiraVersion set -->
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.11</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>default-cli</id>
- <goals>
- <goal>jira-report</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <fixVersionIds>${jiraVersion}</fixVersionIds>
- <component>uimaFIT,uimaFIT-Maven-Plugin</component>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/uimafit-parent/pom.xml b/uimafit-parent/pom.xml
index f8c3237..cd4fe6e 100644
--- a/uimafit-parent/pom.xml
+++ b/uimafit-parent/pom.xml
@@ -412,61 +412,7 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <id>enforce-prerequisites</id>
- <phase>verify</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[1.8.0,)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
</build>
-
- <profiles>
- <profile>
- <id>apache-release</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <!--
- - Ensure that releases are made with a Java 1.8 since that's our minimum
- - version atm.
- -->
- <version>[1.8,1.9)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
\ No newline at end of file