Skip to content

Commit

Permalink
Removed old target platforms, forced the pom to use the 2019-12 target
Browse files Browse the repository at this point in the history
  • Loading branch information
ghaith committed Jan 23, 2020
1 parent 10680ce commit 51b4682
Show file tree
Hide file tree
Showing 22 changed files with 96 additions and 696 deletions.
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
/**
* Copyright (c) 2012 BMW Car IT and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package demo;

import demo.AdditionFeatureAddTwoNumbers;
import org.jnario.runner.Contains;
import org.jnario.runner.FeatureRunner;
import org.jnario.runner.Named;
import org.junit.runner.RunWith;

@Contains(AdditionFeatureAddTwoNumbers.class)
@Named("Addition")
@RunWith(FeatureRunner.class)
@SuppressWarnings("all")
public class AdditionFeature {
}
/**
* Copyright (c) 2012 BMW Car IT and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package demo;

import demo.AdditionFeatureAddTwoNumbers;
import org.jnario.runner.Contains;
import org.jnario.runner.FeatureRunner;
import org.jnario.runner.Named;
import org.junit.runner.RunWith;

@Contains(AdditionFeatureAddTwoNumbers.class)
@Named("Addition")
@RunWith(FeatureRunner.class)
@SuppressWarnings("all")
public class AdditionFeature {
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package demo;

import demo.AdditionFeature;
import demo.CalculatorSpec;
import demo.TestSuiteSuite;
import org.jnario.runner.Contains;
import org.jnario.runner.ExampleGroupRunner;
import org.jnario.runner.Named;
import org.junit.runner.RunWith;

@Named("AllTests")
@Contains({ AdditionFeature.class, CalculatorSpec.class, TestSuiteSuite.class })
@RunWith(ExampleGroupRunner.class)
@SuppressWarnings("all")
public class AllTestsSuite {
}
package demo;

import demo.AdditionFeature;
import demo.CalculatorSpec;
import demo.TestSuiteSuite;
import org.jnario.runner.Contains;
import org.jnario.runner.ExampleGroupRunner;
import org.jnario.runner.Named;
import org.junit.runner.RunWith;

@Named("AllTests")
@Contains({ AdditionFeature.class, CalculatorSpec.class, TestSuiteSuite.class })
@RunWith(ExampleGroupRunner.class)
@SuppressWarnings("all")
public class AllTestsSuite {
}
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
package demo;

import java.util.List;
import org.jnario.lib.ExampleTableRow;

@SuppressWarnings("all")
public class CalculatorSpecExamples extends ExampleTableRow {
public CalculatorSpecExamples(final List<String> cellNames, final int a, final int b, final int sum) {
super(cellNames);
this.a = a;
this.b = b;
this.sum = sum;

}

private int a;

public int getA() {
return this.a;
}

private int b;

public int getB() {
return this.b;
}

private int sum;

public int getSum() {
return this.sum;
}
}
package demo;

import java.util.List;
import org.jnario.lib.ExampleTableRow;

@SuppressWarnings("all")
public class CalculatorSpecExamples extends ExampleTableRow {
public CalculatorSpecExamples(final List<String> cellNames, final int a, final int b, final int sum) {
super(cellNames);
this.a = a;
this.b = b;
this.sum = sum;

}

private int a;

public int getA() {
return this.a;
}

private int b;

public int getB() {
return this.b;
}

private int sum;

public int getSum() {
return this.sum;
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package demo;

import demo.CalculatorSpec;
import org.jnario.runner.Contains;
import org.jnario.runner.ExampleGroupRunner;
import org.jnario.runner.Named;
import org.junit.runner.RunWith;

@Named("Test Suite")
@Contains(CalculatorSpec.class)
@RunWith(ExampleGroupRunner.class)
@SuppressWarnings("all")
public class TestSuiteSuite {
}
package demo;

import demo.CalculatorSpec;
import org.jnario.runner.Contains;
import org.jnario.runner.ExampleGroupRunner;
import org.jnario.runner.Named;
import org.junit.runner.RunWith;

@Named("Test Suite")
@Contains(CalculatorSpec.class)
@RunWith(ExampleGroupRunner.class)
@SuppressWarnings("all")
public class TestSuiteSuite {
}
2 changes: 1 addition & 1 deletion plugins/org.jnario.feature/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re
org.jnario;bundle-version="1.0.0",
org.eclipse.xtext.xbase.lib,
org.eclipse.jdt.annotation;bundle-version="1.0.0";resolution:=optional,
org.objectweb.asm;bundle-version="[5.0.1,7.0.0)";resolution:=optional,
org.objectweb.asm;resolution:=optional,
org.jnario.xbase.richstring;visibility:=reexport
Import-Package: org.apache.log4j,
org.apache.commons.logging
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jnario.spec/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=re
org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)",
org.eclipse.jdt.annotation;bundle-version="1.0.0";resolution:=optional,
org.apache.commons.lang,
org.objectweb.asm;bundle-version="[5.0.1,7.0.0)";resolution:=optional,
org.objectweb.asm;resolution:=optional,
org.jnario.xbase.richstring;visibility:=reexport
Import-Package: org.apache.log4j,
org.apache.commons.logging
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jnario.suite/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
org.eclipse.xtext.xbase.lib,
org.jnario;bundle-version="1.0.0",
org.jnario.lib;bundle-version="1.0.0",
org.objectweb.asm;bundle-version="[5.0.1,7.0.0)";resolution:=optional
org.objectweb.asm;resolution:=optional
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.jnario.suite,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jnario.xbase.richstring/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.generator;resolution:=optional,
org.eclipse.emf.mwe.utils;resolution:=optional,
org.apache.commons.lang,
org.objectweb.asm;bundle-version="[5.0.1,7.0.0)";resolution:=optional,
org.objectweb.asm;resolution:=optional,
org.eclipse.emf.mwe2.launch,
org.eclipse.xtext.util,
org.antlr.runtime,
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<platform-version-name>photon</platform-version-name>
<platform-version-name>2019-12</platform-version-name>
<xtend.version>2.20.0</xtend.version>
<xtext.version>${xtend.version}</xtext.version>
</properties>
Expand Down Expand Up @@ -134,7 +134,7 @@
<groupId>org.jnario</groupId>
<artifactId>org.jnario.target</artifactId>
<version>${project.version}</version>
<classifier>photon-xtext2.14</classifier>
<classifier>2019-12</classifier>
</artifact>
</target>
<ignoreTychoRepositories>true</ignoreTychoRepositories>
Expand Down
12 changes: 3 additions & 9 deletions releng/org.jnario.target/2019-12.target
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/2019-12/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.core" version="0.0.0"/>
<unit id="org.eclipse.pde.ui" version="0.0.0"/>
<unit id="org.eclipse.ui.ide.application" version="0.0.0"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.12"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/2019-12"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="0.0.0"/>
Expand Down Expand Up @@ -49,11 +48,6 @@
<unit id="org.eclipse.jdt.junit.runners.feature.feature.group" version="0.0.0"/>
<repository location="http://www.xpect-tests.org/updatesite/nightly/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="2.20.0.v20191202-1256"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.20.0.v20191202-1256"/>
</location>
</locations>
<launcherArgs>
<vmArgs>-Xms40m -Xmx4096m -XX:MaxPermSize=256m</vmArgs>
Expand Down
59 changes: 0 additions & 59 deletions releng/org.jnario.target/_mars-xtext2.9.target

This file was deleted.

59 changes: 0 additions & 59 deletions releng/org.jnario.target/_mars.target

This file was deleted.

Loading

0 comments on commit 51b4682

Please sign in to comment.