diff --git a/tck/docs/tck-runner/pom.xml b/tck/docs/tck-runner/pom.xml index 968b9d4..aec2eaa 100644 --- a/tck/docs/tck-runner/pom.xml +++ b/tck/docs/tck-runner/pom.xml @@ -17,6 +17,12 @@ 4.0.0 + + org.eclipse.ee4j + project + 1.0.9 + + jakarta.annotation jakarta.annotation-tck-impl 3.0.0 diff --git a/tck/pom.xml b/tck/pom.xml index fd57063..207bc5d 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -80,7 +80,7 @@ 3.6.0 - jakarta.annotation + jakarta.tck sigtest-maven-plugin 2.2 @@ -172,10 +172,10 @@ - jakarta.annotation + jakarta.tck sigtest-maven-plugin - ${project.build.directory}/jakarta.annotation.sig_${project.parent.version} + ${project.build.directory}/jakarta.annotation.sig_${project.version} jakarta.annotation,jakarta.annotation.security,jakarta.annotation.sql diff --git a/tck/src/main/artifacts/artifact-install.sh b/tck/src/main/artifacts/artifact-install.sh new file mode 100755 index 0000000..9a0e1ad --- /dev/null +++ b/tck/src/main/artifacts/artifact-install.sh @@ -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 diff --git a/tck/src/main/assembly/assembly.xml b/tck/src/main/assembly/assembly.xml index d707bab..96b8506 100644 --- a/tck/src/main/assembly/assembly.xml +++ b/tck/src/main/assembly/assembly.xml @@ -76,6 +76,14 @@ css/** img/** - + + + ${project.basedir}/src/main/artifacts + artifacts + + **/*.sh + + false +