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

Eclipse 2019-06 migration #18

Merged
merged 6 commits into from
Aug 28, 2019
Merged
Show file tree
Hide file tree
Changes from 5 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: 6 additions & 4 deletions bash/verify_commit_authors.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,17 @@ echo "[Info] "
if [ -f $(git rev-parse --git-dir)/shallow ]; then
echo "[Info] Current repository is shallow"
echo "[Info] Need to unshallow"
git fetch origin development:development
git fetch --unshallow
else
echo "[Info] Current repository is not shallow"
fi

echo "[Info] ------------------------------------"
echo "[Info] Fetch dev branch as reference"
echo "[Info] ------------------------------------"

git fetch origin development:development

echo "[Info] ------------------------------------"
echo "[Info] Show current branches"
echo "[Info] ------------------------------------"
Expand Down Expand Up @@ -70,7 +75,6 @@ echo "[Info] Create commit authors file"
echo "[Info] ------------------------------------"
echo "[Info] "

git fetch origin development development:development
git log development... --pretty=format:"%aN" | sort | uniq > ./commit_authors.txt

echo "[Info] ------------------------------------"
Expand Down Expand Up @@ -165,5 +169,3 @@ else
echo "[Warn] ------------------------------------"
exit 1
fi


23 changes: 0 additions & 23 deletions de.dlr.sc.virsat.ide.dependencies.feature/.project

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions de.dlr.sc.virsat.ide.dependencies.feature/build.properties

This file was deleted.

This file was deleted.

70 changes: 0 additions & 70 deletions de.dlr.sc.virsat.ide.dependencies.feature/feature.xml

This file was deleted.

24 changes: 0 additions & 24 deletions de.dlr.sc.virsat.ide.dependencies.feature/pom.xml

This file was deleted.

79 changes: 63 additions & 16 deletions de.dlr.sc.virsat.ide.product/virsat_ide.product
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<aboutInfo>
<image path="/de.dlr.sc.virsat.ide.branding.ui/eclipse_lg.png"/>
<text>
Virtual Satellite IDE
Copyright by DLR (German Aerospace Center) Simulation and Software Technology 2018.
based on Eclipse for RCP and RAP Developers
(c) Copyright Eclipse contributors and others 2000, 2017. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse&apos;s permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.
Virtual Satellite IDE

Copyright by DLR (German Aerospace Center) Simulation and Software Technology 2018.

based on Eclipse for RCP and RAP Developers

(c) Copyright Eclipse contributors and others 2000, 2017. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse&apos;s permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.
</text>
</aboutInfo>
Expand All @@ -22,14 +22,14 @@ This product includes software developed by other open source projects including
</configIni>

<launcherArgs>
<programArgs>-product de.dlr.sc.virsat.ide.branding.ui.product
-showsplash de.dlr.sc.virsat.ide.branding.ui
<programArgs>-product de.dlr.sc.virsat.ide.branding.ui.product
-showsplash de.dlr.sc.virsat.ide.branding.ui
--launcher.defaultAction openFile
</programArgs>
<vmArgs>-Dosgi.requiredJavaVersion=1.8
-Xms256m
-Xmx1024m
-XX:+UseG1GC
<vmArgs>-Dosgi.requiredJavaVersion=1.8
-Xms256m
-Xmx1024m
-XX:+UseG1GC
-XX:+UseStringDeduplication
</vmArgs>
</launcherArgs>
Expand Down Expand Up @@ -60,14 +60,61 @@ This product includes software developed by other open source projects including
</plugins>

