Skip to content

Update microprofile tck artifact install #9077

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Update microprofile tck artifact install #9077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ name: "Validate"

on:
pull_request:
push:
branches-ignore: [ 'main', 'helidon-*.x' ]
workflow_call:

env:
Expand Down
2 changes: 2 additions & 0 deletions microprofile/tests/tck/tck-annotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
Expand All @@ -54,6 +55,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Expand Down
3 changes: 0 additions & 3 deletions microprofile/tests/tck/tck-core-profile/README.md
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions microprofile/tests/tck/tck-core-profile/artifact-install.sh
View file
Open in desktop

This file was deleted.

59 changes: 53 additions & 6 deletions microprofile/tests/tck/tck-core-profile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,23 @@
<artifactId>helidon-microprofile-tests-tck-core-profile</artifactId>
<name>Helidon Microprofile Tests TCK Core Profile</name>

<properties>
<tck.filename>jakarta-core-profile-tck-${version.lib.microprofile-core-profile}</tck.filename>
<tck.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/${tck.filename}.zip</tck.url>
<tck.artifact>core-profile-tck-impl-${version.lib.microprofile-core-profile}</tck.artifact>
<stage.dir>${project.build.directory}/tck</stage.dir>
</properties>

<modules>
<module>tck-core-profile-test</module>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<phase>validate</phase>
Expand All @@ -48,17 +57,55 @@
<configuration>
<target>
<!-- If you use proxy you need to set it as a system properties -->
<get skipexisting="true" src="https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/jakarta-core-profile-tck-${version.lib.microprofile-core-profile}.zip" dest="jakarta-core-profile-tck-${version.lib.microprofile-core-profile}.zip"/>
<unzip src="jakarta-core-profile-tck-${version.lib.microprofile-core-profile}.zip" dest="./target"/>
<chmod file="artifact-install.sh" perm="+x"/>
<exec executable="sh">
<arg line="artifact-install.sh ${version.lib.microprofile-core-profile}"/>
</exec>
<get skipexisting="true" src="${tck.url}" dest="${project.build.directory}/${tck.filename}.zip"/>
<unzip src="${project.build.directory}/${tck.filename}.zip" dest="${stage.dir}">
<patternset>
<include name="**/${tck.artifact}*"/>
<include name="**/*.pom"/>
</patternset>
<mapper type="flatten"/>
</unzip>
<unzip src="${stage.dir}/${tck.artifact}.jar" dest="${stage.dir}">
<patternset>
<include name="META-INF/maven/**/pom.xml"/>
<include name="**/*.pom"/>
</patternset>
<mapper type="regexp" from=".*/pom.xml" to="${tck.artifact}.pom"/>
</unzip>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>parent</id>
<phase>validate</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<file>${stage.dir}/core-tck-parent-${version.lib.microprofile-core-profile}.pom</file>
<pomFile>${stage.dir}/core-tck-parent-${version.lib.microprofile-core-profile}.pom</pomFile>
</configuration>
</execution>
<execution>
<phase>validate</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<file>${stage.dir}/${tck.artifact}.jar</file>
<pomFile>${stage.dir}/${tck.artifact}.pom</pomFile>
<sources>${stage.dir}/${tck.artifact}-sources.jar</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
6 changes: 0 additions & 6 deletions microprofile/tests/tck/tck-core-profile/tck-core-profile-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@

<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
3 changes: 0 additions & 3 deletions microprofile/tests/tck/tck-inject/README.md
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions microprofile/tests/tck/tck-inject/artifact-install.sh
View file
Open in desktop

This file was deleted.

54 changes: 48 additions & 6 deletions microprofile/tests/tck/tck-inject/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,24 @@
<artifactId>helidon-microprofile-tests-tck-inject</artifactId>
<name>Helidon Microprofile Tests TCK Inject</name>

<properties>
<version.lib.jakarta-inject-tck>2.0.2</version.lib.jakarta-inject-tck>
<tck.filename>jakarta.inject-tck-${version.lib.jakarta-inject-tck}</tck.filename>
<tck.url>https://download.eclipse.org/jakartaee/dependency-injection/2.0/${tck.filename}-bin.zip</tck.url>
<tck.artifact>${tck.filename}</tck.artifact>
<stage.dir>${project.build.directory}/tck</stage.dir>
</properties>

