diff options
20 files changed, 176 insertions, 305 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF index bb870bd7256..3e6b15ba001 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF @@ -1,9 +1,4 @@ Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true -Bundle-Version: 3.100.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.emf.appearance;bundle-version="[2.0.0,3.0.0)", @@ -11,12 +6,11 @@ Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.7.0,2.0.0)";visibility:=reexport, org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.8.0,2.0.0)", org.w3c.dom.svg;bundle-version="[1.1.0,2.0.0)";visibility:=reexport, - org.apache.batik.anim;bundle-version="[1.9.1,2.0.0)", - org.apache.batik.dom;bundle-version="[1.9.1,2.0.0)", - org.apache.batik.dom.svg;bundle-version="[1.9.1,2.0.0)", - org.apache.batik.xml;bundle-version="[1.9.1,2.0.0)", - org.apache.batik.util;bundle-version="[1.9.1,2.0.0)", - org.apache.batik.svggen;bundle-version="[1.9.1,2.0.0)", + org.apache.batik.util;bundle-version="[1.6.0,1.7.0)", + org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)", + org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)", + org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)", + org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)", org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, com.ibm.icu, org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, @@ -39,11 +33,6 @@ Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", org.eclipse.papyrus.infra.types;bundle-version="4.0.0", org.eclipse.emf.common, org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)" -Bundle-Vendor: %providerName -Bundle-ActivationPolicy: lazy -Bundle-ClassPath: . -Bundle-Localization: plugin -Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator Export-Package: org.eclipse.papyrus.infra.gmfdiag.common, org.eclipse.papyrus.infra.gmfdiag.common.adapter, org.eclipse.papyrus.infra.gmfdiag.common.advice, @@ -88,6 +77,18 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.common, org.eclipse.papyrus.infra.gmfdiag.common.utils, org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions;x-internal:=true, org.eclipse.papyrus.infra.gmfdiag.internal.common.model;x-internal:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 3.100.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.common.base;version="21.0.0", com.google.common.collect;version="21.0.0", com.google.common.util.concurrent;version="21.0.0", diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java index 4a4af7a6634..555f65cfdd5 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.WeakHashMap; -import org.apache.batik.anim.dom.SAXSVGDocumentFactory; +import org.apache.batik.dom.svg.SAXSVGDocumentFactory; import org.apache.batik.dom.util.DOMUtilities; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.draw2d.PositionConstants; @@ -165,12 +165,12 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements */ protected synchronized SVGDocument getSVGDocument(EObject view, String location) { if (relativePaths == null) { - relativePaths = new WeakHashMap<>(); + relativePaths = new WeakHashMap<Resource, Map<String, String>>(); } - if (location.contains("/" + POSITION_KEY) || location.contains("." + POSITION_KEY)) { //$NON-NLS-1$//$NON-NLS-2$ + if (location.contains("/" + POSITION_KEY) || location.contains("." + POSITION_KEY)) { //$NON-NLS-1$//$NON-NLS-2$ // load a specific variant of a symbol (with a different orientation) if the file name // contains a specific "magic" key. The motivation is that symbols on the border of a parent - // (e.g. a port symbol) could always point into the parent shape depending on its position + // (e.g. a port symbol) could always point into the parent shape depending on its position try { IMultiDiagramEditor editor = ServiceUtilsForEObject.getInstance().getService(IMultiDiagramEditor.class, view); @@ -201,9 +201,7 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements /** * Get a position key (enumeration) from the bit-vector representation of the position - * - * @param side - * the binary encoded position + * @param side the binary encoded position * @return the position key */ protected PositionEnum getPositionKey(int side) { @@ -218,7 +216,6 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements return PositionEnum.SOUTH; } } - /** * Loads a SVG document from the given location. * This method uses a cache so that any given document is only loaded once. @@ -229,7 +226,7 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements */ protected synchronized SVGDocument getSVGDocument(String location) { if (cache == null) { - cache = new HashMap<>(); + cache = new HashMap<String, SVGDocument>(); } if (cache.containsKey(location)) { return cache.get(location); @@ -288,7 +285,7 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements Map<String, String> resMap = relativePaths.get(model.eResource()); if (resMap == null) { - resMap = new HashMap<>(); + resMap = new HashMap<String, String>(); relativePaths.put(model.eResource(), resMap); } String canonical = resMap.get(uri); diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java index cd9e7425b64..431d632fa29 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java @@ -34,7 +34,7 @@ public class VersionRules { private final VersionRule rule = VersionRule.composeAll( new CurrentVersionRule(), // The default behaviour - new FixedRangeRule(dep -> dep.startsWith("org.apache.batik"), "[1.9.1, 2.0.0)"), //$NON-NLS-1$//$NON-NLS-2$ + new FixedRangeRule(dep -> dep.startsWith("org.apache.batik"), "[1.6.0,1.7.0)"), //$NON-NLS-1$//$NON-NLS-2$ new SkipRule("com.ibm.icu"), //$NON-NLS-1$ new FixedRangeRule("com.google.guava", "21.0.0") //$NON-NLS-1$ ); diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF index d4acfc7573b..2f898e125ca 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.uml.export;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.13.50,4.0.0)", org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)", - org.apache.batik.anim;bundle-version="[1.9.1,2.0.0)", + org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)", com.google.gson;bundle-version="2.7.0", org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.7.0,2.0.0)", @@ -29,4 +29,3 @@ Export-Package: org.eclipse.papyrus.uml.export, org.eclipse.papyrus.uml.export.ui, org.eclipse.papyrus.uml.export.util Bundle-Localization: plugin -Automatic-Module-Name: org.eclipse.papyrus.uml.export diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml index 7b6f6566322..4d9899b18d7 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml +++ b/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml @@ -8,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.export</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java index 3d0f7f9b9c6..925e3d104a6 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java +++ b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java @@ -11,7 +11,7 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.export.extension.contribution; -import org.apache.batik.anim.dom.SVGDOMImplementation; +import org.apache.batik.dom.svg.SVGDOMImplementation; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.export.GraphicsSVG; @@ -46,7 +46,7 @@ public class CommentAnnotateSVG implements AnnotateSVG { EObject eObject = view.getElement(); if (eObject instanceof NamedElement) { NamedElement namedElement = (NamedElement) eObject; - EList<Comment> ownedComments = namedElement.getOwnedComments(); + EList<Comment> ownedComments = namedElement.getOwnedComments(); if (!ownedComments.isEmpty()) { rectangle.setAttributeNS(null, ATTRIBUTE_TITLE, ownedComments.get(0).getBody()); Element title = svgG.getDocument().createElementNS(SVGDOMImplementation.SVG_NAMESPACE_URI, ATTRIBUTE_TITLE); diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java index 53f55e4a4e9..a2b1064023b 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java +++ b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java @@ -26,7 +26,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.batik.anim.dom.SVGDOMImplementation; +import org.apache.batik.dom.svg.SVGDOMImplementation; import org.eclipse.core.runtime.IStatus; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.geometry.Rectangle; @@ -57,17 +57,15 @@ import org.w3c.dom.Element; public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator { /** The annotations. */ - private List<AnnotateSVG> annotations = new ArrayList<>(); - + private List<AnnotateSVG> annotations = new ArrayList<>(); + /** * Instantiates a new papyrus diagram SVG generator. * - * @param diagramEditPart - * the diagram edit part - * @param annotations - * the annotations + * @param diagramEditPart the diagram edit part + * @param annotations the annotations */ - public PapyrusDiagramSVGGenerator(DiagramEditPart diagramEditPart, List<AnnotateSVG> annotations) { + public PapyrusDiagramSVGGenerator(DiagramEditPart diagramEditPart, List<AnnotateSVG> annotations ) { super(diagramEditPart); this.annotations = annotations; } @@ -118,11 +116,11 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator { Activator.log(IStatus.INFO, "Start transformation from Graphics to image descriptor"); GraphicsSVG svgG = (GraphicsSVG) g; - svgRoot = svgG.getRoot(); - + svgRoot = svgG.getRoot(); + //////// Papyrus Specific code ////////// List<PartPositionInfo> allPartPositionInfo = this.getDiagramPartInfo(); - + Collections.reverse(allPartPositionInfo);// Required to have property after class for (PartPositionInfo partPositionInfo : allPartPositionInfo) { Element rectangle = svgG.getDocument().createElementNS(SVGDOMImplementation.SVG_NAMESPACE_URI, "rect"); @@ -130,27 +128,27 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator { NamedElement nameElement = (NamedElement) partPositionInfo.getSemanticElement(); rectangle.setAttributeNS(null, "id", nameElement.getName());// useful for svg debug } - + rectangle.setAttributeNS(null, "x", String.valueOf(partPositionInfo.getPartX())); rectangle.setAttributeNS(null, "y", String.valueOf(partPositionInfo.getPartY())); rectangle.setAttributeNS(null, "width", String.valueOf(partPositionInfo.getPartWidth())); rectangle.setAttributeNS(null, "height", String.valueOf(partPositionInfo.getPartHeight())); - rectangle.setAttributeNS(null, "fill-opacity", "0"); // transparent + rectangle.setAttributeNS(null, "fill-opacity", "0"); //transparent rectangle.setAttributeNS(null, "stroke-opacity", "0"); // no border - View view = partPositionInfo.getView(); + View view = partPositionInfo.getView(); if (view instanceof Shape) { // filter on shape only to avoid duplication boolean hasAnnotation = applyAll(view, svgG, rectangle); if (hasAnnotation) { - svgRoot.appendChild(rectangle); - } + svgRoot.appendChild(rectangle); + } } } - + ///////////////////////// - - + + ByteArrayOutputStream os = new ByteArrayOutputStream(5000); // 5K // buffer stream(os); @@ -159,25 +157,22 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator { setRenderedImage(RenderedImageFactory.getInstance(os.toByteArray())); return RenderedImageDescriptor - .createFromRenderedImage(getRenderedImage()); + .createFromRenderedImage(getRenderedImage()); } catch (IOException ex) { Log.error(DiagramUIRenderPlugin.getInstance(), IStatus.ERROR, ex - .getMessage(), ex); + .getMessage(), ex); } return null; } - + /** * Apply all. * - * @param view - * the view - * @param svgG - * the svg G - * @param rectangle - * the rectangle + * @param view the view + * @param svgG the svg G + * @param rectangle the rectangle * @return true, if successful */ public boolean applyAll(View view, GraphicsSVG svgG, Element rectangle) { @@ -186,15 +181,14 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator { res = res || annotateSVG.addAnnotation(view, svgG, rectangle); } return true; - } - + } + /** * Writes the SVG Model out to a file. * * @param outputStream * output stream to store the SVG Model */ - @Override public void stream(OutputStream outputStream) { try { // Define the view box @@ -230,12 +224,11 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator { * @see org.eclipse.gmf.runtime.diagram.ui.internal.clipboard.DiagramGenerator# * createAWTImageForParts(java.util.List) */ - @Override public Image createAWTImageForParts(List editparts, org.eclipse.swt.graphics.Rectangle sourceRect) { createSWTImageDescriptorForParts(editparts, sourceRect); if (getRenderedImage() != null) { try { - BufferedImage bufImg = getRenderedImage().getAdapter(BufferedImage.class); + BufferedImage bufImg = (BufferedImage) getRenderedImage().getAdapter(BufferedImage.class); if (bufImg == null) bufImg = ImageConverter.convert(getRenderedImage().getSWTImage()); return bufImg; @@ -264,7 +257,6 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator { * @return Returns the rendered image created by previous call to * createSWTImageDescriptorForParts */ - @Override public RenderedImage getRenderedImage() { return renderedImage; } @@ -272,8 +264,7 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator { /** * Sets the rendered image. * - * @param renderedImage - * the new rendered image + * @param renderedImage the new rendered image */ private void setRenderedImage(RenderedImage renderedImage) { this.renderedImage = renderedImage; diff --git a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target index 036f2a95210..757e9c335c2 100644..100755 --- a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target +++ b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="Papyrus Tests" sequenceNumber="1527668908"> +<target name="Papyrus Tests" sequenceNumber="1527860084"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180529-0850"/> @@ -17,8 +17,8 @@ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180524-1240"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180531-1055"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC3-201805310700/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180528-0838"/> @@ -46,16 +46,16 @@ <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC2-20180524070951/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201805221147"/> - <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201805221147"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/> + <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/> <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180421-1151"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201805041039"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -94,18 +94,6 @@ <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.anim.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.dom.svg.source" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.xml.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.svggen.source" version="1.9.1.v20180313-1559"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/> diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target index 59d6a776ecb..cc3f63c04ca 100644..100755 --- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target +++ b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="Papyrus Tests" sequenceNumber="1527668908"> +<target name="Papyrus Tests" sequenceNumber="1527860084"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180529-0850"/> @@ -17,8 +17,8 @@ <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180524-1240"/> - <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180531-1055"/> + <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC3-201805310700/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180528-0838"/> @@ -46,16 +46,16 @@ <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC2-20180524070951/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201805221147"/> - <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201805221147"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/> + <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/> <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180421-1151"/> - <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805041039"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/> + <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -94,18 +94,6 @@ <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.anim.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.dom.svg.source" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.xml.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.svggen.source" version="1.9.1.v20180313-1559"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/> diff --git a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target index 10b2ffb6f57..1918d3014c5 100644..100755 --- a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target +++ b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="Papyrus Main" sequenceNumber="1527668908"> +<target name="Papyrus Main" sequenceNumber="1527860084"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180529-0850"/> @@ -17,8 +17,8 @@ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180524-1240"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180531-1055"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC3-201805310700/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180528-0838"/> @@ -46,16 +46,16 @@ <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC2-20180524070951/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201805221147"/> - <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201805221147"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/> + <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/> <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180421-1151"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201805041039"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -94,18 +94,6 @@ <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.anim.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.dom.svg.source" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.xml.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.svggen.source" version="1.9.1.v20180313-1559"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/> diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target index e3797a798f3..4b30dc0223b 100644..100755 --- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target +++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="Papyrus Main" sequenceNumber="1527668908"> +<target name="Papyrus Main" sequenceNumber="1527860084"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180529-0850"/> @@ -17,8 +17,8 @@ <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180524-1240"/> - <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180531-1055"/> + <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC3-201805310700/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180528-0838"/> @@ -46,16 +46,16 @@ <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC2-20180524070951/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201805221147"/> - <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201805221147"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/> + <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/> <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180421-1151"/> - <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805041039"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/> + <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -94,18 +94,6 @@ <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.anim.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.dom.svg.source" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.xml.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.svggen.source" version="1.9.1.v20180313-1559"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/> diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd index 9f8c8ae2d1d..0352ea50eb6 100755 --- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd +++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd @@ -24,7 +24,7 @@ location uml "http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestone //updateFrom("Eclipse",0) -location platform "http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/" { +location platform "http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC3-201805310700/" { org.eclipse.sdk.feature.group } @@ -64,7 +64,7 @@ location webtools "http://download.eclipse.org/webtools/downloads/drops/R3.10.0/ //updateFrom("GMF Runtime",0) -location gmfRuntime "http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201805221147" { +location gmfRuntime "http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809" { org.eclipse.gmf.runtime.sdk.feature.group } @@ -76,7 +76,7 @@ location gmfNotation "http://download.eclipse.org/modeling/gmp/gmf-notation/upda //updateFrom("EMF (Core)",0) -location emf "http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805041039" { +location emf "http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718" { org.eclipse.emf.sdk.feature.group } @@ -134,18 +134,7 @@ location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/I2018052 com.google.gson.source [2.7.0,2.8.0) org.apache.commons.lang3 3.1.0 org.apache.commons.lang3.source 3.1.0 - org.apache.batik.anim [1.9.1,2.0.0) - org.apache.batik.anim.source [1.9.1,2.0.0) - org.apache.batik.dom [1.9.1,2.0.0) - org.apache.batik.dom.source [1.9.1,2.0.0) - org.apache.batik.dom.svg [1.9.1,2.0.0) - org.apache.batik.dom.svg.source [1.9.1,2.0.0) - org.apache.batik.xml [1.9.1,2.0.0) - org.apache.batik.xml.source [1.9.1,2.0.0) - org.apache.batik.util [1.9.1,2.0.0) - org.apache.batik.util.source [1.9.1,2.0.0) - org.apache.batik.svggen [1.9.1,2.0.0) - org.apache.batik.svggen.source [1.9.1,2.0.0) org.objectweb.asm [5.0.1, 6.0.0) org.objectweb.asm.source [5.0.1, 6.0.0) + // The batik plugins are transitively fetched through GMF_Runtime sdk's org.eclipse.gmf.runtime.thirdparty }
\ No newline at end of file diff --git a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target index 7ea4a39c50d..1264ed50772 100644..100755 --- a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target +++ b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="Papyrus RCP" sequenceNumber="1527668913"> +<target name="Papyrus RCP" sequenceNumber="1527860084"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180529-0850"/> @@ -42,8 +42,8 @@ <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC2-20180524070951/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201805221147"/> - <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201805221147"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/> + <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/> @@ -86,32 +86,20 @@ <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.anim.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.dom.svg.source" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.xml.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.svggen.source" version="1.9.1.v20180313-1559"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.egit.feature.group" version="5.0.0.201805221745-rc1"/> - <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.0.0.201805221745-rc1"/> + <unit id="org.eclipse.egit.feature.group" version="5.0.0.201805301535-rc2"/> + <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.0.0.201805301535-rc2"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.8.0.v20180512-1132"/> - <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.100.v20180524-0900"/> + <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.100.v20180531-0700"/> <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.0.v20180518-2029"/> - <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180524-1240"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180531-1055"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC3-201805310700/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.0.v20170629-2230"/> @@ -120,7 +108,7 @@ <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.24.0.v20180221-1812"/> <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.24.0.v20170629-2230"/> <unit id="org.eclipse.mylyn_feature.feature.group" version="3.24.0.v20180227-0955"/> - <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.24.0/v20180418-0301"/> + <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.24.0/v20180530-1844"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/> @@ -129,12 +117,12 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xsd.sdk.feature.group" version="2.14.0.v20180131-0817"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180421-1151"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201805041039"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.7.0.v20180521-0704"/> - <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20180522-2342"/> + <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.7.0.v20180530-1201"/> + <repository id="cdo" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/cdo/drops/S20180530-0803"/> </location> </locations> </target> diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target index 463a29a2452..db783a72fd4 100644..100755 --- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target +++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="Papyrus RCP" sequenceNumber="1527668913"> +<target name="Papyrus RCP" sequenceNumber="1527860084"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180529-0850"/> @@ -42,8 +42,8 @@ <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC2-20180524070951/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201805221147"/> - <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201805221147"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/> + <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/> @@ -86,32 +86,20 @@ <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.anim.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.dom.svg.source" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.xml.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.svggen.source" version="1.9.1.v20180313-1559"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.egit.feature.group" version="5.0.0.201805221745-rc1"/> - <repository id="egit" location="http://download.eclipse.org/egit/staging/v5.0.0.201805221745-rc1"/> + <unit id="org.eclipse.egit.feature.group" version="5.0.0.201805301535-rc2"/> + <repository id="egit" location="http://download.eclipse.org/egit/staging/v5.0.0.201805301535-rc2"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.8.0.v20180512-1132"/> - <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.100.v20180524-0900"/> + <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.100.v20180531-0700"/> <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.0.v20180518-2029"/> - <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180524-1240"/> - <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180531-1055"/> + <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC3-201805310700/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.24.0.v20170629-2230"/> @@ -120,7 +108,7 @@ <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.24.0.v20180221-1812"/> <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.24.0.v20170629-2230"/> <unit id="org.eclipse.mylyn_feature.feature.group" version="3.24.0.v20180227-0955"/> - <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.24.0/v20180418-0301"/> + <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.24.0/v20180530-1844"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.3.201805161152"/> @@ -129,12 +117,12 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.xsd.sdk.feature.group" version="2.14.0.v20180131-0817"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180421-1151"/> - <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805041039"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/> + <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.7.0.v20180521-0704"/> - <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/S20180522-2342"/> + <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.7.0.v20180530-1201"/> + <repository id="cdo" location="http://download.eclipse.org/modeling/emf/cdo/drops/S20180530-0803"/> </location> </locations> </target> diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd index 28b276b3124..9d4165589bd 100644 --- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd +++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd @@ -6,13 +6,13 @@ include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable /*** Updates from the Simrel repository ***/ //updateFrom("EGIT",0) -location egit "http://download.eclipse.org/egit/staging/v5.0.0.201805221745-rc1" { +location egit "http://download.eclipse.org/egit/staging/v5.0.0.201805301535-rc2" { org.eclipse.egit.feature.group } //updateFrom("Eclipse",0) -location platform "http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/" { +location platform "http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC3-201805310700/" { org.eclipse.e4.core.tools.feature.feature.group org.eclipse.rcp.configuration.feature.group org.eclipse.equinox.executable.feature.group @@ -20,7 +20,7 @@ location platform "http://download.eclipse.org/eclipse/updates/4.8milestones/S-4 //updateFrom("Mylyn",0) -location mylyn "http://download.eclipse.org/mylyn/drops/3.24.0/v20180418-0301" { +location mylyn "http://download.eclipse.org/mylyn/drops/3.24.0/v20180530-1844" { org.eclipse.mylyn.ide_feature.feature.group org.eclipse.mylyn.java_feature.feature.group org.eclipse.mylyn.pde_feature.feature.group @@ -38,12 +38,12 @@ location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/mi //updateFrom("EMF (Core)",0) -location emf "http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805041039" { +location emf "http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718" { org.eclipse.xsd.sdk.feature.group } //updateFrom("EMF CDO",0) -location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/S20180522-2342" { +location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/S20180530-0803" { org.eclipse.emf.cdo.epp.feature.group }
\ No newline at end of file diff --git a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target index fca5b35d97e..3a201d8d5bd 100644..100755 --- a/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target +++ b/releng/toolsmiths/targetPlatform/eclipse/org.eclipse.papyrus.toolsmiths.eclipse.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="Papyrus Toolsmiths" sequenceNumber="1527668921"> +<target name="Papyrus Toolsmiths" sequenceNumber="1527860085"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180529-0850"/> @@ -17,8 +17,8 @@ <repository id="uml" location="file:/home/data/httpd/download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180524-1240"/> - <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180531-1055"/> + <repository id="platform" location="file:/home/data/httpd/download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC3-201805310700/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180528-0838"/> @@ -46,16 +46,16 @@ <repository id="webtools" location="file:/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC2-20180524070951/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201805221147"/> - <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201805221147"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/> + <repository id="gmfRuntime" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/> <repository id="gmfNotation" location="file:/home/data/httpd/download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180421-1151"/> - <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201805041039"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/> + <repository id="emf" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -94,49 +94,37 @@ <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.anim.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.dom.svg.source" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.xml.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.svggen.source" version="1.9.1.v20180313-1559"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.oomph.version.feature.group" version="1.9.0.v20180421-0642"/> - <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.9.0.v20180407-0508"/> - <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.9.0.v20171221-1140"/> - <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.9.0.v20180429-1135"/> - <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.9.0.v20171221-1140"/> - <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.9.0.v20171221-1140"/> - <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.9.0.v20171221-1140"/> - <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.9.0.v20171226-0549"/> - <unit id="org.eclipse.oomph.targlets.feature.group" version="1.9.0.v20180503-1442"/> - <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.9.0.v20180314-1401"/> - <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.9.0.v20171221-1140"/> - <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.9.0.v20180426-1244"/> - <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.9.0.v20171222-0933"/> - <unit id="org.eclipse.oomph.p2.feature.group" version="1.9.0.v20180504-1434"/> - <unit id="org.eclipse.oomph.setup.feature.group" version="1.9.0.v20180504-1434"/> - <unit id="org.eclipse.oomph.preferences.feature.group" version="1.9.0.v20171221-1140"/> - <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20180504-103957-1.9.0-M6"/> + <unit id="org.eclipse.oomph.version.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.targlets.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.p2.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.feature.group" version="1.9.0.v20180529-1103"/> + <unit id="org.eclipse.oomph.preferences.feature.group" version="1.9.0.v20180529-0916"/> + <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20180530-081107-1.9.0-RC2"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.0.0.201805221745-rc1"/> + <repository id="egit" location="file:/home/data/httpd/download.eclipse.org/egit/staging/v5.0.0.201805301535-rc2"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <repository id="m2e" location="file:/home/data/httpd/download.eclipse.org/technology/m2e/milestones/1.9/1.9.0.20180529-1731"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.24.0/v20180418-0301"/> + <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.24.0/v20180530-1844"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/> diff --git a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target index 37701572656..f26d2f39eba 100644..100755 --- a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target +++ b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="Papyrus Toolsmiths" sequenceNumber="1527668921"> +<target name="Papyrus Toolsmiths" sequenceNumber="1527860085"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180529-0850"/> @@ -17,8 +17,8 @@ <repository id="uml" location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.4milestones"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180524-1240"/> - <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180531-1055"/> + <repository id="platform" location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC3-201805310700/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.4.0.v20180528-0838"/> @@ -46,16 +46,16 @@ <repository id="webtools" location="http://download.eclipse.org/webtools/downloads/drops/R3.10.0/S-3.10.0.RC2-20180524070951/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201805221147"/> - <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201805221147"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/> + <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/> <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180421-1151"/> - <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805041039"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/> + <repository id="emf" location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805310718"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> @@ -94,49 +94,37 @@ <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.anim.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.source" version="1.9.1.v20180528-1434"/> - <unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.dom.svg.source" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.xml.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.util.source" version="1.9.1.v20180227-1645"/> - <unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/> - <unit id="org.apache.batik.svggen.source" version="1.9.1.v20180313-1559"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/I20180528174014/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.oomph.version.feature.group" version="1.9.0.v20180421-0642"/> - <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.9.0.v20180407-0508"/> - <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.9.0.v20171221-1140"/> - <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.9.0.v20180429-1135"/> - <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.9.0.v20171221-1140"/> - <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.9.0.v20171221-1140"/> - <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.9.0.v20171221-1140"/> - <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.9.0.v20171226-0549"/> - <unit id="org.eclipse.oomph.targlets.feature.group" version="1.9.0.v20180503-1442"/> - <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.9.0.v20180314-1401"/> - <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.9.0.v20171221-1140"/> - <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.9.0.v20180426-1244"/> - <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.9.0.v20171222-0933"/> - <unit id="org.eclipse.oomph.p2.feature.group" version="1.9.0.v20180504-1434"/> - <unit id="org.eclipse.oomph.setup.feature.group" version="1.9.0.v20180504-1434"/> - <unit id="org.eclipse.oomph.preferences.feature.group" version="1.9.0.v20171221-1140"/> - <repository id="oomph" location="http://download.eclipse.org/oomph/drops/milestone/S20180504-103957-1.9.0-M6"/> + <unit id="org.eclipse.oomph.version.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.targlets.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.p2.feature.group" version="1.9.0.v20180529-0916"/> + <unit id="org.eclipse.oomph.setup.feature.group" version="1.9.0.v20180529-1103"/> + <unit id="org.eclipse.oomph.preferences.feature.group" version="1.9.0.v20180529-0916"/> + <repository id="oomph" location="http://download.eclipse.org/oomph/drops/milestone/S20180530-081107-1.9.0-RC2"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="egit" location="http://download.eclipse.org/egit/staging/v5.0.0.201805221745-rc1"/> + <repository id="egit" location="http://download.eclipse.org/egit/staging/v5.0.0.201805301535-rc2"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <repository id="m2e" location="http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.0.20180529-1731"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.24.0/v20180418-0301"/> + <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.24.0/v20180530-1844"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/> diff --git a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd index a38db56f238..db078b966d1 100644 --- a/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd +++ b/releng/toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd @@ -7,7 +7,7 @@ include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable //updateFrom("oomph",0) -location oomph "http://download.eclipse.org/oomph/drops/milestone/S20180504-103957-1.9.0-M6" { +location oomph "http://download.eclipse.org/oomph/drops/milestone/S20180530-081107-1.9.0-RC2" { org.eclipse.oomph.version.feature.group org.eclipse.oomph.setup.workingsets.feature.group org.eclipse.oomph.projectconfig.feature.group @@ -28,7 +28,7 @@ location oomph "http://download.eclipse.org/oomph/drops/milestone/S20180504-1039 //updateFrom("EGIT",0) -location egit "http://download.eclipse.org/egit/staging/v5.0.0.201805221745-rc1" // oomph +location egit "http://download.eclipse.org/egit/staging/v5.0.0.201805301535-rc2" // oomph //updateFrom("m2e",0) @@ -36,7 +36,7 @@ location m2e "http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.0.20 //updateFrom("Mylyn",0) -location mylyn "http://download.eclipse.org/mylyn/drops/3.24.0/v20180418-0301" // oomph +location mylyn "http://download.eclipse.org/mylyn/drops/3.24.0/v20180530-1844" // oomph //updateFrom("EMF COMPARE",0) 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$ |