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

add artifact installer, parent for the runner #133

Merged
merged 1 commit into from
Feb 29, 2024
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions tck/docs/tck-runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.9</version>
</parent>

<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-tck-impl</artifactId>
<version>3.0.0</version>
Expand Down
6 changes: 3 additions & 3 deletions tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>jakarta.annotation</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
Expand Down Expand Up @@ -172,10 +172,10 @@
<build>
<plugins>
<plugin>
<groupId>jakarta.annotation</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<configuration>
<sigfile>${project.build.directory}/jakarta.annotation.sig_${project.parent.version}</sigfile>
<sigfile>${project.build.directory}/jakarta.annotation.sig_${project.version}</sigfile>
<packages>jakarta.annotation,jakarta.annotation.security,jakarta.annotation.sql</packages>
</configuration>
<executions>
Expand Down
34 changes: 34 additions & 0 deletions tck/src/main/artifacts/artifact-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/env bash
#
# Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved.
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License v. 2.0, which is available at
# http://www.eclipse.org/legal/epl-2.0.
#
# This Source Code may also be made available under the following Secondary
# Licenses when the conditions for such availability set forth in the
# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
# version 2 with the GNU Classpath Exception, which is available at
# https://www.gnu.org/software/classpath/license.html.
#
# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
#

##script to install the artifact directory contents into a local maven repository

if [[ $1 =~ ^[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
VERSION="$1"
else
VERSION="3.0.0"
fi

# test jar
mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
-Dfile=jakarta-annotations-tck-"$VERSION".jar -DgroupId=jakarta.annotation \
-DartifactId=jakarta-annotations-tck -Dversion="$VERSION" -Dpackaging=jar

# test sources jar
mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
-Dfile=jakarta-annotations-tck-"$VERSION"-sources.jar -DgroupId=jakarta.annotation \
-DartifactId=jakarta-annotations-tck-sources -Dversion="$VERSION" -Dpackaging=jar
10 changes: 9 additions & 1 deletion tck/src/main/assembly/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@
<include>css/**</include>
<include>img/**</include>
</includes>
</fileSet>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/artifacts</directory>
<outputDirectory>artifacts</outputDirectory>
<includes>
<include>**/*.sh</include>
</includes>
<filtered>false</filtered>
</fileSet>
</fileSets>
</assembly>