Skip to content

Commit

Permalink
Merge pull request #204 from apache/refactoring/UIMA-6459-Upgrade-dep…
Browse files Browse the repository at this point in the history 
…endencies

[UIMA-6459] Upgrade dependencies
  • Loading branch information
@reckart
reckart committed May 20, 2022
2 parents 59d38c2 + e8e979e commit a47b98b
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 214 deletions.
2 changes: 1 addition & 1 deletion RELEASE_NOTES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

[What is UIMA?](#what.is.uima)
[Major Changes in this Release](#major.changes)
[List of JIRA Issues Fixed in this Release](#list.issues)
[How to Get Involved](#get.involved)
[How to Report Issues](#report.issues)
[List of JIRA Issues Fixed in this Release](#list.issues)

## <a id="what.is.uima">What is UIMA?</a>

Expand Down
Empty file added marker-file-enabling-auto-staging
View file
Empty file.
Empty file added marker-file-identifying-parent-pom
View file
Empty file.
117 changes: 16 additions & 101 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</scm>

<properties>
<jiraVersion>3.3.0SDK</jiraVersion>
<jiraVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}SDK</jiraVersion>
<assemblyBinDescriptor>src/main/assembly/bin-without-jackson.xml</assemblyBinDescriptor>
<postNoticeText>${ibmNoticeText}</postNoticeText>
</properties>
Expand Down Expand Up @@ -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>
Expand All @@ -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>


Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -392,67 +350,24 @@
<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>
</configuration>
</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>
Expand Down
112 changes: 0 additions & 112 deletions uimaj-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -290,91 +279,17 @@
<!-- 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>
</configuration>
</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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit a47b98b

Please sign in to comment.