mirror of
https://github.com/sigmasternchen/xtext-core
synced 2025-03-15 08:18:55 +00:00
Merge branch 'master' into sz_jcenter
This commit is contained in:
commit
39b3be7c90
4 changed files with 7 additions and 7 deletions
|
@ -8,8 +8,8 @@ Check out and run `./gradlew build`.
|
||||||
|
|
||||||
Additional command line arguments:
|
Additional command line arguments:
|
||||||
- `-PcompileXtend=true` activates the [Xtend](http://xtend-lang.org) compiler, but this is optional because the generated Java code is included in the repository.
|
- `-PcompileXtend=true` activates the [Xtend](http://xtend-lang.org) compiler, but this is optional because the generated Java code is included in the repository.
|
||||||
- `-PuseJenkinsSnapshots=true` switches to using the Maven repository generated by the [Jenkins build job](https://services.typefox.io/open-source/jenkins/job/xtext-lib/) for [xtext-lib](https://github.com/eclipse/xtext-lib). Without this argument, [Sonatype snapshots](https://oss.sonatype.org/content/repositories/snapshots) are used.
|
- `-PuseJenkinsSnapshots=true` switches to using the Maven repository generated by the [Jenkins build job](https://ci.eclipse.org/xtext/job/xtext-lib/) for [xtext-lib](https://github.com/eclipse/xtext-lib). Without this argument, [Sonatype snapshots](https://oss.sonatype.org/content/repositories/snapshots) are used.
|
||||||
|
|
||||||
## Continuous Integration
|
## Continuous Integration
|
||||||
|
|
||||||
This project is built by the [xtext-core multi-branch job on Jenkins](https://services.typefox.io/open-source/jenkins/job/xtext-core/).
|
This project is built by the [xtext-core multi-branch job on Jenkins](https://ci.eclipse.org/xtext/job/xtext-core/).
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Root project configuration that is reused by subprojects to apply the Xtend compiler.
|
* Root project configuration that is reused by subprojects to apply the Xtend compiler.
|
||||||
*/
|
*/
|
||||||
if (!hasProperty('JENKINS_URL')) {
|
if (!hasProperty('JENKINS_URL')) {
|
||||||
ext.JENKINS_URL = 'https://services.typefox.io/open-source/jenkins'
|
ext.JENKINS_URL = 'https://ci.eclipse.org/xtext'
|
||||||
}
|
}
|
||||||
|
|
||||||
// The repositories to query when constructing the Xtend compiler classpath
|
// The repositories to query when constructing the Xtend compiler classpath
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (!hasProperty('JENKINS_URL')) {
|
if (!hasProperty('JENKINS_URL')) {
|
||||||
ext.JENKINS_URL = 'https://services.typefox.io/open-source/jenkins'
|
ext.JENKINS_URL = 'https://ci.eclipse.org/xtext'
|
||||||
}
|
}
|
||||||
|
|
||||||
ext.MVN_REPOPATH = 'lastStableBuild/artifact/build/maven-repository/'
|
ext.MVN_REPOPATH = 'lastStableBuild/artifact/build/maven-repository/'
|
||||||
|
@ -26,7 +26,7 @@ def jenkinsPipelineRepo = { jobName, branch ->
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
if (findProperty('useJenkinsSnapshots') == 'true') {
|
if (findProperty('useJenkinsSnapshots') == 'true') {
|
||||||
maven { url "https://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/$MVN_REPOPATH" }
|
maven { url "https://ci.eclipse.org/xtext/job/lsp4j/job/master/$MVN_REPOPATH" }
|
||||||
maven { url jenkinsPipelineRepo('xtext-lib','autodetect') }
|
maven { url jenkinsPipelineRepo('xtext-lib','autodetect') }
|
||||||
} else {
|
} else {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
|
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
|
||||||
<tycho-version>1.3.0</tycho-version>
|
<tycho-version>1.3.0</tycho-version>
|
||||||
<root-dir>${basedir}/..</root-dir>
|
<root-dir>${basedir}/..</root-dir>
|
||||||
<JENKINS_URL>https://services.typefox.io/open-source/jenkins</JENKINS_URL>
|
<JENKINS_URL>https://ci.eclipse.org/xtext</JENKINS_URL>
|
||||||
<upstreamBranch>master</upstreamBranch>
|
<upstreamBranch>master</upstreamBranch>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>lsp4j</id>
|
<id>lsp4j</id>
|
||||||
<url>https://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastStableBuild/artifact/build/maven-repository</url>
|
<url>https://ci.eclipse.org/xtext/job/lsp4j/job/master/lastStableBuild/artifact/build/maven-repository</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>lib</id>
|
<id>lib</id>
|
||||||
|
|
Loading…
Reference in a new issue