Skip to content

Commit d1886f3

Browse files
hantsyhantsy
committed
chore: clean up
1 parent e83f963 commit d1886f3

17 files changed

Lines changed: 843 additions & 1902 deletions

File tree

‎cdi/pom.xml‎

Lines changed: 2 additions & 301 deletions
Large diffs are not rendered by default.

‎concurrency/pom.xml‎

Lines changed: 7 additions & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ specific language governing permissions and limitations
1919
under the License.
2020
-->
2121

22-
<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">
22+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2324
<modelVersion>4.0.0</modelVersion>
24-
<artifactId>concurrency-examples</artifactId>
25+
<artifactId>jakartaee11-concurrency-examples</artifactId>
2526
<packaging>war</packaging>
2627
<parent>
2728
<groupId>com.example</groupId>
@@ -30,203 +31,19 @@ under the License.
3031
<relativePath>../pom.xml</relativePath>
3132
</parent>
3233

33-
<name>concurrency-examples</name>
34+
<name>Jakarta EE 11 Sandbox: Concurrency Examples</name>
3435
<description>Jakarta EE 11 Sandbox: Concurrency Virtual Thread examples</description>
3536
<properties>
36-
37+
<lettuce.version>7.2.1.RELEASE</lettuce.version>
3738
</properties>
3839

