Skip to content

Commit df04f66

Browse files
committed
test tycho 5.0
Signed-off-by: Christian Dietrich <[email protected]> [#2895] attempt to archive surefire reports in the hope to get a thread dump Signed-off-by: Christian Dietrich <[email protected]> in timeout see #3073 add another 10 mins Signed-off-by: Christian Dietrich <[email protected]>
1 parent d53cb3c commit df04f66

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

.mvn/wrapper/maven-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.3/maven-wrapper-3.3.3.jar

Jenkinsfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ pipeline {
66
}
77

88
parameters {
9-
choice(name: 'TARGET_PLATFORM', choices: ['r202403', 'r202406', 'r202409', 'r202412', 'r202503', 'r202506', 'r202509', 'r202512', 'latest'], description: 'Which Target Platform should be used?')
9+
choice(name: 'TARGET_PLATFORM', choices: ['latest', 'r202403', 'r202406', 'r202409', 'r202412', 'r202503', 'r202506', 'r202509', 'r202512'], description: 'Which Target Platform should be used?')
1010
// see https://wiki.eclipse.org/Jenkins#JDK
11-
choice(name: 'JDK_VERSION', choices: [ '17', '21' ], description: 'Which JDK version should be used?')
11+
choice(name: 'JDK_VERSION', choices: [ '21' , '17'], description: 'Which JDK version should be used?')
1212
}
1313

1414
triggers {
15-
parameterizedCron(env.BRANCH_NAME == 'main' ? '''
16-
H H(0-1) * * * %TARGET_PLATFORM=r202403;JDK_VERSION=17
17-
H H(3-4) * * * %TARGET_PLATFORM=latest;JDK_VERSION=21
15+
parameterizedCron(env.BRANCH_NAME == 'cd_tycho50' ? '''
16+
H H(13-14) * * * %TARGET_PLATFORM=latest;JDK_VERSION=21
1817
''' : '')
1918
}
2019

20+
2121
options {
2222
buildDiscarder(logRotator(numToKeepStr:'10'))
2323
disableConcurrentBuilds()
@@ -97,7 +97,7 @@ pipeline {
9797
archiveArtifacts artifacts: 'build/**, **/target/work/data/.metadata/.log, **/target/work/data/.metadata/bak*.log'
9898
}
9999
unsuccessful {
100-
archiveArtifacts artifacts: 'org.eclipse.xtend.ide.swtbot.tests/screenshots/**, **/target/work/data/.metadata/.log, **/target/work/data/.metadata/bak*.log, **/hs_err_pid*.log'
100+
archiveArtifacts artifacts: 'org.eclipse.xtend.ide.swtbot.tests/screenshots/**, **/target/work/data/.metadata/.log, **/target/work/data/.metadata/bak*.log, **/hs_err_pid*.log, **/target/surefire-reports/*'
101101
}
102102
cleanup {
103103
script {

org.eclipse.xtend.maven.archetype/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<extraArtifact>org.eclipse.xtext:xtext-dev-bom:${project.version}:pom</extraArtifact>
6767
</extraArtifacts>
6868
<localRepositoryPath>${localMavenRepositoryPath}</localRepositoryPath>
69+
<scope>provided</scope>
6970
</configuration>
7071
<executions>
7172
<execution>
@@ -74,9 +75,6 @@
7475
<goals>
7576
<goal>install</goal>
7677
</goals>
77-
<configuration>
78-
<scope>test</scope>
79-
</configuration>
8078
</execution>
8179
</executions>
8280
</plugin>
@@ -105,7 +103,7 @@
105103
<groupId>org.eclipse.xtext</groupId>
106104
<artifactId>xtend-maven-plugin</artifactId>
107105
<version>${project.version}</version>
108-
<scope>test</scope>
106+
<scope>provided</scope>
109107
</dependency>
110108
</dependencies>
111109
<profiles>

pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125

126126
<properties>
127127
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
128-
<tycho-version>4.0.13</tycho-version>
128+
<tycho-version>5.0.3-SNAPSHOT</tycho-version>
129129

130130
<maven.compiler.source>17</maven.compiler.source>
131131
<maven.compiler.target>17</maven.compiler.target>
@@ -1122,4 +1122,11 @@
11221122
</plugins>
11231123
</build>
11241124

1125+
<pluginRepositories>
1126+
<pluginRepository>
1127+
<id>tycho-snapshots</id>
1128+
<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
1129+
</pluginRepository>
1130+
</pluginRepositories>
1131+
11251132
</project>

0 commit comments

Comments
 (0)