Skip to content

Commit f904e6a

Browse files
committed
TCK - changed groupId of the arquillian plugin, updated
Signed-off-by: David Matějček <[email protected]>
1 parent cf191a3 commit f904e6a

File tree

14 files changed

+39
-34
lines changed

14 files changed

+39
-34
lines changed

appserver/tests/tck/cdi/cdi-full/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
<scope>test</scope>
220220
</dependency>
221221
<dependency>
222-
<groupId>org.omnifaces.arquillian</groupId>
222+
<groupId>ee.omnifish.arquillian</groupId>
223223
<artifactId>arquillian-glassfish-server-managed</artifactId>
224224
</dependency>
225225
<dependency>

appserver/tests/tck/cdi/cdi-model/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</dependency>
6363

6464
<dependency>
65-
<groupId>org.omnifaces.arquillian</groupId>
65+
<groupId>ee.omnifish.arquillian</groupId>
6666
<artifactId>arquillian-glassfish-server-managed</artifactId>
6767
</dependency>
6868
<dependency>

appserver/tests/tck/concurrency/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</dependency>
9393

9494
<dependency>
95-
<groupId>org.omnifaces.arquillian</groupId>
95+
<groupId>ee.omnifish.arquillian</groupId>
9696
<artifactId>arquillian-glassfish-server-managed</artifactId>
9797
</dependency>
9898

appserver/tests/tck/faces/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<pom-replace file="${tck.parentPomFile}"
148148
element="version" value="1.0.7" replacement="${project.version}" />
149149
<pom-replace file="${tck.parentPomFile}"
150-
element="version" value="1.4" replacement="2.0.0-SNAPSHOT" />
150+
element="version" value="1.4" replacement="2.0.0-M1" />
151151
<pom-replace file="${tck.parentPomFile}"
152152
element="version" value="4.0.3" replacement="${project.parent.version}" />
153153
<replace file="${tck.parentPomFile}">
@@ -167,6 +167,11 @@
167167
<replacetoken><![CDATA[<version>4.0.3</version>]]></replacetoken>
168168
<replacevalue><![CDATA[<version>${project.version}</version>]]></replacevalue>
169169
</replace>
170+
<replace dir="${tck.root}/faces-tck-4.0.3/tck">
171+
<include name="**/pom.xml"/>
172+
<replacetoken><![CDATA[<groupId>org.omnifaces.arquillian</groupId>]]></replacetoken>
173+
<replacevalue><![CDATA[<groupId>ee.omnifish.arquillian</groupId>]]></replacevalue>
174+
</replace>
170175
</target>
171176
</configuration>
172177
</execution>

appserver/tests/tck/microprofile/config/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<scope>test</scope>
3838
</dependency>
3939
<dependency>
40-
<groupId>org.omnifaces.arquillian</groupId>
40+
<groupId>ee.omnifish.arquillian</groupId>
4141
<artifactId>arquillian-glassfish-server-managed</artifactId>
4242
</dependency>
4343
<dependency>

appserver/tests/tck/microprofile/jwt/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
<classifier>tests</classifier>
4848
</dependency>
4949
<dependency>
50-
<groupId>org.omnifaces.arquillian</groupId>
50+
<groupId>ee.omnifish.arquillian</groupId>
5151
<artifactId>glassfish-client-ee10</artifactId>
5252
</dependency>
5353
<dependency>
54-
<groupId>org.omnifaces.arquillian</groupId>
54+
<groupId>ee.omnifish.arquillian</groupId>
5555
<artifactId>arquillian-glassfish-server-managed</artifactId>
5656
</dependency>
5757

appserver/tests/tck/microprofile/rest-client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<scope>test</scope>
4747
</dependency>
4848
<dependency>
49-
<groupId>org.omnifaces.arquillian</groupId>
49+
<groupId>ee.omnifish.arquillian</groupId>
5050
<artifactId>arquillian-glassfish-server-managed</artifactId>
5151
</dependency>
5252
<dependency>
@@ -144,7 +144,7 @@
144144
</suiteXmlFiles>
145145
<systemPropertyVariables>
146146
<!-- A workaround for the ConfigKeyForMultipleInterfacesTest -->
147-
<org.omnifaces.arquillian.prependDeploySequence>true</org.omnifaces.arquillian.prependDeploySequence>
147+
<ee.omnifish.arquillian.prependDeploySequence>true</ee.omnifish.arquillian.prependDeploySequence>
148148
</systemPropertyVariables>
149149
</configuration>
150150
</plugin>