3940
<dependencies>
40-
<dependency>
41-
<groupId>jakarta.platform</groupId>
42-
<artifactId>jakarta.jakartaee-api</artifactId>
43-
</dependency>
44-
4541
<!-- https://mvnrepository.com/artifact/io.lettuce/lettuce-core -->
4642
<dependency>
4743
<groupId>io.lettuce</groupId>
4844
<artifactId>lettuce-core</artifactId>
49-
<version>7.2.1.RELEASE</version>
50-
</dependency>
51-
52-
<dependency>
53-
<groupId>org.jboss.arquillian.junit5</groupId>
54-
<artifactId>arquillian-junit5-container</artifactId>
55-
<scope>test</scope>
56-
</dependency>
57-
<!-- see: https://github.com/arquillian/arquillian-core/issues/248 -->
58-
<!-- and https://github.com/arquillian/arquillian-core/pull/246/files -->
59-
<dependency>
60-
<groupId>org.jboss.arquillian.protocol</groupId>
61-
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
62-
<scope>test</scope>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.jboss.shrinkwrap.resolver</groupId>
66-
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
67-
<scope>test</scope>
68-
</dependency>
69-
<dependency>
70-
<groupId>org.junit.jupiter</groupId>
71-
<artifactId>junit-jupiter</artifactId>
72-
<scope>test</scope>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.assertj</groupId>
76-
<artifactId>assertj-core</artifactId>
77-
<version>${assertj.version}</version>
45+
<version>${lettuce.version}</version>
7846
</dependency>
7947
</dependencies>
80-
<profiles>
81-
<profile>
82-
<id>glassfish</id>
83-
<activation>
84-
<activeByDefault>true</activeByDefault>
85-
</activation>
86-
<properties>
87-
<cargo.zipUrlInstaller.downloadDir>${project.basedir}/../installs</cargo.zipUrlInstaller.downloadDir>
88-
</properties>
89-
<build>
90-
<plugins>
91-
<plugin>
92-
<groupId>org.codehaus.cargo</groupId>
93-
<artifactId>cargo-maven3-plugin</artifactId>
94-
<configuration>
95-
<container>
96-
<timeout>180000</timeout>
97-
<containerId>glassfish8x</containerId>
98-
99-
<!-- <artifactInstaller>
100-
<groupId>org.glassfish.main.distributions</groupId>
101-
<artifactId>glassfish</artifactId>
102-
<version>${glassfish.version}</version>
103-
</artifactInstaller> -->
104-
<zipUrlInstaller>
105-
<url>https://github.com/eclipse-ee4j/glassfish/releases/download/${glassfish.version}/glassfish-${glassfish.version}.zip</url>
106-
<downloadDir>${cargo.zipUrlInstaller.downloadDir}</downloadDir>
107-
</zipUrlInstaller>
108-
</container>
109-
<configuration>
110-
<!-- the configuration used to deploy -->
111-
<home>${project.build.directory}/glassfish8x-home</home>
112-
<properties>
113-
<cargo.port.offset>10000</cargo.port.offset>
114-
<!-- <cargo.glassfish.admin.port>14848</cargo.glassfish.admin.port>-->
115-
<!-- <cargo.servlet.port>18080</cargo.servlet.port>-->
116-
<cargo.remote.password />
117-
<cargo.glassfish.removeDefaultDatasource>true</cargo.glassfish.removeDefaultDatasource>
118-
</properties>
119-
<datasources>
120-
<datasource>
121-
<driverClass>org.apache.derby.jdbc.EmbeddedDriver</driverClass>
122-
<url>jdbc:derby:derbyDB;create=true</url>
123-
<jndiName>jdbc/__default</jndiName>
124-
<username>APP</username>
125-
<password>nonemptypassword</password>
126-
</datasource>
127-
</datasources>
128-
</configuration>
129-
</configuration>
130-
</plugin>
131-
</plugins>
132-
</build>
133-
</profile>
134-
<profile>
135-
<id>arq-glassfish-managed</id>
136-
<properties>
137-
<skip.unit.tests>true</skip.unit.tests>
138-
<skip.integration.tests>false</skip.integration.tests>
139-
</properties>
140-
<dependencies>
141-
<!-- Jersey -->
142-
<dependency>
143-
<groupId>org.glassfish.jersey.media</groupId>
144-
<artifactId>jersey-media-multipart</artifactId>
145-
<version>${jersey.version}</version>
146-
<scope>test</scope>
147-
</dependency>
148-
<dependency>
149-
<groupId>org.glassfish.jersey.media</groupId>
150-
<artifactId>jersey-media-json-binding</artifactId>
151-
<version>${jersey.version}</version>
152-
<scope>test</scope>
153-
</dependency>
154-
<dependency>
155-
<groupId>org.glassfish.jersey.media</groupId>
156-
<artifactId>jersey-media-sse</artifactId>
157-
<version>${jersey.version}</version>
158-
<scope>test</scope>
159-
</dependency>
160-
<dependency>
161-
<groupId>org.glassfish.jersey.inject</groupId>
162-
<artifactId>jersey-hk2</artifactId>
163-
<version>${jersey.version}</version>
164-
<scope>test</scope>
165-
</dependency>
166-
<dependency>
167-
<groupId>org.glassfish.jersey.core</groupId>
168-
<artifactId>jersey-client</artifactId>
169-
<version>${jersey.version}</version>
170-
<scope>test</scope>
171-
</dependency>
172-
<dependency>
173-
<groupId>io.github.hantsy.arquillian</groupId>
174-
<artifactId>arquillian-glassfish-managed</artifactId>
175-
<version>${arquillian-glassfish.version}</version>
176-
<scope>test</scope>
177-
</dependency>
178-
</dependencies>
179-
<build>
180-
<testResources>
181-
<testResource>
182-
<directory>src/test/resources</directory>
183-
</testResource>
184-
<testResource>
185-
<directory>src/test/arq-glassfish-managed</directory>
186-
</testResource>
187-
</testResources>
188-
<plugins>
189-
<plugin>
190-
<groupId>org.apache.maven.plugins</groupId>
191-
<artifactId>maven-dependency-plugin</artifactId>
192-
<version>${maven-dependency-plugin.version}</version>
193-
<executions>
194-
<execution>
195-
<id>unpack</id>
196-
<phase>pre-integration-test</phase>
197-
<goals>
198-
<goal>unpack</goal>
199-
</goals>
200-
<configuration>
201-
<artifactItems>
202-
<artifactItem>
203-
<groupId>org.glassfish.main.distributions</groupId>
204-
<artifactId>glassfish</artifactId>
205-
<version>${glassfish.version}</version>
206-
<type>zip</type>
207-
<overWrite>false</overWrite>
208-
<outputDirectory>${project.build.directory}</outputDirectory>
209-
</artifactItem>
210-
</artifactItems>
211-
</configuration>
212-
</execution>
213-
</executions>
214-
</plugin>
215-
<plugin>
216-
<groupId>org.apache.maven.plugins</groupId>
217-
<artifactId>maven-failsafe-plugin</artifactId>
218-
<version>${maven-failsafe-plugin.version}</version>
219-
<configuration>
220-
<environmentVariables>
221-
<GLASSFISH_HOME>${project.build.directory}/glassfish8</GLASSFISH_HOME>
222-
</environmentVariables>
223-
<argLine>
224-
--add-opens=java.base/java.net=ALL-UNNAMED
225-
</argLine>
226-
</configuration>
227-
</plugin>
228-
</plugins>
229-
</build>
230-
</profile>
231-
</profiles>
48+
23249
</project>

0 commit comments

Comments
 (0)