Skip to content

Commit

Permalink
Merge pull request #408 from xtext/cd_235
Browse files Browse the repository at this point in the history
prepare 2.35 projects
  • Loading branch information
cdietrich committed Feb 28, 2024
2 parents f7f78d9 + 1e81087 commit d058ab2
Show file tree
Hide file tree
Showing 234 changed files with 12,204 additions and 18 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
Expand Up @@ -18,7 +18,7 @@ jobs:
distribution: 'temurin'
java-version: 17
- name: Build
run: scripts/greetings-gradle-2.34.sh
run: scripts/greetings-gradle-2.35.sh
build_Gralde_J11:
runs-on: ubuntu-latest
steps:
Expand All @@ -29,7 +29,7 @@ jobs:
distribution: 'temurin'
java-version: 11
- name: Build
run: scripts/greetings-gradle-2.34-J11.sh
run: scripts/greetings-gradle-2.35-J11.sh
build_Gralde_J11_on_J17:
runs-on: ubuntu-latest
steps:
Expand All @@ -40,7 +40,7 @@ jobs:
distribution: 'temurin'
java-version: 17
- name: Build
run: scripts/greetings-gradle-2.34-J11.sh
run: scripts/greetings-gradle-2.35-J11.sh
build_Maven_J17:
runs-on: ubuntu-latest
steps:
Expand All @@ -51,7 +51,7 @@ jobs:
distribution: 'temurin'
java-version: 17
- name: Build
run: scripts/greetings-maven-2.34.sh
run: scripts/greetings-maven-2.35.sh
build_Maven_J11:
runs-on: ubuntu-latest
steps:
Expand All @@ -62,7 +62,7 @@ jobs:
distribution: 'temurin'
java-version: 11
- name: Build
run: scripts/greetings-maven-2.34-J11.sh
run: scripts/greetings-maven-2.35-J11.sh
build_Maven_J11_on_J17:
runs-on: ubuntu-latest
steps:
Expand All @@ -73,7 +73,7 @@ jobs:
distribution: 'temurin'
java-version: 17
- name: Build
run: scripts/greetings-maven-2.34-J11.sh
run: scripts/greetings-maven-2.35-J11.sh
build_tycho_J17:
runs-on: ubuntu-latest
steps:
Expand All @@ -84,7 +84,7 @@ jobs:
distribution: 'temurin'
java-version: 17
- name: Build
run: xvfb-run scripts/greetings-tycho-2.34.sh
run: xvfb-run scripts/greetings-tycho-2.35.sh
build_tycho_J11:
runs-on: ubuntu-latest
steps:
Expand All @@ -95,7 +95,7 @@ jobs:
distribution: 'temurin'
java-version: 11
- name: Build
run: xvfb-run scripts/greetings-tycho-2.34-J11.sh
run: xvfb-run scripts/greetings-tycho-2.35-J11.sh
build_tycho_J17_tycho_40:
runs-on: ubuntu-latest
steps:
Expand All @@ -112,7 +112,7 @@ jobs:
- name: Build
env:
EXTRA_ARGS : "-Dtycho-version=4.0.5"
run: xvfb-run scripts/greetings-tycho-2.34.sh
run: xvfb-run scripts/greetings-tycho-2.35.sh
build_tycho_J17_tycho_50:
runs-on: ubuntu-latest
steps:
Expand All @@ -129,7 +129,7 @@ jobs:
- name: Build
env:
EXTRA_ARGS : "-Dtycho-version=5.0.0-SNAPSHOT -Ptycho_snapshots"
run: xvfb-run scripts/greetings-tycho-2.34.sh
run: xvfb-run scripts/greetings-tycho-2.35.sh
build_domain:
runs-on: ubuntu-latest
steps:
Expand All @@ -144,7 +144,7 @@ jobs:
with:
maven-version: 3.9.1
- name: Build
run: xvfb-run scripts/domainmodel-2.34.sh
run: xvfb-run scripts/domainmodel-2.35.sh
build_domain_tycho_50_J17:
runs-on: ubuntu-latest
steps:
Expand All @@ -161,4 +161,4 @@ jobs:
- name: Build
env:
EXTRA_ARGS : "-Dtycho-version=5.0.0-SNAPSHOT -Ptycho_snapshots"
run: xvfb-run scripts/domainmodel-2.34.sh
run: xvfb-run scripts/domainmodel-2.35.sh
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
@@ -0,0 +1 @@
bin
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.xtext.example.domainmodel.ide</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
@@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=11
@@ -0,0 +1,16 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Xtext Domainmodel Example - Generic IDE
Bundle-Vendor: Eclipse Xtext
Bundle-Version: 2.35.0.qualifier
Bundle-SymbolicName: org.eclipse.xtext.example.domainmodel.ide; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.example.domainmodel,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.xtext.example.domainmodel.ide;x-internal:=true,
org.eclipse.xtext.example.domainmodel.ide.contentassist.antlr,
org.eclipse.xtext.example.domainmodel.ide.contentassist.antlr.internal
Automatic-Module-Name: org.eclipse.xtext.example.domainmodel.ide
@@ -0,0 +1,4 @@
source.. = src/,\
src-gen/
bin.includes = .,\
META-INF/
146 changes: 146 additions & 0 deletions domainmodel/2.35.0/org.eclipse.xtext.example.domainmodel.ide/pom.xml
@@ -0,0 +1,146 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.xtext.example.domainmodel</groupId>
<artifactId>org.eclipse.xtext.example.domainmodel.parent</artifactId>
<version>2.35.0-SNAPSHOT</version>
<relativePath>../org.eclipse.xtext.example.domainmodel.releng</relativePath>
</parent>
<artifactId>org.eclipse.xtext.example.domainmodel.ide</artifactId>
<packaging>eclipse-plugin</packaging>

