Skip to content

Comments

[UIMA-6236] Migrating apache uima ruta from svn to git#4

Merged
reckart merged 6 commits intomasterfrom
UIMA-6236-Migrating-Apache-UIMA-Ruta-from-SVN-to-git
May 17, 2020
Merged

[UIMA-6236] Migrating apache uima ruta from svn to git#4
reckart merged 6 commits intomasterfrom
UIMA-6236-Migrating-Apache-UIMA-Ruta-from-SVN-to-git

Conversation

@reckart
Copy link
Member

@reckart reckart commented May 17, 2020

  • Add .gitattributes
  • Add .gitignore
  • Update SCM information in pom.xml files
  • Formatting POM files (mainly tabs to spaces)
  • Update SVN -> Git locatioin in documentation
  • Added README.md

reckart added 6 commits May 14, 2020 21:38
- Update SCM information in pom.xml files
- Formatting POM files (mainly tabs to spaces)
- Update SVN -> Git locatioin in documentation
- Better formatting of build status badges
- Preparing branch for merging into master

Merge branch 'master' into UIMA-6236-Migrating-Apache-UIMA-Ruta-from-SVN-to-git

* master: (70 commits)
  [UIMA-6233] Failing unit tests depending on test execution order
  [UIMA-6231] Reducing memory pressure generated by UIMA Ruta
  [NO JIRA] Copying v3 code to a branch under the v2 spot so it gets included in the GitHub mirror.
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release ruta-3.0.1
  UIMA-6194: merge v2 changes
  no jira - manual rollback
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release ruta-3.0.1
  merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, UIMA-6191, UIMA-6183, UIMA-6171
  no jira - update updatesite version
  no jira - preparations fro next release - updated versions - updated jira version - updated release notes
  UIMA-6183: fix NPE and visibility problems of literal string matches in v3, behavior adapted in order to avoid unexpected matching within tokens
  no jira - fix readme/release-notes according rc review
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release ruta-3.0.0
  no jira - improve release-notes
  no jira - improve release-notes
  no jira fix jira version, improve readme/release-notes
  no jira - manual rollback
  ...

# Conflicts:
#	example-projects/ruta-maven-example/pom.xml
#	pom.xml
#	ruta-basic-type/pom.xml
#	ruta-core-ext/pom.xml
#	ruta-core/pom.xml
#	ruta-docbook/pom.xml
#	ruta-docbook/src/docbook/tools.ruta.howtos.xml
#	ruta-eclipse-feature/pom.xml
#	ruta-eclipse-update-site/pom.xml
#	ruta-ep-addons/pom.xml
#	ruta-ep-caseditor/pom.xml
#	ruta-ep-core-ext/pom.xml
#	ruta-ep-engine/pom.xml
#	ruta-ep-ide-ui/pom.xml
#	ruta-ep-ide/pom.xml
#	ruta-ep-parent/pom.xml
#	ruta-ep-textruler/pom.xml
#	ruta-maven-archetype/pom.xml
#	ruta-maven-plugin/pom.xml
#	ruta-parent/pom.xml
#	ruta-typesystem/pom.xml
@reckart reckart added this to the 3.0.2 milestone May 17, 2020
@reckart reckart self-assigned this May 17, 2020
@reckart reckart merged commit 0b67cab into master May 17, 2020
@reckart reckart deleted the UIMA-6236-Migrating-Apache-UIMA-Ruta-from-SVN-to-git branch May 17, 2020 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant