diff options
| author | Quentin Le Menez | 2018-04-22 09:47:54 +0000 |
|---|---|---|
| committer | Quentin Le Menez | 2018-04-22 13:43:28 +0000 |
| commit | aea9db22620bbc8b466b48ea7dd958bd004c91e4 (patch) | |
| tree | d2f1994c8a9b97247accfa8b198a47a7a500d108 /tests/junit | |
| parent | 583f3e40fbbd646a5e13b3db29bbba77fb9efb0a (diff) | |
| download | org.eclipse.papyrus-aea9db22620bbc8b466b48ea7dd958bd004c91e4.tar.gz org.eclipse.papyrus-aea9db22620bbc8b466b48ea7dd958bd004c91e4.tar.xz org.eclipse.papyrus-aea9db22620bbc8b466b48ea7dd958bd004c91e4.zip | |
Bug 533804 - [Diagram] Update batik dependencies for 1.9.1
- Update the targetplatforms to set the required dependency to 1.9.1 from the latest M6 Orbit repository
- Rebase the platforms on the latest integration builds
Change-Id: Ib57fb5c3b322fcd880ec4f7a7d1ba06b9bfea2a2
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'tests/junit')
2 files changed, 11 insertions, 1 deletions
diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java index 9ac4563248c..765d46ef28a 100755 --- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java +++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java @@ -56,7 +56,7 @@ public class BundlesTests extends AbstractPapyrusTest { private static final String INCUBATION_KEYWORD = "(Incubation)"; //$NON-NLS-1$ - private static final String BATIK_VERSION = "\"[1.6.0,1.7.0)\""; //$NON-NLS-1$ + private static final String BATIK_VERSION = "\"[1.9.1,2.0.0)\""; //$NON-NLS-1$ private static final String NATTABLE_VERSION = "1.5.0"; //$NON-NLS-1$ diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/APIReportGenerator.java b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/APIReportGenerator.java index e20ed1a4c28..8fca83e4e37 100644 --- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/APIReportGenerator.java +++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/APIReportGenerator.java @@ -48,6 +48,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.papyrus.bundles.tests.Activator; import org.eclipse.papyrus.bundles.tests.BundleTestsUtils; +import org.eclipse.papyrus.junit.utils.PrintingProgressMonitor; import org.eclipse.pde.api.tools.internal.model.ApiModelFactory; import org.eclipse.pde.api.tools.internal.model.BundleComponent; import org.eclipse.pde.api.tools.internal.provisional.VisibilityModifiers; @@ -118,6 +119,15 @@ public class APIReportGenerator { /** * Generates the XML API delta report file. + * + * @param progress + */ + public IStatus generate(PrintingProgressMonitor progress) { + return generate(progress); + } + + /** + * Generates the XML API delta report file. */ public IStatus generate(IProgressMonitor monitor) throws CoreException { Pattern[] exclusionPatterns = loadExclusions("excludes.txt"); //$NON-NLS-1$ |