<dependencies>
<dependency>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.lsp4j</groupId>
<artifactId>org.eclipse.lsp4j</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<pomDependencies>consider</pomDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/libs</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<excludeTransitive>true</excludeTransitive>
<excludeArtifactIds>
com.ibm.icu,
org.apache.ant,
org.apache.commons.lang,
org.apache.commons.logging,
org.eclipse.core.commands,
org.eclipse.core.contenttype,
org.eclipse.core.expressions,
org.eclipse.core.filesystem,
org.eclipse.core.jobs,
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.core.variables,
org.eclipse.debug.core,
org.eclipse.emf.codegen.ecore,
org.eclipse.emf.codegen,
org.eclipse.emf.mwe.core,
org.eclipse.emf.mwe.utils,
org.eclipse.emf.mwe2.lib,
org.eclipse.emf.mwe2.runtime,
org.eclipse.equinox.app,
org.eclipse.equinox.preferences,
org.eclipse.equinox.registry,
org.eclipse.jdt.core,
org.eclipse.jdt.debug,
org.eclipse.jdt.launching,
org.eclipse.text
</excludeArtifactIds>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.googlecode.addjars-maven-plugin</groupId>
<artifactId>addjars-maven-plugin</artifactId>
<version>1.0.5</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>add-jars</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${project.build.directory}/libs</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
<version>2.1.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>assemble</goal>
</goals>
<configuration>
<assembleDirectory>${project.build.directory}/languageserver</assembleDirectory>
<repositoryLayout>flat</repositoryLayout>
<useWildcardClassPath>true</useWildcardClassPath>
<!-- uncomment to enable remote debugging
<extraJvmArguments>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000</extraJvmArguments>
-->
<programs>
<program>
<id>mydsl-ls</id>
<mainClass>org.eclipse.xtext.ide.server.ServerLauncher</mainClass>
<!-- uncomment to enable options
<commandLineArguments>
<commandLineArgument>-trace</commandLineArgument>
<commandLineArgument>-log</commandLineArgument>
<commandLineArgument>-noValidate</commandLineArgument>
</commandLineArguments>
-->
</program>
</programs>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
@@ -0,0 +1,16 @@
/**
* Copyright (c) 2011, 2019 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.xtext.example.domainmodel.ide;


/**
* Use this class to register ide components.
*/
public class DomainmodelIdeModule extends AbstractDomainmodelIdeModule {
}
@@ -0,0 +1,27 @@
/**
* Copyright (c) 2011, 2019 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.xtext.example.domainmodel.ide;

import com.google.inject.Guice;
import com.google.inject.Injector;
import org.eclipse.xtext.example.domainmodel.DomainmodelRuntimeModule;
import org.eclipse.xtext.example.domainmodel.DomainmodelStandaloneSetup;
import org.eclipse.xtext.util.Modules2;

/**
* Initialization support for running Xtext languages as language servers.
*/
public class DomainmodelIdeSetup extends DomainmodelStandaloneSetup {

@Override
public Injector createInjector() {
return Guice.createInjector(Modules2.mixin(new DomainmodelRuntimeModule(), new DomainmodelIdeModule()));
}

}
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.xtext.example.domainmodel.releng</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
</projectDescription>
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8

0 comments on commit d058ab2

Please sign in to comment.