diff --git a/examples/org.jnario.maven.example/src/test/jnario-gen/demo/AdditionFeature.java b/examples/org.jnario.maven.example/src/test/jnario-gen/demo/AdditionFeature.java index 5ff5fc594..f2d372f6e 100644 --- a/examples/org.jnario.maven.example/src/test/jnario-gen/demo/AdditionFeature.java +++ b/examples/org.jnario.maven.example/src/test/jnario-gen/demo/AdditionFeature.java @@ -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 { +} diff --git a/examples/org.jnario.maven.example/src/test/jnario-gen/demo/AllTestsSuite.java b/examples/org.jnario.maven.example/src/test/jnario-gen/demo/AllTestsSuite.java index f2c1a341e..b4e82ff0c 100644 --- a/examples/org.jnario.maven.example/src/test/jnario-gen/demo/AllTestsSuite.java +++ b/examples/org.jnario.maven.example/src/test/jnario-gen/demo/AllTestsSuite.java @@ -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 { +} diff --git a/examples/org.jnario.maven.example/src/test/jnario-gen/demo/CalculatorSpecExamples.java b/examples/org.jnario.maven.example/src/test/jnario-gen/demo/CalculatorSpecExamples.java index 0c048a845..bfef6e289 100644 --- a/examples/org.jnario.maven.example/src/test/jnario-gen/demo/CalculatorSpecExamples.java +++ b/examples/org.jnario.maven.example/src/test/jnario-gen/demo/CalculatorSpecExamples.java @@ -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 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 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; + } +} diff --git a/examples/org.jnario.maven.example/src/test/jnario-gen/demo/TestSuiteSuite.java b/examples/org.jnario.maven.example/src/test/jnario-gen/demo/TestSuiteSuite.java index b6e5009b0..52fa8202a 100644 --- a/examples/org.jnario.maven.example/src/test/jnario-gen/demo/TestSuiteSuite.java +++ b/examples/org.jnario.maven.example/src/test/jnario-gen/demo/TestSuiteSuite.java @@ -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 { +} diff --git a/plugins/org.jnario.feature/META-INF/MANIFEST.MF b/plugins/org.jnario.feature/META-INF/MANIFEST.MF index fb51806f4..2d6207f29 100755 --- a/plugins/org.jnario.feature/META-INF/MANIFEST.MF +++ b/plugins/org.jnario.feature/META-INF/MANIFEST.MF @@ -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 diff --git a/plugins/org.jnario.spec/META-INF/MANIFEST.MF b/plugins/org.jnario.spec/META-INF/MANIFEST.MF index 56ab016d2..c1666667e 100755 --- a/plugins/org.jnario.spec/META-INF/MANIFEST.MF +++ b/plugins/org.jnario.spec/META-INF/MANIFEST.MF @@ -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 diff --git a/plugins/org.jnario.suite/META-INF/MANIFEST.MF b/plugins/org.jnario.suite/META-INF/MANIFEST.MF index 2681de25c..f0fa0d428 100755 --- a/plugins/org.jnario.suite/META-INF/MANIFEST.MF +++ b/plugins/org.jnario.suite/META-INF/MANIFEST.MF @@ -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, diff --git a/plugins/org.jnario.xbase.richstring/META-INF/MANIFEST.MF b/plugins/org.jnario.xbase.richstring/META-INF/MANIFEST.MF index d8f001ab5..ebb29960a 100644 --- a/plugins/org.jnario.xbase.richstring/META-INF/MANIFEST.MF +++ b/plugins/org.jnario.xbase.richstring/META-INF/MANIFEST.MF @@ -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, diff --git a/pom.xml b/pom.xml index 130450ead..c9526f040 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ UTF-8 UTF-8 UTF-8 - photon + 2019-12 2.20.0 ${xtend.version} @@ -134,7 +134,7 @@ org.jnario org.jnario.target ${project.version} - photon-xtext2.14 + 2019-12 true diff --git a/releng/org.jnario.target/2019-12.target b/releng/org.jnario.target/2019-12.target index 7a2d441f9..3076024eb 100644 --- a/releng/org.jnario.target/2019-12.target +++ b/releng/org.jnario.target/2019-12.target @@ -5,15 +5,14 @@ - - - - + + + @@ -49,11 +48,6 @@ - - - - - -Xms40m -Xmx4096m -XX:MaxPermSize=256m diff --git a/releng/org.jnario.target/_mars-xtext2.9.target b/releng/org.jnario.target/_mars-xtext2.9.target deleted file mode 100644 index 2cd3a3b51..000000000 --- a/releng/org.jnario.target/_mars-xtext2.9.target +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --Xms40m -Xmx1024m -XX:MaxPermSize=256m - - diff --git a/releng/org.jnario.target/_mars.target b/releng/org.jnario.target/_mars.target deleted file mode 100644 index f32612979..000000000 --- a/releng/org.jnario.target/_mars.target +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --Xms40m -Xmx1024m -XX:MaxPermSize=256m - - diff --git a/releng/org.jnario.target/kepler.target b/releng/org.jnario.target/kepler.target deleted file mode 100644 index b6f0961b0..000000000 --- a/releng/org.jnario.target/kepler.target +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --Xms40m -Xmx1024m -XX:MaxPermSize=256m - - diff --git a/releng/org.jnario.target/luna.target b/releng/org.jnario.target/luna.target deleted file mode 100644 index 2349ed732..000000000 --- a/releng/org.jnario.target/luna.target +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --Xms40m -Xmx1024m -XX:MaxPermSize=256m - - diff --git a/releng/org.jnario.target/neon-xtext2.11.target b/releng/org.jnario.target/neon-xtext2.11.target deleted file mode 100644 index 27baa764e..000000000 --- a/releng/org.jnario.target/neon-xtext2.11.target +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --Xms40m -Xmx1024m -XX:MaxPermSize=256m - - diff --git a/releng/org.jnario.target/neon-xtext2.12.target b/releng/org.jnario.target/neon-xtext2.12.target deleted file mode 100644 index fa92cc968..000000000 --- a/releng/org.jnario.target/neon-xtext2.12.target +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --Xms40m -Xmx1024m -XX:MaxPermSize=256m - - diff --git a/releng/org.jnario.target/neon.target b/releng/org.jnario.target/neon.target deleted file mode 100644 index a73737e95..000000000 --- a/releng/org.jnario.target/neon.target +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --Xms40m -Xmx1024m -XX:MaxPermSize=256m - - diff --git a/releng/org.jnario.target/oxygen-xtext2.12.target b/releng/org.jnario.target/oxygen-xtext2.12.target deleted file mode 100644 index 95bfc8880..000000000 --- a/releng/org.jnario.target/oxygen-xtext2.12.target +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --Xms40m -Xmx1024m -XX:MaxPermSize=256m - - diff --git a/releng/org.jnario.target/oxygen-xtext2.13.target b/releng/org.jnario.target/oxygen-xtext2.13.target deleted file mode 100644 index 385bc10f5..000000000 --- a/releng/org.jnario.target/oxygen-xtext2.13.target +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --Xms40m -Xmx1024m -XX:MaxPermSize=256m - - diff --git a/releng/org.jnario.target/photon-xtext2.14.target b/releng/org.jnario.target/photon-xtext2.14.target deleted file mode 100644 index 61357741f..000000000 --- a/releng/org.jnario.target/photon-xtext2.14.target +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --Xms40m -Xmx1024m -XX:MaxPermSize=256m - - \ No newline at end of file diff --git a/releng/org.jnario.target/pom.xml b/releng/org.jnario.target/pom.xml index 34e6ca4ae..20ff88af6 100755 --- a/releng/org.jnario.target/pom.xml +++ b/releng/org.jnario.target/pom.xml @@ -31,9 +31,9 @@ - photon-xtext2.14.target + 2019-12.target target - photon-xtext2.14 + 2019-12 diff --git a/tests/org.jnario.tests/META-INF/MANIFEST.MF b/tests/org.jnario.tests/META-INF/MANIFEST.MF index 6b7f347f5..4da7fd813 100755 --- a/tests/org.jnario.tests/META-INF/MANIFEST.MF +++ b/tests/org.jnario.tests/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.xtext.junit4;visibility:=reexport, org.jnario.spec.ui, org.jnario.ui, org.eclipse.emf.codegen, - org.objectweb.asm;bundle-version="5.0.1", + org.objectweb.asm, org.eclipse.jdt.junit, org.eclipse.jdt.junit.runners, org.jnario.spec,