Skip to content

Commit

Permalink
upgraded releng plugins to Java 8
Browse files Browse the repository at this point in the history
  • Loading branch information
@amlajmi
amlajmi committed Jun 29, 2016
1 parent 247e824 commit 3a02220
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 43 deletions.
6 changes: 3 additions & 3 deletions releng/org.dslforge.runtime.build/parent/parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<artifactId>org.dslforge.runtime.build.parent.parent</artifactId>
<packaging>pom</packaging>
<properties>
<tycho.version>0.20.0</tycho.version>
<tycho.version>0.25.0</tycho.version>
<tycho.showEclipseLog>true</tycho.showEclipseLog>
<assembly-version>2.4</assembly-version>
<replacer-version>1.4.1</replacer-version>
Expand Down Expand Up @@ -139,8 +139,8 @@
<version>${tycho.version}</version>
<configuration>
<encoding>UTF-8</encoding>
<source>6.0</source>
<target>6.0</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down
1 change: 1 addition & 0 deletions releng/org.dslforge.runtime.build/texteditor/org.dslforge.text.editor.demo.product
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<plugin id="org.eclipse.core.commands"/>
<plugin id="org.eclipse.core.contenttype"/>
<plugin id="org.eclipse.core.databinding"/>
<plugin id="org.eclipse.core.databinding.beans"/>
<plugin id="org.eclipse.core.databinding.observable"/>
<plugin id="org.eclipse.core.databinding.property"/>
<plugin id="org.eclipse.core.expressions"/>
Expand Down
6 changes: 3 additions & 3 deletions releng/org.dslforge.runtime.releng/parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<url>http://www.dslforge.org</url>
</organization>
<properties>
<tycho.version>0.20.0</tycho.version>
<tycho.version>0.25.0</tycho.version>
<xtext.version>2.10.0</xtext.version>
<xtend.maven.version>2.9.2</xtend.maven.version>
</properties>
Expand Down Expand Up @@ -154,8 +154,8 @@
<version>${tycho.version}</version>
<configuration>
<encoding>UTF-8</encoding>
<source>6.0</source>
<target>6.0</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down
35 changes: 18 additions & 17 deletions releng/org.dslforge.runtime.target/neon/neon.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,25 @@
<?pde version="3.8"?><target name="DSL Forge Runtime Target" sequenceNumber="48">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.dslforge.runtime.feature.feature.group" version="0.0.0"/>
<repository location="http://dslforge.org/downloads/runtime/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.persistence.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/rt/eclipselink/updates/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.rap.tabbed-properties.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.cnf.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/rt/rap/incubator/nightly/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gemini.jpa.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/gemini/jpa/updates/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="15.0.0.v201403281430"/>
<unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
Expand All @@ -18,17 +31,10 @@
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.rap.sdk.feature.feature.group" version="3.1.0.20160523-1225"/>
<unit id="org.eclipse.rap.feature.feature.group" version="3.1.0.20160523-1225"/>
<unit id="org.eclipse.emf.rap.sdk.feature.group" version="2.12.0.v20160429-0808"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="3.1.0.20160524-1612"/>
<repository location="http://download.eclipse.org/releases/neon"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gemini.jpa.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/gemini/jpa/updates/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.rap.sdk.feature.feature.group" version="3.1.0.20160527-1719"/>
<unit id="org.eclipse.rap.feature.feature.group" version="3.1.0.20160527-1719"/>
<unit id="org.eclipse.emf.rap.sdk.feature.group" version="2.12.0.v20160526-0356"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="3.1.0.20160607-1200"/>
<unit id="org.eclipse.xtend.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.xbase.lib.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
Expand All @@ -44,10 +50,5 @@
<unit id="org.eclipse.xtext.xbase.junit" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/neon"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.rap.tabbed-properties.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.cnf.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/rt/rap/incubator/nightly/"/>
</location>
</locations>
</target>
23 changes: 3 additions & 20 deletions releng/org.dslforge.tooling.releng/parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</prerequisites>

<properties>
<tycho.version>0.20.0</tycho.version>
<tycho.version>0.25.0</tycho.version>
<xtext.version>2.10.0</xtext.version>
<xtend.maven.version>2.9.2</xtend.maven.version>
</properties>
Expand Down Expand Up @@ -137,23 +137,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<includes>
<include>**/*Test.java</include>
<include>**/*Test2.java</include>
</includes>
<excludes>
<!-- Test mojo matches TestProject be default and treats it as PojoTest -->
<exclude>**/Test*.class</exclude>
</excludes>
<useUIHarness>false</useUIHarness>
<useUIThread>false</useUIThread>
<argLine>${tycho.surefire.extra.vmargs}</argLine>

<!-- Uncomment to remote debug tests run by Maven/Tycho build -->
<!-- <argLine>${tycho.surefire.extra.vmargs} -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y</argLine> -->
</configuration>
</plugin>
</plugins>

Expand All @@ -166,8 +149,8 @@
<version>${tycho.version}</version>
<configuration>
<encoding>UTF-8</encoding>
<source>6.0</source>
<target>6.0</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down

0 comments on commit 3a02220

Please sign in to comment.