From fa9bceffad9b76e85b7a85eebf69fbd5b1f047c7 Mon Sep 17 00:00:00 2001 From: Benoit Maggi Date: Mon, 4 Dec 2023 08:14:00 +0100 Subject: [PATCH] Update tycho default version to 4.0.4 - maven version 3.9.x will be required - improve format on README.md - rename test since only one on the latest default values is kept --- .github/workflows/maven.yml | 2 +- README.md | 16 ++++++++-------- RELEASE.md | 2 +- .../META-INF/maven/archetype-metadata.xml | 2 +- .../archetype.properties | 2 +- .../goal.txt | 0 6 files changed, 12 insertions(+), 12 deletions(-) rename src/test/resources/projects/{java17-tycho3.0.1-latest => java-tycho-eclipse-latest}/archetype.properties (86%) rename src/test/resources/projects/{java17-tycho3.0.1-latest => java-tycho-eclipse-latest}/goal.txt (100%) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c115c86..9048df9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -19,4 +19,4 @@ jobs: java-version: '17' distribution: 'temurin' - name: Build with Maven - run: mvn --batch-mode --update-snapshots clean install + run: mvn --batch-mode --update-snapshots -Dmaven=3.9.0 clean install diff --git a/README.md b/README.md index ce2fc25..900a9a0 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,14 @@ Generated structure |-- com.acme.targetplatform ``` --- -|Parameter|Default Value|Description| -|---------|-------------|-----------| -|groupId|groupId|Maven 'groupId'| -|artifactId|artifactId|Maven 'artifactId'| -|version|1.0.0-SNAPSHOT|Maven 'version'| -|tychoVersion|3.0.1|Tycho 'version'| -|javaVersion|17|Java 'version'| -|eclipsePlatform|latest|Eclipse target platform| +| Parameter | Default Value | Description | +|-----------------|----------------|-------------------------| +| groupId | groupId | Maven 'groupId' | +| artifactId | artifactId | Maven 'artifactId' | +| version | 1.0.0-SNAPSHOT | Maven 'version' | +| tychoVersion | 4.0.4 | Tycho 'version' | +| javaVersion | 17 | Java 'version' | +| eclipsePlatform | latest | Eclipse target platform | Create project with Maven command line ------------------------------------------ diff --git a/RELEASE.md b/RELEASE.md index acfea44..e61bdb7 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -6,7 +6,7 @@ To release on maven central. - Tycho from [Maven Central](https://mvnrepository.com/artifact/org.eclipse.tycho/tycho-core) ---------------------------- -- Repo should be clone using ssh (scm plugin not working with https) +- Repo should be cloned using ssh (scm plugin not working with https) ``` mvn release:clean release:prepare ``` diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml index 3e6a579..ab49869 100644 --- a/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -9,7 +9,7 @@ - 3.0.1 + 4.0.4 17 diff --git a/src/test/resources/projects/java17-tycho3.0.1-latest/archetype.properties b/src/test/resources/projects/java-tycho-eclipse-latest/archetype.properties similarity index 86% rename from src/test/resources/projects/java17-tycho3.0.1-latest/archetype.properties rename to src/test/resources/projects/java-tycho-eclipse-latest/archetype.properties index 2a1d384..04f987f 100644 --- a/src/test/resources/projects/java17-tycho3.0.1-latest/archetype.properties +++ b/src/test/resources/projects/java-tycho-eclipse-latest/archetype.properties @@ -2,6 +2,6 @@ groupId=myGroupId artifactId=myArtifactId version=1.0.0-SNAPSHOT package=myPackage -tychoVersion=3.0.1 +tychoVersion=4.0.4 javaVersion=17 eclipsePlatform=latest \ No newline at end of file diff --git a/src/test/resources/projects/java17-tycho3.0.1-latest/goal.txt b/src/test/resources/projects/java-tycho-eclipse-latest/goal.txt similarity index 100% rename from src/test/resources/projects/java17-tycho3.0.1-latest/goal.txt rename to src/test/resources/projects/java-tycho-eclipse-latest/goal.txt