Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2018-06-01 09:15:29 -0400
committerQuentin Le Menez2018-06-01 10:39:48 -0400
commit2ce4f4503472de9c339367fd0e384e9d19a3c75b (patch)
tree2f982c4cc49230690095d46ac94ebf52b2ce4de0 /tests/junit/framework/org.eclipse.papyrus.bundles.tests
parent8b0b693d70f629acd8a0acb39e79d644eafccf3a (diff)
downloadorg.eclipse.papyrus-2ce4f4503472de9c339367fd0e384e9d19a3c75b.tar.gz
org.eclipse.papyrus-2ce4f4503472de9c339367fd0e384e9d19a3c75b.tar.xz
org.eclipse.papyrus-2ce4f4503472de9c339367fd0e384e9d19a3c75b.zip
Revert "Bug 533804 - [Diagram] Update batik dependencies for 1.9.1"
- This reverts the migration to Batik 1.9.1 as the problems encountered warrant to postpone it This reverts commit aea9db22620bbc8b466b48ea7dd958bd004c91e4. Change-Id: I15546c71d6a1868773a78459e604fe0babefbf6b Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'tests/junit/framework/org.eclipse.papyrus.bundles.tests')
-rwxr-xr-xtests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java2
-rw-r--r--tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/APIReportGenerator.java10
2 files changed, 1 insertions, 11 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 fbe5f28b9a8..a4701a76f2b 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.9.1,2.0.0)\""; //$NON-NLS-1$
+ private static final String BATIK_VERSION = "\"[1.6.0,1.7.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 8fca83e4e37..e20ed1a4c28 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,7 +48,6 @@ 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;
@@ -119,15 +118,6 @@ 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$

Back to the top