• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge 7.7.x branch back to trunk/master

* ui.bot.test plugin from master upped to 7.7.1

Merge taken from 7.7.x commit

* sha id 63909830dd9b8ac3857e227e7c6a992d9cb98b97

* svn revision 2657

Conflicts:

site/pom.xml

tests/org.teiid.designer.ui.bot.ext/META-INF/MANIFEST.MF

tests/org.teiid.designer.ui.bot.ext/pom.xml

tests/org.teiid.designer.ui.bot.test/pom.xml

tests/org.teiid.designer.ui.bot.tests/META-INF/MANIFEST.MF

  1. … 581 more files in changeset.
TEIIDDES-1190 Upgrade to 7.7 version number
  1. … 342 more files in changeset.
TEIIDDES-1081 Updating version to 7.6.0
  1. … 237 more files in changeset.
TEIIDDES-936 Upgrading trunk to 7.5 label
  1. … 225 more files in changeset.
TEIIDDES-884 Upgrade to 7.4 version
  1. … 107 more files in changeset.
Upgrade to 7.3 Version number
  1. … 234 more files in changeset.
TEIIDDES-471 Turn on night tests. Added 3 new test plugins that only contain framework/support classes (no tests). Deleted 3 projects: org.teiid.designer.metamodels.dependency.test, org.teiid.designer.metamodels.webservice.test, and org.teiid.designer.modelgenerator.test. Commented out 6 projects so that their tests will not run. Most of these are not running because of Tycho problems with using the PowerMockRunner.
  1. … 125 more files in changeset.
Upgrading 7.1 to 7.2.0.qualifier
  1. … 34 more files in changeset.
TEIIDDES-471 Restore nightly test changes overridden during 7.1-trunk merge.
  1. … 249 more files in changeset.
Merging 7.1 branch changes into trunk
  1. … 324 more files in changeset.
TEIIDDES-471 Turn on night tests: Moving mockito and powermock dependencies from test framgment to associated host plugin as an optional dependency. Will do a test build to see if this gets rid of the build errors associated with PowerMock and Mockito.
  1. … 9 more files in changeset.
TEIIDDES-471 Turn on nightly tests. Turned all test projects into plugin fragments so OSGi testing (JUnit Plugin Tests). Modified POMs and created a test feature.
  1. … 294 more files in changeset.
TEIIDDES-556 Update to 7.1.0 Release version
  1. … 214 more files in changeset.
META-INF/MANIFEST.MF version should match pom.xml version
Added some VDB-related tests. Reviewed by JPAV.
  1. … 2 more files in changeset.
Moving project under the tests folder.
  1. … 17 more files in changeset.