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

Include the deployment descriptors in the output artifact. #1338

Merged
merged 21 commits into from
Jul 14, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
145c7c7
Include the deployment descriptors in the output artifact.
starksm64 Jun 21, 2024
3c9574b
Update the remaining artifacts to include the container descriptors
starksm64 Jun 26, 2024
8012fe2
See if this is causing the build check failure
starksm64 Jun 26, 2024
ed75e16
Update Concurrency TCK to 3.1.0
arjantijms Jun 25, 2024
ca16901
Restore Missing EJB Test Classes (#1340)
brideck Jun 26, 2024
f3ff495
Refactor JSONP platform tests in servlet vehicle (#1318)
alwin-joseph Jun 26, 2024
8fba192
JSONB Platform TCK: Refactor the tests in servlet vehicle (#1316)
alwin-joseph Jun 26, 2024
1c7c129
JSTL Test Fix(tckrefactor branch) for issues/255 in JDK21 due to spac…
alwin-joseph Jun 26, 2024
5ec3108
Update rest TCK to 4.0.0
arjantijms Jun 26, 2024
eea37ac
Remove reference to removed module
arjantijms Jun 26, 2024
f818343
JMS Standalone TCK test refactor with Junit. (#1185)
gurunrao Jun 27, 2024
8766f5e
Satisfy spotless and import boms to set versions correctly for junit etc
arjantijms Jun 27, 2024
ddfa63e
More spotless and updating client libs
arjantijms Jun 27, 2024
3554349
Update WebSocket TCK to 2.2.0
arjantijms Jun 29, 2024
0f79713
Merge in the jacc/pom.xml deletion to resolve conflicts
starksm64 Jul 14, 2024
91b9849
Fix copyrights and other clean up (#1345)
pnicolucci Jul 2, 2024
243ea8d
Generate the vehicle template code into the source tree
starksm64 Jul 11, 2024
9d436f6
Added runner for expression language TCK 6.0.0
arjantijms Jul 11, 2024
ce2667d
Use GF 8 M6
arjantijms Jul 11, 2024
c49bfbb
Fix poluted classpath and not testing what we thought we were
arjantijms Jul 12, 2024
c1dd77c
Merge in the jacc/pom.xml deletion to resolve conflicts
starksm64 Jul 14, 2024
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
13 changes: 13 additions & 0 deletions appclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,19 @@
</dependencies>

<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
12 changes: 12 additions & 0 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,18 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>
<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
15 changes: 15 additions & 0 deletions common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,19 @@
</dependency>
</dependencies>

<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>
</build>
</project>
12 changes: 12 additions & 0 deletions connector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>
<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions ejb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions ejb30-ws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
12 changes: 12 additions & 0 deletions ejb30/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,18 @@
</dependencies>

<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>
<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions ejb32/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions jacc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions javaee/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions javamail/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions jaxws-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions jms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions jta/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions jws-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
13 changes: 13 additions & 0 deletions jws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,19 @@
</dependencies>

<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.7</version>
<version>1.0.9</version>
</parent>

<groupId>jakarta.tck</groupId>
Expand Down Expand Up @@ -783,7 +783,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
Expand Down
13 changes: 13 additions & 0 deletions samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,19 @@
</dependency>
</dependencies>
<build>
<!-- Include the container descriptors in the output artifact -->
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/build.xml</exclude>
</excludes>
</resource>
</resources>

<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
Expand Down
Loading
Loading