Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat]Upgrade OCCI Studio to eclipse 2022-09 version, must be tested … #53

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,20 @@

OCCI-Studio is a set of Eclipse plugins implementing the [current Open Cloud Computing Interface (OCCI) specification](http://occi-wg.org/about/specification/).

# Building OCCI-Studio with maven

''mvn clean install -Pbuild.products''

The product binaries will be in ''occi-studio/repositories/org.eclipse.cmf.occi.product/target/*.zip''

# Usage

You can refer to the following materials in order to familiarize with OCCI-Studio:

* The OCCI-Studio tutorial is available <a href="https://drive.google.com/open?id=0B7zqdAuZr708VWZCYVZRZzY3YVE">here</a>.
* The necessary materials to ensure the hands-on experience with OCCI-Studio are available <a href="https://drive.google.com/file/d/1Y6cESS8v9BXJA4H_I6H8RVE1Xzrrx3x_/view?usp=sharing">here</a>.

# Eclipse version

The current version of the based eclipse platform is : 2022-09

26 changes: 24 additions & 2 deletions features/org.eclipse.cmf.occi/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,30 @@ litigation.
</license>

<requires>
<import feature="org.eclipse.egit" version="5.0.1.201806211838-r"/>
<import feature="org.eclipse.egit" version="6.3.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf" version="2.26.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.compare.egit" version="1.2.4" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.ecoretools.design" version="3.4.0" match="greaterOrEqual"/>
<import feature="org.eclipse.epsilon.core.dt.feature" version="1.4.0" match="greaterOrEqual"/>
<import feature="org.eclipse.epsilon.core.feature" version="1.4.0" match="greaterOrEqual"/>
<import feature="org.eclipse.epsilon.emf.dt.feature" version="1.4.0" match="greaterOrEqual"/>
<import feature="org.eclipse.epsilon.emf.feature" version="1.4.0" match="greaterOrEqual"/>
<import feature="org.eclipse.mylyn.wikitext_feature" version="3.0.42" match="greaterOrEqual"/>
<import feature="org.eclipse.ocl.all.sdk" version="5.4.0" match="greaterOrEqual"/>
<import feature="org.eclipse.ocl.examples" version="6.4.0" match="greaterOrEqual"/>
<import feature="org.eclipse.pde" version="3.13.100" match="greaterOrEqual"/>
<import feature="org.eclipse.sdk" version="4.25.0" match="greaterOrEqual"/>
<import feature="org.eclipse.sirius.runtime" version="7.0.4" match="greaterOrEqual"/>
<import feature="org.eclipse.sirius.runtime.aql" version="7.0.4" match="greaterOrEqual"/>
<import feature="org.eclipse.sirius.runtime.ide.ui" version="7.0.4" match="greaterOrEqual"/>
<import feature="org.eclipse.sirius.specifier" version="7.0.4" match="greaterOrEqual"/>
<import feature="org.eclipse.xtend.sdk" version="2.28.0" match="greaterOrEqual"/>
<import feature="org.eclipse.xtext.sdk" version="2.28.0" match="greaterOrEqual"/>

<!--
<import feature="org.eclipse.egit" version="5.0.1.201806211838-r"/>
<import feature="org.eclipse.emf" version="2.14.0.v20180529-1144"/>
<import feature="org.eclipse.emf.compare.egit" version="1.2.3.201805161152"/>
<import feature="org.eclipse.emf.compare.egit" version="1.2.3.201805161152"/>
<import feature="org.eclipse.emf.ecoretools.design" version="3.3.0.201706121316"/>
<import feature="org.eclipse.epsilon.core.dt.feature" version="1.4.0.201611012202"/>
<import feature="org.eclipse.epsilon.core.feature" version="1.4.0.201611012202"/>
Expand All @@ -245,6 +266,7 @@ litigation.
<import feature="org.eclipse.sirius.specifier" version="6.0.0.201806111309"/>
<import feature="org.eclipse.xtend.sdk" version="2.14.0.v20180523-0937"/>
<import feature="org.eclipse.xtext.sdk" version="2.14.0.v20180523-0937"/>
-->
</requires>

<plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
jre.compilation.profile = JavaSE-1.8
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
jre.compilation.profile = JavaSE-1.8
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
jre.compilation.profile = JavaSE-1.8
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
jre.compilation.profile = JavaSE-1.8
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
jre.compilation.profile = JavaSE-1.8
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
jre.compilation.profile = JavaSE-1.8
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
jre.compilation.profile = JavaSE-1.8
1 change: 0 additions & 1 deletion plugins/org.eclipse.cmf.occi.core.gen.xml/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties
jre.compilation.profile = JavaSE-1.8
37 changes: 32 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,23 @@
</profiles>

<properties>
<tycho-version>1.0.0</tycho-version>
<!-- <tycho-version>1.4.0</tycho-version> -->
<tycho-version>2.3.0</tycho-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>
<!-- configure p2 repository to resolve against -->
<repository>
<id>photon</id>
<id>2022-09</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/photon</url>
<url>https://download.eclipse.org/releases/2022-09/</url>
</repository>
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository</url>
</repository>
<repository>
<id>mvnrepository</id>
<url>http://repo1.maven.org/maven2</url>
Expand All @@ -167,11 +173,16 @@
<enabled>true</enabled>
</releases>
</repository>
<repository>
<!-- <repository>
<id>epsilonrepository</id>
<url>http://download.eclipse.org/epsilon/updates/1.4</url>
<layout>p2</layout>
</repository>
</repository> -->
<repository>
<id>epsilonrepository</id>
<url>http://download.eclipse.org/epsilon/updates/2.4/</url>
<layout>p2</layout>
</repository>
</repositories>
<distributionManagement>
<snapshotRepository>
Expand All @@ -194,6 +205,22 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<executionEnvironment>JavaSE-11</executionEnvironment>
<!-- <resolveWithExecutionEnvironmentConstraints>false</resolveWithExecutionEnvironmentConstraints> -->
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.equinox.event</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.equinox.ds</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
<environments>
<environment>
<os>win32</os>
Expand Down
9 changes: 5 additions & 4 deletions repositories/org.eclipse.cmf.occi.product/OCCI-Studio.product
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</configIni>

<launcherArgs>
<vmArgs>-Dosgi.requiredJavaVersion=1.8 -Xms256m -Xmx1024m
<vmArgs>-Dosgi.requiredJavaVersion=11 -Xms256m -Xmx1024m
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
Expand All @@ -33,7 +33,7 @@
</launcher>

<vm>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
</vm>


Expand All @@ -45,6 +45,7 @@
</features>

<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
Expand All @@ -58,8 +59,8 @@
</configurations>

<repositories>
<repository location="https://dl.bintray.com/occiware/OCCI-Studio/update-site/current-release" enabled="true" />
<repository location="http://download.eclipse.org/releases/photon" enabled="true" />
<!-- <repository location="https://dl.bintray.com/occiware/OCCI-Studio/update-site/current-release" enabled="true" /> -->
<repository location="https://download.eclipse.org/releases/2022-09" enabled="true" />
</repositories>

<preferencesInfo>
Expand Down