appserver/tests/tck/pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,15 @@
109109
<scope>test</scope>
110110
</dependency>
111111
<dependency>
112-
<groupId>org.omnifaces.arquillian</groupId>
112+
<groupId>ee.omnifish.arquillian</groupId>
113+
<artifactId>glassfish-client-ee10</artifactId>
114+
<version>2.0.0-M1</version>
115+
<scope>test</scope>
116+
</dependency>
117+
<dependency>
118+
<groupId>ee.omnifish.arquillian</groupId>
113119
<artifactId>arquillian-glassfish-server-managed</artifactId>
114-
<version>2.0.0-SNAPSHOT</version>
120+
<version>2.0.0-M1</version>
115121
<scope>test</scope>
116122
</dependency>
117123
<!-- See defaultProtocol type in arquillian.xml in microprofile module -->
@@ -124,13 +130,7 @@
124130
<dependency>
125131
<groupId>org.jboss.arquillian.junit5</groupId>
126132
<artifactId>arquillian-junit5-container</artifactId>
127-
<version>1.9.4.Final</version>
128-
<scope>test</scope>
129-
</dependency>
130-
<dependency>
131-
<groupId>org.omnifaces.arquillian</groupId>
132-
<artifactId>glassfish-client-ee10</artifactId>
133-
<version>2.0.0-SNAPSHOT</version>
133+
<version>1.10.0.Final</version>
134134
<scope>test</scope>
135135
</dependency>
136136
<dependency>
@@ -147,7 +147,7 @@
147147
<dependency>
148148
<groupId>org.jboss.arquillian</groupId>
149149
<artifactId>arquillian-bom</artifactId>
150-
<version>1.9.4.Final</version>
150+
<version>1.10.0.Final</version>
151151
<scope>import</scope>
152152
<type>pom</type>
153153
</dependency>

appserver/tests/tck/rest/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ mvn clean install -Dgroups=security
7474
<scope>test</scope>
7575
</dependency>
7676
<dependency>
77-
<groupId>org.omnifaces.arquillian</groupId>
77+
<groupId>ee.omnifish.arquillian</groupId>
7878
<artifactId>glassfish-client-ee10</artifactId>
7979
</dependency>
8080
<dependency>
81-
<groupId>org.omnifaces.arquillian</groupId>
81+
<groupId>ee.omnifish.arquillian</groupId>
8282
<artifactId>arquillian-glassfish-server-managed</artifactId>
8383
</dependency>
8484
<dependency>
@@ -91,6 +91,12 @@ mvn clean install -Dgroups=security
9191
<version>1.7</version>
9292
<scope>test</scope>
9393
</dependency>
94+
<dependency>
95+
<groupId>commons-httpclient</groupId>
96+
<artifactId>commons-httpclient</artifactId>
97+
<version>3.1</version>
98+
<scope>test</scope>
99+
</dependency>
94100
<dependency>
95101
<groupId>org.glassfish.main</groupId>
96102
<artifactId>glassfish-jul-extension</artifactId>
@@ -104,12 +110,6 @@ mvn clean install -Dgroups=security
104110
<groupId>org.hamcrest</groupId>
105111
<artifactId>hamcrest</artifactId>
106112
</dependency>
107-
<dependency>
108-
<groupId>commons-httpclient</groupId>
109-
<artifactId>commons-httpclient</artifactId>
110-
<version>3.1</version>
111-
<scope>test</scope>
112-
</dependency>
113113
</dependencies>
114114

115115
<build>

appserver/tests/tck/rest_cdi/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343

4444
<dependencies>
4545
<dependency>
46-
<groupId>org.omnifaces.arquillian</groupId>
46+
<groupId>ee.omnifish.arquillian</groupId>
4747
<artifactId>glassfish-client-ee10</artifactId>
4848
</dependency>
4949
<dependency>
50-
<groupId>org.omnifaces.arquillian</groupId>
50+
<groupId>ee.omnifish.arquillian</groupId>
5151
<artifactId>arquillian-glassfish-server-managed</artifactId>
5252
</dependency>
5353
<dependency>

0 commit comments

Comments
 (0)