Skip to content

Commit

Permalink
Merge pull request #1166 from olamy/tckrefactor-cleanup-poms
Browse files Browse the repository at this point in the history 
Cleanup poms (using same format for all), remove redundant dependencies, plugins (still todo)
  • Loading branch information
@scottmarlow
scottmarlow authored Jun 6, 2023
2 parents f627896 + c712339 commit 5d9911b
Show file tree
Hide file tree
Showing 68 changed files with 7,868 additions and 7,273 deletions.
32 changes: 19 additions & 13 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

name: Build and run TCK Servlet
name: Build and run some TCKs

on: [push, pull_request]

Expand Down Expand Up @@ -52,21 +52,27 @@ jobs:
run:
mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.1.0:wrapper -Dmaven=3.9.1

- name: Setup jakarta-restful-ws-tck jar
run: |
wget -q https://jakarta.oss.sonatype.org/content/repositories/staging/jakarta/ws/rs/jakarta-restful-ws-tck/3.1.3/jakarta-restful-ws-tck-3.1.3.zip
unzip jakarta-restful-ws-tck-3.1.3.zip jakarta-restful-ws-tck-3.1.3.jar
./mvnw -e -ntp install:install-file -DcreateChecksum=true -Dpackaging=jar -Dfile=jakarta-restful-ws-tck-3.1.3.jar -DgroupId=jakarta.ws.rs -DartifactId=jakarta-restful-ws-tck -Dversion=3.1.3
- name: Install legacy javatest jar
run: ./mvnw -e -ntp install:install-file -Dfile=./lib/javatest.jar -DgroupId=javatest -DartifactId=javatest -Dversion=5.0 -Dpackaging=jar

- name: Build & Run TCK Servlet TCK
run: ./mvnw -e -V -B -U -am clean install -e -pl :servlet-tck -am -Pglassfish-ci-managed -Pglassfish-runner -B -Dmaven.test.failure.ignore=true
run: ./mvnw -e -V -B -U clean install -Pglassfish-runner -Pjaxrs-tck -Dmaven.test.failure.ignore=true

#- name: Publish Test Report
# uses: ScaCap/[email protected]
# with:
# report_paths: '**/target/surefire-reports/TEST-**.xml'
# - name: Publish Test Report
# uses: ScaCap/[email protected]
# with:
# report_paths: '**/target/surefire-reports/TEST-**.xml'

- name: Publish Test Report
uses: dorny/test-reporter@v1
with:
name: Tests Report
path: '**/target/surefire-reports/TEST-**.xml'
reporter: java-junit
fail-on-error: false
# - name: Publish Test Report
# uses: dorny/test-reporter@v1
# with:
# name: Tests Report
# path: '**/target/surefire-reports/TEST-**.xml'
# reporter: java-junit
# fail-on-error: false
3 changes: 1 addition & 2 deletions appclient/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->

<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -84,10 +83,10 @@
<executions>
<execution>
<id>hello-service-testapp</id>
<phase>generate-sources</phase>
<goals>
<goal>wsimport</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<wsdlDirectory>${project.basedir}/src/main/java/com/sun/ts/tests/appclient/deploy/metadatacomplete/testapp/</wsdlDirectory>
<wsdlFiles>
Expand Down
1 change: 0 additions & 1 deletion assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->

<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

Expand Down
9 changes: 2 additions & 7 deletions common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->

<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Expand Down Expand Up @@ -74,17 +73,13 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.authentication</groupId>
<artifactId>jakarta.authentication-api</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
<groupId>javatest</groupId>
<artifactId>javatest</artifactId>
Expand Down
1 change: 0 additions & 1 deletion connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->

<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

Expand Down
216 changes: 106 additions & 110 deletions core-profile-tck/ca-sigtest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,122 +9,118 @@
~ SPDX-License-Identifier: Apache-2.0
~
-->

<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.ee.tck.coreprofile</groupId>
<artifactId>core-tck-parent</artifactId>
<version>10.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<packaging>pom</packaging>
<artifactId>common-annotations</artifactId>
<name>Common Annotations Signature Gen for Core Profile TCK</name>
<description>This module contains is run to generate the signature test file</description>
<parent>
<groupId>jakarta.ee.tck.coreprofile</groupId>
<artifactId>core-tck-parent</artifactId>
<version>10.0.0-SNAPSHOT</version>
</parent>
<artifactId>common-annotations</artifactId>

<dependencies>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${annotations.api.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<packaging>pom</packaging>
<name>Common Annotations Signature Gen for Core Profile TCK</name>
<description>This module contains is run to generate the signature test file</description>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>src/main/resources/common-annotations-api-jdk11.sig</file>
<type>sig</type>
<classifier>sigtest-jdk11</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${annotations.api.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<!--This profile can be used to (re)generate signatures of Commons Annotations API, note that they differ based on JDK used to build them-->
<id>signature-generation</id>
<activation>
<property>
<name>signature</name>
</property>
</activation>
<build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${annotations.api.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/ca-api</outputDirectory>
<includes>**/*.class,**/*.xml</includes>
</artifactItem>
</artifactItems>
<includes>**/*.java</includes>
<excludes>**/*.properties</excludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
<phase>generate-resources</phase>
</execution>
</executions>
<configuration>
<classes>${project.build.directory}/ca-api</classes>
<packages>
jakarta.annotation,
jakarta.annotation.security,
jakarta.annotation.sql
</packages>
<attach>false</attach>
<sigfile>${project.build.directory}/common-annotations-api-jdk11.sig</sigfile>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-artifacts</id>
<goals>
<goal>attach-artifact</goal>
</goals>
<phase>package</phase>
<configuration>
<artifacts>
<artifact>
<file>src/main/resources/common-annotations-api-jdk11.sig</file>
<type>sig</type>
<classifier>sigtest-jdk11</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</build>

<profiles>
<profile>
<!--This profile can be used to (re)generate signatures of Commons Annotations API, note that they differ based on JDK used to build them-->
<id>signature-generation</id>
<activation>
<property>
<name>signature</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${annotations.api.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/ca-api</outputDirectory>
<includes>**/*.class,**/*.xml</includes>
</artifactItem>
</artifactItems>
<includes>**/*.java</includes>
<excludes>**/*.properties</excludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<configuration>
<classes>${project.build.directory}/ca-api</classes>
<packages>jakarta.annotation,
jakarta.annotation.security,
jakarta.annotation.sql</packages>
<attach>false</attach>
<sigfile>${project.build.directory}/common-annotations-api-jdk11.sig</sigfile>
</configuration>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
<phase>generate-resources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

</profiles>
</profiles>
</project>
Loading

0 comments on commit 5d9911b

Please sign in to comment.