This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/UIMA-6459-Upgrade-dependencies in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit ec3ba0017cde91ffd9a2c1c1352e581e490eab28 Author: Richard Eckart de Castilho <r...@apache.org> AuthorDate: Thu May 19 16:21:05 2022 +0200 [UIMA-6459] Upgrade dependencies (UIMAJ 3.4.0) - UIMA Parent POM 14 -> 15-SNAPSHOT - Remove auto-release-staging configuration and tycho configurations which are already in parent POM 15 --- marker-file-enabling-auto-staging | 0 marker-file-identifying-parent-pom | 0 pom.xml | 115 +++++-------------------------------- uimaj-parent/pom.xml | 114 +----------------------------------- 4 files changed, 16 insertions(+), 213 deletions(-) diff --git a/marker-file-enabling-auto-staging b/marker-file-enabling-auto-staging new file mode 100644 index 000000000..e69de29bb diff --git a/marker-file-identifying-parent-pom b/marker-file-identifying-parent-pom new file mode 100644 index 000000000..e69de29bb diff --git a/pom.xml b/pom.xml index 6b02eacf5..5130c9b3e 100644 --- a/pom.xml +++ b/pom.xml @@ -138,22 +138,22 @@ <groupId>org.apache.uima</groupId> <artifactId>uimaj-json</artifactId> <version>${project.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-v3migration-jcas</artifactId> <version>${project.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.bitbucket.mstrobel</groupId> <artifactId>procyon-core</artifactId> <version>0.5.32</version> - </dependency> + </dependency> <dependency> <groupId>org.bitbucket.mstrobel</groupId> <artifactId>procyon-compilertools</artifactId> <version>0.5.32</version> - </dependency> + </dependency> <dependency> <!-- apache v2 license 2016 checked --> <groupId>com.github.javaparser</groupId> <artifactId>javaparser-core</artifactId> @@ -172,18 +172,17 @@ <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <version>${log4j-version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> <version>${log4j-version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> <version>${log4j-version}</version> - </dependency> - + </dependency> </dependencies> @@ -272,6 +271,7 @@ <!-- default configuration --> <configuration> <excludes combine.children="append"> + <exclude>marker-file-rc-auto-staging-module</exclude> <!-- These markdown files cannot bear a license header --> <exclude>NOTICE.md</exclude> <exclude>src/main/bin_distr_license_notices/NOTICE.md</exclude> @@ -333,50 +333,8 @@ <profile> <id>apache-release</id> - <properties> - <releaseCandidateNum></releaseCandidateNum> - <staging-scm-root>scm:svn:https://dist.apache.org/repos/dist/dev/uima/</staging-scm-root> - <staging-local-root>${project.build.directory}/staging</staging-local-root> - <staging-folder>${project.artifactId}-${project.version}-RC-${staging-timestamp}-${candidate-id}</staging-folder> - </properties> - <build> - <!-- Run jira report --> - <!-- depends on having -DjiraVersion set --> <plugins> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - <inherited>false</inherited> - <executions> - <execution> - <id>default-cli</id> - <configuration> - <fixVersionIds>${jiraVersion}</fixVersionIds> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <inherited>false</inherited> - <executions> - <execution> - <id>generate-candidate-id</id> - <phase>initialize</phase> - <goals> - <goal>create</goal> - </goals> - <configuration> - <buildNumberPropertyName>candidate-id</buildNumberPropertyName> - <timestampPropertyName>staging-timestamp</timestampPropertyName> - <shortRevisionLength>7</shortRevisionLength> - <timestampFormat>yyyyMMddHHmm</timestampFormat> - <timezone>Z</timezone> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> @@ -392,17 +350,17 @@ <mkdir dir="${staging-local-root}/${staging-folder}" /> <copy todir="${staging-local-root}/${staging-folder}"> <fileset dir="${project.build.directory}"> - <include name="uimaj-${project.version}-*.zip"/> - <include name="uimaj-${project.version}-*.zip.asc"/> - <include name="uimaj-${project.version}-*.zip.sha512"/> - <include name="uimaj-${project.version}-*.tar.gz"/> - <include name="uimaj-${project.version}-*.tar.gz.asc"/> - <include name="uimaj-${project.version}-*.tar.gz.sha512"/> + <include name="uimaj-${project.version}-*.zip" /> + <include name="uimaj-${project.version}-*.zip.asc" /> + <include name="uimaj-${project.version}-*.zip.sha512" /> + <include name="uimaj-${project.version}-*.tar.gz" /> + <include name="uimaj-${project.version}-*.tar.gz.asc" /> + <include name="uimaj-${project.version}-*.tar.gz.sha512" /> </fileset> </copy> <copy todir="${staging-local-root}/${staging-folder}/eclipse-update-site"> <fileset dir="uimaj-eclipse-update-site/target/repository"> - <include name="**/*"/> + <include name="**/*" /> </fileset> </copy> </target> @@ -410,49 +368,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <connectionType>developerConnection</connectionType> - <developerConnectionUrl>${staging-scm-root}</developerConnectionUrl> - </configuration> - <executions> - <execution> - <id>checkout-staging</id> - <phase>initialize</phase> - <goals> - <goal>checkout</goal> - </goals> - <configuration> - <checkoutDirectory>${staging-local-root}</checkoutDirectory> - </configuration> - </execution> - <execution> - <id>add-staging-files</id> - <phase>deploy</phase> - <goals> - <goal>add</goal> - </goals> - <configuration> - <basedir>${staging-local-root}</basedir> - <includes>${staging-folder}/**/*</includes> - </configuration> - </execution> - <execution> - <id>commit-staging-files</id> - <phase>deploy</phase> - <goals> - <goal>checkin</goal> - </goals> - <configuration> - <basedir>${staging-local-root}</basedir> - <message>Staging release artifacts for ${project.artifactId}-${project.version}-RC-${staging-timestamp}-${candidate-id}</message> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </profile> diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml index f2f759d00..6d70c1978 100644 --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml @@ -32,7 +32,7 @@ <groupId>org.apache.uima</groupId> <artifactId>parent-pom</artifactId> <relativePath /> - <version>15-SNAPSHOT</version> + <version>15-meep</version> </parent> <artifactId>uimaj-parent</artifactId> @@ -119,20 +119,9 @@ <name>artifactory.openntf.org</name> <url>https://artifactory.openntf.org/openntf</url> </pluginRepository> - - <pluginRepository> - <id>tycho-snapshots</id> - <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> </pluginRepositories> <properties> - <!-- versions >= 2.7.1 seem to have a bug that they embed bundle JARs --> - <tycho-version>2.7.3-SNAPSHOT</tycho-version> - <!-- Configuring settings is best done through default properties that multiple plugins. Local configurations within plugins should be avoided. Where plugins do not pick up default @@ -290,7 +279,6 @@ <!-- default configuration --> <configuration> <excludes combine.children="append"> - <exclude>**/.tycho-consumer-pom.xml</exclude> <!-- Eclipse launch files - no need for a license --> <exclude>**/run_configuration/*.launch</exclude> </excludes> @@ -298,83 +286,10 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <!-- - - We do not need the 'org.apache.maven.plugins:maven-scm-plugin:1.9.5:checkin' goal - - here because the release plugin automatically commits twice during the 'prepare' phase - --> - <preparationGoals> - org.eclipse.tycho:tycho-versions-plugin:${tycho-version}:update-eclipse-metadata - org.apache.maven.plugins:maven-scm-plugin:1.9.5:add - </preparationGoals> - <completionGoals> - org.eclipse.tycho:tycho-versions-plugin:${tycho-version}:update-eclipse-metadata - org.apache.maven.plugins:maven-scm-plugin:1.9.5:add - </completionGoals> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-plugin</artifactId> - <executions> - <execution> - <id>default-cli</id> - <goals> - <goal>add</goal> - <goal>checkin</goal> - </goals> - <configuration> - <includes> - uimaj-eclipse-*/META-INF/MANIFEST.MF, - uimaj-eclipse-*/feature.xml, - uimaj-eclipse-*/*.product, - uimaj-eclipse-*/category.xml - </includes> - <excludes>**/target/**</excludes> - <message>Changing the Eclipse files versions</message> - </configuration> - </execution> - </executions> - </plugin> </plugins> </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> - <profile> <id>jacoco</id> <build> @@ -440,33 +355,6 @@ </pluginManagement> </build> </profile> - - <profile> - <id>tycho-module</id> - <activation> - <file> - <exists>marker-file-identifying-tycho-module</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-maven-plugin</artifactId> - <version>${tycho-version}</version> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho-version}</version> - <configuration> - <pomDependencies>consider</pomDependencies> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> <scm>