Skip to content

Commit 6af102a

Browse files
authored
Merge pull request #368 from mehmet-karaman/bump_versions_and_copy_of_BumpVersions_etc
bump versions + copied BumpVersions (& adjusted) and MergableManifest2
2 parents 7f15726 + 37c1c67 commit 6af102a

File tree

25 files changed

+1311
-193
lines changed

25 files changed

+1311
-193
lines changed

org.eclipse.xpect.doc/META-INF/MANIFEST.MF

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ Bundle-SymbolicName: org.eclipse.xpect.doc
66
Bundle-Localization: plugin
77
Bundle-Version: 1.0.0.qualifier
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
9-
Require-Bundle: org.eclipse.xtext;bundle-version="2.4.0",
10-
org.eclipse.xtext.common.types;bundle-version="2.4.0",
9+
Require-Bundle: org.eclipse.xtext;bundle-version="2.34.0",
10+
org.eclipse.xtext.common.types;bundle-version="2.34.0",
1111
org.junit;bundle-version="4.10.0",
1212
org.apache.log4j;bundle-version="1.2.15",
13-
org.eclipse.xtext.xbase;bundle-version="2.4.0",
14-
org.eclipse.xtext.ui;bundle-version="2.4.0",
15-
org.eclipse.xtext.common.types.ui;bundle-version="2.4.0",
16-
org.eclipse.xtext.ui.codetemplates;bundle-version="2.4.0",
17-
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.4.0",
18-
org.eclipse.compare;bundle-version="3.5.301",
19-
org.eclipse.xtext.ui.shared;bundle-version="2.4.0",
20-
org.eclipse.ui.ide;bundle-version="3.7.0",
13+
org.eclipse.xtext.xbase;bundle-version="2.34.0",
14+
org.eclipse.xtext.ui;bundle-version="2.34.0",
15+
org.eclipse.xtext.common.types.ui;bundle-version="2.34.0",
16+
org.eclipse.xtext.ui.codetemplates;bundle-version="2.34.0",
17+
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.34.0",
18+
org.eclipse.compare;bundle-version="3.10.0",
19+
org.eclipse.xtext.ui.shared;bundle-version="2.34.0",
20+
org.eclipse.ui.ide;bundle-version="3.22.100",
2121
org.eclipse.jdt;bundle-version="3.7.0",
22-
org.eclipse.jdt.junit;bundle-version="3.7.100",
23-
org.eclipse.pde.ui;bundle-version="3.7.2",
24-
org.eclipse.debug.ui;bundle-version="3.7.0",
22+
org.eclipse.jdt.junit;bundle-version="3.16.300",
23+
org.eclipse.pde.ui;bundle-version="3.15.100",
24+
org.eclipse.debug.ui;bundle-version="3.18.300",
2525
org.eclipse.xpect;bundle-version="0.1.0",
2626
org.eclipse.xpect.ui;bundle-version="0.1.0"
2727
Automatic-Module-Name: org.eclipse.xpect.doc

org.eclipse.xpect.examples/META-INF/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Bundle-Version: 1.0.0.qualifier
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
99
Require-Bundle: org.eclipse.xtend.lib,
1010
com.google.guava,
11-
org.eclipse.xtext.xbase.lib,
11+
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
1212
org.eclipse.xpect.xtext.lib;bundle-version="0.1.0",
1313
org.eclipse.xtend.ide;bundle-version="2.4.0",
14-
org.eclipse.xtext.xtext.ui;bundle-version="2.4.0",
15-
org.eclipse.emf.codegen;bundle-version="2.8.0"
14+
org.eclipse.xtext.xtext.ui;bundle-version="2.34.0",
15+
org.eclipse.emf.codegen;bundle-version="2.23.0"
1616
Automatic-Module-Name: org.eclipse.xpect.examples

org.eclipse.xpect.ide/META-INF/MANIFEST.MF

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Bundle-Version: 0.3.0.qualifier
77
Bundle-SymbolicName: org.eclipse.xpect.ide; singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.eclipse.xpect,
10-
org.eclipse.xtext.ide,
11-
org.eclipse.xtext.xbase.ide,
10+
org.eclipse.xtext.ide;bundle-version="2.34.0",
11+
org.eclipse.xtext.xbase.ide;bundle-version="2.34.0",
1212
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
1313
Bundle-RequiredExecutionEnvironment: JavaSE-17
14-
Export-Package: org.eclipse.xpect.ide.contentassist.antlr,
15-
org.eclipse.xpect.ide.contentassist.antlr.lexer,
16-
org.eclipse.xpect.lexer,
17-
org.eclipse.xpect.ide.contentassist.antlr.internal
14+
Export-Package: org.eclipse.xpect.ide.contentassist.antlr;version="0.3.0",
15+
org.eclipse.xpect.ide.contentassist.antlr.lexer;version="0.3.0",
16+
org.eclipse.xpect.lexer;version="0.3.0",
17+
org.eclipse.xpect.ide.contentassist.antlr.internal;version="0.3.0"

org.eclipse.xpect.mwe2/META-INF/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Bundle-Version: 0.3.0.qualifier
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
99
Automatic-Module-Name: org.eclipse.xpect.xtext.lib
1010
Require-Bundle: com.google.guava,
11-
org.eclipse.xtext.xbase.lib,
11+
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
1212
org.eclipse.xtend.lib,
1313
org.eclipse.xtend.lib.macro,
14-
org.eclipse.xtext,
15-
org.eclipse.xtext.xtext.generator;bundle-version="2.31.0"
14+
org.eclipse.xtext;bundle-version="2.34.0",
15+
org.eclipse.xtext.xtext.generator;bundle-version="2.34.0"
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
4+
<attributes>
5+
<attribute name="module" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
10+
<attributes>
11+
<attribute name="maven.pomderived" value="true"/>
12+
</attributes>
13+
</classpathentry>
14+
<classpathentry excluding="main/resources/|test/resources/" kind="src" path="src"/>
15+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
16+
<classpathentry kind="output" path="target/classes"/>
17+
</classpath>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.eclipse.xpect.releng.utils</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.pde.ManifestBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.pde.SchemaBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
</buildSpec>
24+
<natures>
25+
<nature>org.eclipse.jdt.core.javanature</nature>
26+
<nature>org.eclipse.pde.PluginNature</nature>
27+
</natures>
28+
</projectDescription>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
5+
org.eclipse.jdt.core.compiler.compliance=17
6+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
7+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
8+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
9+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
10+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
11+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
12+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
13+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
14+
org.eclipse.jdt.core.compiler.release=enabled
15+
org.eclipse.jdt.core.compiler.source=17
16+
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: Utils
4+
Bundle-SymbolicName: org.eclipse.xpect.releng.utils
5+
Bundle-Version: 0.3.0.qualifier
6+
Bundle-RequiredExecutionEnvironment: JavaSE-17
7+
Automatic-Module-Name: org.eclipse.xpect.utils
8+
Export-Package: org.eclipse.xpect.releng.utils;version="0.3.0"
9+
Require-Bundle: org.eclipse.xtext.util;bundle-version="2.34.0"

0 commit comments

Comments
 (0)