<modules>
<module>tck-inject-test</module>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<phase>validate</phase>
Expand All @@ -48,17 +58,49 @@
<configuration>
<target>
<!-- If you use proxy you need to set it as a system properties -->
<get skipexisting="true" src="https://download.eclipse.org/jakartaee/dependency-injection/2.0/jakarta.inject-tck-2.0.2-bin.zip" dest="jakarta.inject-tck-2.0.2-bin.zip"/>
<unzip src="jakarta.inject-tck-2.0.2-bin.zip" dest="./target"/>
<chmod file="artifact-install.sh" perm="+x"/>
<exec executable="sh">
<arg line="artifact-install.sh 2.0.2"/>
</exec>
<get skipexisting="true" src="${tck.url}" dest="${project.build.directory}/${tck.filename}-bin.zip"/>
<unzip src="${project.build.directory}/${tck.filename}-bin.zip" dest="${stage.dir}">
<patternset>
<include name="**/${tck.artifact}*.*"/>
</patternset>
<mapper type="flatten"/>
</unzip>
<unzip src="${project.build.directory}/${tck.filename}-bin.zip" dest="${stage.dir}-sources">
<patternset>
<include name="**/*.java"/>
</patternset>
<mapper type="regexp" from=".*/src/test/java/(.*)" to="\1"/>
</unzip>
<unzip src="${stage.dir}/${tck.artifact}.jar" dest="${stage.dir}">
<patternset>
<include name="META-INF/maven/**/pom.xml"/>
<include name="**/*.pom"/>
</patternset>
<mapper type="regexp" from=".*/pom.xml" to="${tck.artifact}.pom"/>
</unzip>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<file>${stage.dir}/${tck.filename}.jar</file>
<pomFile>${stage.dir}/${tck.filename}.pom</pomFile>
<sources>${stage.dir}/${tck.filename}-sources.jar</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
11 changes: 2 additions & 9 deletions microprofile/tests/tck/tck-inject/tck-inject-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,13 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-tck</artifactId>
<version>${version.lib.jakarta.inject}</version>
<version>${version.lib.jakarta-inject-tck}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -83,8 +77,7 @@
</goals>
<configuration>
<sources>
<source>src/test/java</source>
<source>../target/jakarta.inject-tck-2.0.2/example/src/test/java</source>
<source>${project.basedir}/../target/tck-sources</source>
</sources>
</configuration>
</execution>
Expand Down
40 changes: 34 additions & 6 deletions microprofile/tests/tck/tck-jsonb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,23 @@
<artifactId>helidon-microprofile-tests-tck-jsonb</artifactId>
<name>Helidon Microprofile Tests TCK JSONB</name>

<properties>
<tck.filename>jakarta-jsonb-tck-${version.lib.jakarta.jsonb-api}</tck.filename>
<tck.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/promoted/eftl/${tck.filename}.zip</tck.url>
<tck.artifact>jakarta.json.bind-tck-${version.lib.jakarta.jsonb-api}</tck.artifact>
<stage.dir>${project.build.directory}/tck</stage.dir>
</properties>

<modules>
<module>tck-jsonb-test</module>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<phase>validate</phase>
Expand All @@ -48,17 +57,36 @@
<configuration>
<target>
<!-- If you use proxy you need to set it as a system properties -->
<get skipexisting="true" src="https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/promoted/eftl/jakarta-jsonb-tck-${version.lib.jakarta.jsonb-api}.zip" dest="jakarta-jsonb-tck-${version.lib.jakarta.jsonb-api}.zip"/>
<unzip src="jakarta-jsonb-tck-${version.lib.jakarta.jsonb-api}.zip" dest="./target"/>
<chmod file="target/jsonb-tck/artifacts/artifact-install.sh" perm="+x"/>
<exec dir="target/jsonb-tck/artifacts" executable="sh">
<arg line="artifact-install.sh"/>
</exec>
<get skipexisting="true" src="${tck.url}" dest="${project.build.directory}/${tck.filename}.zip"/>
<unzip src="${project.build.directory}/${tck.filename}.zip" dest="${stage.dir}">
<patternset>
<include name="**/${tck.artifact}*"/>
</patternset>
<mapper type="flatten"/>
</unzip>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<file>${stage.dir}/${tck.artifact}.jar</file>
<pomFile>${stage.dir}/${tck.artifact}.pom</pomFile>
<sources>${stage.dir}/${tck.artifact}-sources.jar</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
7 changes: 1 addition & 6 deletions microprofile/tests/tck/tck-jsonb/tck-jsonb-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,7 @@
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
Expand Down
3 changes: 0 additions & 3 deletions microprofile/tests/tck/tck-jsonp/README.md
View file
Open in desktop

This file was deleted.

Loading