<features>
<feature id="de.dlr.sc.virsat.ide.branding.feature"/>
<feature id="de.dlr.sc.virsat.ide.dependencies.feature"/>
<feature id="org.eclipse.epp.package.rcp.feature" version="4.12.0.qualifier"/>
<feature id="org.eclipse.epp.package.common.feature" version="4.12.0.qualifier"/>
<feature id="org.eclipse.platform" version="4.12.0.qualifier"/>
<feature id="org.eclipse.epp.mpc" installMode="root"/>
<feature id="org.eclipse.jdt"/>
<feature id="org.eclipse.pde"/>
<feature id="org.eclipse.platform.source"/>
<feature id="org.eclipse.rcp.source"/>
<feature id="org.eclipse.buildship" installMode="root"/>
<feature id="org.eclipse.e4.core.tools.feature" installMode="root"/>
<feature id="org.eclipse.eclemma.feature" installMode="root"/>
<feature id="org.eclipse.egit" installMode="root"/>
<feature id="org.eclipse.egit.mylyn" installMode="root"/>
<feature id="org.eclipse.m2e.feature" version="1.11.0.qualifier" installMode="root"/>
<feature id="org.eclipse.m2e.logback.feature" version="1.11.0.qualifier" installMode="root"/>
<feature id="org.eclipse.mylyn.bugzilla_feature" installMode="root"/>
<feature id="org.eclipse.mylyn.context_feature" installMode="root"/>
<feature id="org.eclipse.mylyn.gerrit.feature" installMode="root"/>
<feature id="org.eclipse.mylyn.git" installMode="root"/>
<feature id="org.eclipse.mylyn.hudson" installMode="root"/>
<feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
<feature id="org.eclipse.mylyn.java_feature" installMode="root"/>
<feature id="org.eclipse.mylyn.pde_feature" installMode="root"/>
<feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
<feature id="org.eclipse.rap.tools.feature" installMode="root"/>
<feature id="org.eclipse.swtbot.eclipse.gef" installMode="root"/>
<feature id="org.eclipse.swtbot.eclipse" installMode="root"/>
<feature id="org.eclipse.swtbot.ide" installMode="root"/>
<feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
<feature id="de.dlr.sc.virsat.ide.branding.feature" installMode="root"/>
<feature id="de.dlr.sc.virsat.model.concept.feature" installMode="root"/>
<feature id="de.dlr.sc.overtarget.feature" installMode="root"/>
<feature id="org.eclipse.emf.edapt.recorder.feature" installMode="root"/>
<feature id="org.eclipse.emf.edapt.runtime.feature" installMode="root"/>
<feature id="org.eclipse.jet.core" installMode="root"/>
<feature id="org.eclipse.jet.editor" installMode="root"/>
<feature id="org.eclipse.jet.sdk" installMode="root"/>
<feature id="net.sf.eclipsecs" installMode="root"/>
<feature id="de.weingardt.mylyn.gitlab" installMode="root"/>
<feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
<feature id="org.eclipse.emf.sdk" installMode="root"/>
<feature id="org.eclipse.emf.ecore.xcore.sdk" installMode="root"/>
<feature id="org.eclipse.emf.mwe2.language.sdk" installMode="root"/>
<feature id="org.eclipse.xtext.sdk" installMode="root"/>
<feature id="com.github.spotbugs.plugin.eclipse" installMode="root"/>
<feature id="org.sonatype.tycho.m2e.feature" installMode="root"/>
<feature id="de.jcup.yamleditor" installMode="root"/>
</features>


<repositories>
<repository location="https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/" enabled="true" />
<repository location="https://sourceforge.net/projects/overtarget/files/development/" enabled="true" />
<repository location="https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/" enabled="true" />
<repository location="https://sourceforge.net/projects/overtarget/files/development/" enabled="true" />
</repositories>

<preferencesInfo>
Expand Down
12 changes: 9 additions & 3 deletions maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<packaging>pom</packaging>

<properties>
<tycho-version>1.0.0</tycho-version>
<tycho-version>1.4.0</tycho-version>
<maven.resources.version>2.6</maven.resources.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Expand Down Expand Up @@ -44,9 +44,9 @@
<sonar.jacoco.version>0.7.7.201606060606</sonar.jacoco.version>

<eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>
<eclipse.simultaneous.release.name>Oxygen.1 Release (4.7.1)</eclipse.simultaneous.release.name>
<eclipse.simultaneous.release.name>2019-06 Release</eclipse.simultaneous.release.name>
<!-- eclipse.simultaneous.release.repository>http://download.eclipse.org/staging/oxygen/</eclipse.simultaneous.release.repository-->
<eclipse.simultaneous.release.repository>http://download.eclipse.org/releases/oxygen/</eclipse.simultaneous.release.repository>
<eclipse.simultaneous.release.repository>http://download.eclipse.org/releases/2019-06/</eclipse.simultaneous.release.repository>
</properties>

<profiles>
Expand Down Expand Up @@ -207,6 +207,12 @@
<layout>p2</layout>
</repository>

<repository>
<id>m2eclipse</id>
<url>https://download.eclipse.org/technology/m2e/releases/</url>
<layout>p2</layout>
</repository>

<repository>
<id>maven-to-eclipse-tycho-feature</id>
<url>http://central.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.9.0/N/LATEST/</url>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<modules>
<module>de.dlr.sc.virsat.ide.product</module>
<module>de.dlr.sc.virsat.ide.dependencies.feature</module>


<module>de.dlr.sc.virsat.ide.license.feature</module>
<module>de.dlr.sc.virsat.ide.docs.feature</module>
Expand Down