Bug 531146 - Revert to Batik libraries version 1.7.0/1.7.1
* Use Oxygen.3a Orbit repository
Change-Id: Ia15fd0c322dcbde248c73fa40ac8188558ef5f84
diff --git a/features/org.eclipse.graphiti.export.feature/feature.xml b/features/org.eclipse.graphiti.export.feature/feature.xml
index 3737e25..73a431a 100644
--- a/features/org.eclipse.graphiti.export.feature/feature.xml
+++ b/features/org.eclipse.graphiti.export.feature/feature.xml
@@ -49,42 +49,42 @@
id="org.apache.batik.svggen"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.7.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.batik.ext.awt"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.7.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.batik.util"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.7.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.batik.util.gui"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.7.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.batik.dom"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.7.1.qualifier"
unpack="false"/>
<plugin
id="org.apache.batik.css"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.7.0.qualifier"
unpack="false"/>
<plugin
@@ -105,14 +105,14 @@
id="org.w3c.dom.smil"
download-size="0"
install-size="0"
- version="1.0.1.qualifier"
+ version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.batik.xml"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.7.0.qualifier"
unpack="false"/>
</feature>
diff --git a/parent/pom.xml b/parent/pom.xml
index 4463610..e5ef56b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -15,7 +15,7 @@
<jboss-tycho-plugins-version>0.22.0</jboss-tycho-plugins-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<platform-site>http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8M7-201805092000/</platform-site>
- <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository/</orbit-site>
+ <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository/</orbit-site>
<gef-site>http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952/</gef-site>
<emf-site>http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201805041039/</emf-site>
<emf-transactions-site>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201805140824/</emf-transactions-site>
diff --git a/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/plugins/org.eclipse.graphiti.export.batik/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.graphiti.export.batik/META-INF/MANIFEST.MF b/plugins/org.eclipse.graphiti.export.batik/META-INF/MANIFEST.MF
index 530583e..7f752c2 100644
--- a/plugins/org.eclipse.graphiti.export.batik/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.graphiti.export.batik/META-INF/MANIFEST.MF
@@ -6,10 +6,10 @@
Bundle-SymbolicName: org.eclipse.graphiti.export.batik;singleton:=true
Bundle-Version: 0.15.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.apache.batik.svggen;bundle-version="[1.9.1,1.10.0)",
- org.apache.batik.ext.awt;bundle-version="[1.9.1,1.10.0)",
- org.apache.batik.util;bundle-version="[1.9.1,1.10.0)",
- org.apache.batik.dom;bundle-version="[1.9.1,1.10.0)",
+Require-Bundle: org.apache.batik.svggen;bundle-version="[1.7.0,1.8.0)",
+ org.apache.batik.ext.awt;bundle-version="[1.7.0,1.8.0)",
+ org.apache.batik.util;bundle-version="[1.7.0,1.8.0)",
+ org.apache.batik.dom;bundle-version="[1.7.1,1.8.0)",
org.eclipse.draw2d;bundle-version="[3.9.100,4.0.0)",
org.eclipse.graphiti.ui;bundle-version="0.15.0"
Bundle-ActivationPolicy: lazy
diff --git a/releng/org.eclipse.graphiti.releng/build.rmap b/releng/org.eclipse.graphiti.releng/build.rmap
index 2849e07..d617078 100644
--- a/releng/org.eclipse.graphiti.releng/build.rmap
+++ b/releng/org.eclipse.graphiti.releng/build.rmap
@@ -55,7 +55,7 @@
<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
<rm:property key="buckminster.mutable" value="false"/>
- <rm:uri format="{0}/tools/orbit/downloads/drops/S20180504181223/repository/">
+ <rm:uri format="{0}/tools/orbit/downloads/drops/R20180330011457/repository/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
