Merge pull request #1 from cs-studio-nsls2/4.5.x

4.5.x
cs-studio-nsls2 · Jun 29, 2017 · 14970af · 14970af
2 parents 3adafe9 + 45128dd
commit 14970af
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 15 deletions.
diff --git a/features/org.csstudio.nsls2.product.feature/build.properties b/features/org.csstudio.nsls2.product.feature/build.properties
@@ -1,2 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+               rootfiles/
 root = rootfiles
diff --git a/features/org.csstudio.nsls2.product.feature/feature.xml b/features/org.csstudio.nsls2.product.feature/feature.xml
@@ -6,4 +6,10 @@
       provider-name="CS-Studio Collaboration &lt;[email protected]&gt;"
       plugin="org.csstudio.product">
 
+   <plugin
+         id="org.eclipse.draw2d"
+         download-size="0"
+         install-size="0"
+         version="3.9.101.201408150207"
+         unpack="false"/> 
 </feature>
diff --git a/pom.xml b/pom.xml
@@ -20,17 +20,18 @@
   <!-- PROPERTIES -->
   <properties>
     <!-- VERSIONS -->
-    <tycho.version>0.23.1</tycho.version>
-    <tycho-extras.version>0.23.1</tycho-extras.version>
-    <cs-studio.version>4.3</cs-studio.version>
+    <tycho.version>1.0.0</tycho.version>
+    <tycho-extras.version>${tycho.version}</tycho-extras.version>
+    <cs-studio.version>4.5</cs-studio.version>
     <eclipse.central.url>http://download.eclipse.org</eclipse.central.url>
     <eclipse.mirror.url>${eclipse.central.url}</eclipse.mirror.url>
-    <orbit-site>${eclipse.mirror.url}/tools/orbit/downloads/drops/R20150519210750/repository/</orbit-site>
+    <orbit-site>${eclipse.mirror.url}/tools/orbit/R-builds/R20170307180635/repository/</orbit-site>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jgit.dirtyWorkingTree>error</jgit.dirtyWorkingTree>
     <baselineMode>fail</baselineMode>
     <upload.root>s3://download.controlsystemstudio.org</upload.root>
     <download.root>http://download.controlsystemstudio.org</download.root>
+    <diirt.version>3.1.5</diirt.version>
   </properties>
 
   <!-- PLUGIN REPOSITORIES -->
@@ -206,11 +207,11 @@
         </property>
       </activation>
       <properties>
-        <eclipse-site>http://download.eclipse.org/releases/mars</eclipse-site>
-        <eclipse-update-site>http://download.eclipse.org/eclipse/updates/4.5</eclipse-update-site>
+        <eclipse-site>http://download.eclipse.org/releases/neon</eclipse-site>
+        <eclipse-update-site>http://download.eclipse.org/eclipse/updates/4.6</eclipse-update-site>
         <rap-site>http://download.eclipse.org/rt/rap/3.0</rap-site>
-        <rap-incubator-site>http://archive.eclipse.org/rt/rap/incubator/nightly/gef/20150122-1538/</rap-incubator-site>
-        <platform-version>[4.4,4.5)</platform-version>
+        <rap-incubator-site>http://archive.eclipse.org/rt/rap/incubator/nightly/gef/20150327-1849/</rap-incubator-site>
+        <platform-version>[4.4,4.6)</platform-version>
         <swtbot-site>http://download.eclipse.org/technology/swtbot/mars/dev-build/update-site</swtbot-site>
       </properties>
     </profile>
@@ -224,14 +225,19 @@
       <repositories>
         <repository>
           <id>diirt</id>
-          <url>http://diirt.download.controlsystemstudio.org/diirt/3.1.2</url>
+          <url>http://diirt.download.controlsystemstudio.org/diirt/${diirt.version}</url>
           <layout>p2</layout>
         </repository>
         <repository>
           <id>csstudio</id>
           <url>${download.root}/updates/${cs-studio.version}</url>
           <layout>p2</layout>
         </repository>
+        <repository>
+          <id>csstudio-issue-1818</id>
+          <url>http://download.controlsystemstudio.org/issue/1818</url>
+          <layout>p2</layout>
+        </repository>
       </repositories>
     </profile>
     <profile>
@@ -290,7 +296,7 @@
     </repository>
     <repository>
       <id>efx</id>
-      <url>${eclipse.mirror.url}/efxclipse/runtime-released/2.1.0/site</url>
+      <url>${eclipse.mirror.url}/efxclipse/runtime-released/2.4.0/site</url>
       <layout>p2</layout>
     </repository>
     <repository>

diff --git a/prepare-release.sh b/prepare-release.sh
@@ -12,7 +12,7 @@ exit -1
 fi
 
 echo ::: Updating plugin versions ::
-mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:0.20.0:set-version -DnewVersion=$VERSION -Dartifacts=nsls2-product,products-csstudio-nsls2-features,org.csstudio.nsls2.product.feature,nsls2-repository
+mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:0.23.1:set-version -DnewVersion=$VERSION -Dartifacts=nsls2-product,products-csstudio-nsls2-features,org.csstudio.nsls2.product.feature,nsls2-repository
 # update product because set-version doesn't
 sed -i 's/\(\<product[^>]\+\? version=\"\)[^"]*\("[^>]\+\?>\)/\1'${VERSION}'\2/g'  repository/css-nsls2.product
 

diff --git a/repository/css-nsls2.product b/repository/css-nsls2.product
@@ -59,16 +59,17 @@
       <feature id="org.csstudio.core.diirt.feature"/>
       <feature id="org.csstudio.core.base.feature"/>
       <feature id="org.csstudio.core.platform.feature"/>
-      <feature id="org.csstudio.core.utility.feature" version="4.1.0.qualifier"/>
+      <feature id="org.csstudio.core.utility.feature"/>
       <feature id="org.csstudio.utilities.feature"/>
       <feature id="org.csstudio.pvmanager.autocomplete.feature"/>
       <feature id="org.csstudio.olog.feature"/>
       <feature id="org.csstudio.alarm.beast.ui.feature"/>
       <feature id="org.csstudio.email.feature"/>
       <feature id="org.csstudio.trends.databrowser2.feature"/>
+      <feature id="org.csstudio.trends.databrowser2.opiwidget.feature"/>
       <feature id="org.csstudio.logbook.viewer.feature"/>
       <feature id="org.csstudio.logbook.shift.feature"/>
-      <feature id="org.csstudio.trends.databrowser2.opiwidget.feature"/>
+      <feature id="org.csstudio.logbook.fault.feature"/>
       <feature id="org.csstudio.archive.reader.appliance.feature"/>
       <feature id="org.csstudio.applications.channel.feature"/>
       <feature id="org.csstudio.applications.channelfinder.feature"/>
@@ -81,10 +82,16 @@
       <feature id="org.csstudio.graphene.feature"/>
       <feature id="org.csstudio.graphene.opiwidgets.feature"/>
       <feature id="org.csstudio.pretune.feature"/>
+      <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.egit"/>
+      <feature id="org.eclipse.egit.mylyn"/>
       <feature id="org.eclipse.mylyn.github.feature"/>
       <feature id="org.csstudio.nsls2.product.feature"/>
       <feature id="org.csstudio.alarm.diirt.datasource.feature"/>
+      <feature id="org.csstudio.perspectives.feature"/>
+      <feature id="org.csstudio.saverestore.feature"/>
+      <feature id="org.csstudio.saverestore.git.feature"/>
+      <feature id="org.csstudio.saverestore.masar.feature"/>
    </features>
 
    <configurations>

diff --git a/repository/plugin_customization.ini b/repository/plugin_customization.ini