Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Tycho 4 #1448

Merged
merged 2 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ jobs:
- name: Set up Maven
uses: stCarolas/[email protected]
with:
maven-version: 3.8.5
maven-version: 3.9.2
- name: Build with Maven
run: mvn -f chemclipse/releng/org.eclipse.chemclipse.aggregator/pom.xml -Dtycho.build.smartbuilder=true -T 1C verify --batch-mode --no-transfer-progress
run: mvn -f chemclipse/releng/org.eclipse.chemclipse.aggregator/pom.xml -T 1C clean verify --batch-mode --no-transfer-progress
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pipeline {
}
stage('build') {
steps {
sh 'mvn -T 1C -B -Dtycho.localArtifacts=false -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORKSPACE/.mvn -f chemclipse/releng/org.eclipse.chemclipse.aggregator/pom.xml clean install'
sh 'mvn -B -Dtycho.localArtifacts=false -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORKSPACE/.mvn -f chemclipse/releng/org.eclipse.chemclipse.aggregator/pom.xml clean install'
archiveArtifacts 'chemclipse/products/org.eclipse.chemclipse.rcp.compilation.community.product/target/products/*.zip,chemclipse/products/org.eclipse.chemclipse.rcp.compilation.community.product/target/products/*.tar.gz'
}
}
Expand Down
22 changes: 11 additions & 11 deletions chemclipse/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2012, 2022 Lablicate GmbH. 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 Contributors: Dr. Philip Wenig
- created the pom to build the plug-ins -->
<!-- Copyright (c) 2012, 2023 Lablicate GmbH. 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
Contributors: Dr. Philip Wenig - created the pom to build the plug-ins -->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
Expand All @@ -14,10 +14,10 @@
<packaging>pom</packaging>
<properties>
<!-- versions for plugins to use -->
<tycho.version>3.0.5</tycho.version>
<pmd.version>3.16.0</pmd.version>
<checkstyle.version>3.1.2</checkstyle.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<tycho.version>4.0.2</tycho.version>
<pmd.version>3.21.0</pmd.version>
<checkstyle.version>3.3.0</checkstyle.version>
<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
<cbi-version>1.1.5</cbi-version>
<!-- definition of the target to use -->
<tycho.target.groupId>org.eclipse.chemclipse</tycho.target.groupId>
Expand Down Expand Up @@ -185,7 +185,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<version>3.3.0</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand All @@ -195,7 +195,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.0</version>
<version>3.9</version>
</requireMavenVersion>
</rules>
</configuration>
Expand Down
Loading