Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

Commit 7095858

Browse files
Michal GajdosGerrit Code Review
Michal Gajdos
authored and
Gerrit Code Review
committed
Merge "J-110: Consolidate jobs for testing Jersey examples on WLS12.1.3"
2 parents 1aa0fcb + e2392f5 commit 7095858

File tree

13 files changed

+716
-15
lines changed

13 files changed

+716
-15
lines changed

‎bundles/examples/pom.xml‎

Lines changed: 207 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,49 @@
137137
<classifier>project-src</classifier>
138138
<type>zip</type>
139139
</dependency>
140+
<dependency>
141+
<groupId>org.glassfish.jersey.examples</groupId>
142+
<artifactId>declarative-linking</artifactId>
143+
<version>${project.version}</version>
144+
<classifier>project-src</classifier>
145+
<type>zip</type>
146+
</dependency>
147+
<!--Uncomment as soon as we build Jersey with Java8 by default-->
148+
<!--<dependency>-->
149+
<!--<groupId>org.glassfish.jersey.examples</groupId>-->
150+
<!--<artifactId>default-method-java8-webapp</artifactId>-->
151+
<!--<version>${project.version}</version>-->
152+
<!--<classifier>project-src</classifier>-->
153+
<!--<type>zip</type>-->
154+
<!--</dependency>-->
155+
<!--<dependency>-->
156+
<!--<groupId>org.glassfish.jersey.examples</groupId>-->
157+
<!--<artifactId>default-method-java8-webapp</artifactId>-->
158+
<!--<version>${project.version}</version>-->
159+
<!--<classifier>gf-project-src</classifier>-->
160+
<!--<type>zip</type>-->
161+
<!--</dependency>-->
162+
<dependency>
163+
<groupId>org.glassfish.jersey.examples</groupId>
164+
<artifactId>entity-filtering</artifactId>
165+
<version>${project.version}</version>
166+
<classifier>project-src</classifier>
167+
<type>zip</type>
168+
</dependency>
169+
<dependency>
170+
<groupId>org.glassfish.jersey.examples</groupId>
171+
<artifactId>entity-filtering-security</artifactId>
172+
<version>${project.version}</version>
173+
<classifier>project-src</classifier>
174+
<type>zip</type>
175+
</dependency>
176+
<dependency>
177+
<groupId>org.glassfish.jersey.examples</groupId>
178+
<artifactId>entity-filtering-selectable</artifactId>
179+
<version>${project.version}</version>
180+
<classifier>project-src</classifier>
181+
<type>zip</type>
182+
</dependency>
140183
<dependency>
141184
<groupId>org.glassfish.jersey.examples</groupId>
142185
<artifactId>exception-mapping</artifactId>
@@ -172,6 +215,13 @@
172215
<classifier>gf-project-src</classifier>
173216
<type>zip</type>
174217
</dependency>
218+
<dependency>
219+
<groupId>org.glassfish.jersey.examples</groupId>
220+
<artifactId>groovy</artifactId>
221+
<version>${project.version}</version>
222+
<classifier>project-src</classifier>
223+
<type>zip</type>
224+
</dependency>
175225
<dependency>
176226
<groupId>org.glassfish.jersey.examples</groupId>
177227
<artifactId>helloworld</artifactId>
@@ -181,30 +231,30 @@
181231
</dependency>
182232
<dependency>
183233
<groupId>org.glassfish.jersey.examples</groupId>
184-
<artifactId>helloworld-programmatic</artifactId>
234+
<artifactId>helloworld-benchmark</artifactId>
185235
<version>${project.version}</version>
186236
<classifier>project-src</classifier>
187237
<type>zip</type>
188238
</dependency>
189239
<dependency>
190240
<groupId>org.glassfish.jersey.examples</groupId>
191-
<artifactId>helloworld-pure-jax-rs</artifactId>
241+
<artifactId>helloworld-programmatic</artifactId>
192242
<version>${project.version}</version>
193243
<classifier>project-src</classifier>
194244
<type>zip</type>
195245
</dependency>
196246
<dependency>
197247
<groupId>org.glassfish.jersey.examples</groupId>
198-
<artifactId>helloworld-webapp</artifactId>
248+
<artifactId>helloworld-pure-jax-rs</artifactId>
199249
<version>${project.version}</version>
200250
<classifier>project-src</classifier>
201251
<type>zip</type>
202252
</dependency>
203253
<dependency>
204254
<groupId>org.glassfish.jersey.examples</groupId>
205-
<artifactId>helloworld-webapp</artifactId>
255+
<artifactId>helloworld-spring-annotations</artifactId>
206256
<version>${project.version}</version>
207-
<classifier>gf-project-src</classifier>
257+
<classifier>project-src</classifier>
208258
<type>zip</type>
209259
</dependency>
210260
<dependency>
@@ -223,6 +273,34 @@
223273
<type>zip</type>
224274
</dependency>
225275
-->
276+
<dependency>
277+
<groupId>org.glassfish.jersey.examples</groupId>
278+
<artifactId>helloworld-webapp</artifactId>
279+
<version>${project.version}</version>
280+
<classifier>project-src</classifier>
281+
<type>zip</type>
282+
</dependency>
283+
<dependency>
284+
<groupId>org.glassfish.jersey.examples</groupId>
285+
<artifactId>helloworld-webapp</artifactId>
286+
<version>${project.version}</version>
287+
<classifier>gf-project-src</classifier>
288+
<type>zip</type>
289+
</dependency>
290+
<dependency>
291+
<groupId>org.glassfish.jersey.examples</groupId>
292+
<artifactId>helloworld-weld</artifactId>
293+
<version>${project.version}</version>
294+
<classifier>project-src</classifier>
295+
<type>zip</type>
296+
</dependency>
297+
<dependency>
298+
<groupId>org.glassfish.jersey.examples</groupId>
299+
<artifactId>http-patch</artifactId>
300+
<version>${project.version}</version>
301+
<classifier>project-src</classifier>
302+
<type>zip</type>
303+
</dependency>
226304
<dependency>
227305
<groupId>org.glassfish.jersey.examples</groupId>
228306
<artifactId>http-trace</artifactId>
@@ -286,6 +364,13 @@
286364
<classifier>project-src</classifier>
287365
<type>zip</type>
288366
</dependency>
367+
<dependency>
368+
<groupId>org.glassfish.jersey.examples</groupId>
369+
<artifactId>json-jackson1</artifactId>
370+
<version>${project.version}</version>
371+
<classifier>project-src</classifier>
372+
<type>zip</type>
373+
</dependency>
289374
<dependency>
290375
<groupId>org.glassfish.jersey.examples</groupId>
291376
<artifactId>json-jettison</artifactId>
@@ -370,6 +455,13 @@
370455
<classifier>gf-project-src</classifier>
371456
<type>zip</type>
372457
</dependency>
458+
<dependency>
459+
<groupId>org.glassfish.jersey.examples</groupId>
460+
<artifactId>monitoring-webapp</artifactId>
461+
<version>${project.version}</version>
462+
<classifier>project-src</classifier>
463+
<type>zip</type>
464+
</dependency>
373465
<dependency>
374466
<groupId>org.glassfish.jersey.examples</groupId>
375467
<artifactId>multipart-webapp</artifactId>
@@ -384,6 +476,20 @@
384476
<classifier>gf-project-src</classifier>
385477
<type>zip</type>
386478
</dependency>
479+
<dependency>
480+
<groupId>org.glassfish.jersey.examples</groupId>
481+
<artifactId>oauth-client-twitter</artifactId>
482+
<version>${project.version}</version>
483+
<classifier>project-src</classifier>
484+
<type>zip</type>
485+
</dependency>
486+
<dependency>
487+
<groupId>org.glassfish.jersey.examples</groupId>
488+
<artifactId>oauth2-client-google-webapp</artifactId>
489+
<version>${project.version}</version>
490+
<classifier>project-src</classifier>
491+
<type>zip</type>
492+
</dependency>
387493
<dependency>
388494
<groupId>org.glassfish.jersey.examples</groupId>
389495
<artifactId>osgi-helloworld-webapp</artifactId>
@@ -405,6 +511,35 @@
405511
<classifier>project-src</classifier>
406512
<type>zip</type>
407513
</dependency>
514+
<!--Uncomment as soon as we build Jersey with Java8 by default-->
515+
<!--<dependency>-->
516+
<!--<groupId>org.glassfish.jersey.examples</groupId>-->
517+
<!--<artifactId>rx-client-java8-webapp</artifactId>-->
518+
<!--<version>${project.version}</version>-->
519+
<!--<classifier>project-src</classifier>-->
520+
<!--<type>zip</type>-->
521+
<!--</dependency>-->
522+
<!--<dependency>-->
523+
<!--<groupId>org.glassfish.jersey.examples</groupId>-->
524+
<!--<artifactId>rx-client-java8-webapp</artifactId>-->
525+
<!--<version>${project.version}</version>-->
526+
<!--<classifier>gf-project-src</classifier>-->
527+
<!--<type>zip</type>-->
528+
<!--</dependency>-->
529+
<dependency>
530+
<groupId>org.glassfish.jersey.examples</groupId>
531+
<artifactId>rx-client-webapp</artifactId>
532+
<version>${project.version}</version>
533+
<classifier>project-src</classifier>
534+
<type>zip</type>
535+
</dependency>
536+
<dependency>
537+
<groupId>org.glassfish.jersey.examples</groupId>
538+
<artifactId>rx-client-webapp</artifactId>
539+
<version>${project.version}</version>
540+
<classifier>gf-project-src</classifier>
541+
<type>zip</type>
542+
</dependency>
408543
<dependency>
409544
<groupId>org.glassfish.jersey.examples</groupId>
410545
<artifactId>server-async</artifactId>
@@ -426,13 +561,55 @@
426561
<classifier>project-src</classifier>
427562
<type>zip</type>
428563
</dependency>
564+
<dependency>
565+
<groupId>org.glassfish.jersey.examples</groupId>
566+
<artifactId>server-sent-events</artifactId>
567+
<version>${project.version}</version>
568+
<classifier>project-src</classifier>
569+
<type>zip</type>
570+
</dependency>
571+
<dependency>
572+
<groupId>org.glassfish.jersey.examples</groupId>
573+
<artifactId>servlet3-webapp</artifactId>
574+
<version>${project.version}</version>
575+
<classifier>project-src</classifier>
576+
<type>zip</type>
577+
</dependency>
578+
<dependency>
579+
<groupId>org.glassfish.jersey.examples</groupId>
580+
<artifactId>servlet3-webapp</artifactId>
581+
<version>${project.version}</version>
582+
<classifier>gf-project-src</classifier>
583+
<type>zip</type>
584+
</dependency>
585+
<dependency>
586+
<groupId>org.glassfish.jersey.examples</groupId>
587+
<artifactId>shortener-webapp</artifactId>
588+
<version>${project.version}</version>
589+
<classifier>project-src</classifier>
590+
<type>zip</type>
591+
</dependency>
592+
<dependency>
593+
<groupId>org.glassfish.jersey.examples</groupId>
594+
<artifactId>shortener-webapp</artifactId>
595+
<version>${project.version}</version>
596+
<classifier>gf-project-src</classifier>
597+
<type>zip</type>
598+
</dependency>
429599
<dependency>
430600
<groupId>org.glassfish.jersey.examples</groupId>
431601
<artifactId>simple-console</artifactId>
432602
<version>${project.version}</version>
433603
<classifier>project-src</classifier>
434604
<type>zip</type>
435605
</dependency>
606+
<dependency>
607+
<groupId>org.glassfish.jersey.examples</groupId>
608+
<artifactId>sparklines</artifactId>
609+
<version>${project.version}</version>
610+
<classifier>project-src</classifier>
611+
<type>zip</type>
612+
</dependency>
436613
<dependency>
437614
<groupId>org.glassfish.jersey.examples</groupId>
438615
<artifactId>sse-item-store-webapp</artifactId>
@@ -461,13 +638,22 @@
461638
<classifier>project-src</classifier>
462639
<type>zip</type>
463640
</dependency>
641+
<dependency>
642+
<groupId>org.glassfish.jersey.examples</groupId>
643+
<artifactId>tone-generator</artifactId>
644+
<version>${project.version}</version>
645+
<classifier>project-src</classifier>
646+
<type>zip</type>
647+
</dependency>
464648
<dependency>
465649
<groupId>org.glassfish.jersey.examples</groupId>
466650
<artifactId>xml-moxy</artifactId>
467651
<version>${project.version}</version>
468652
<classifier>project-src</classifier>
469653
<type>zip</type>
470654
</dependency>
655+
656+
471657
</dependencies>
472658
<build>
473659
<finalName>${project.artifactId}</finalName>
@@ -520,6 +706,21 @@
520706
<outputDirectory>${project.build.directory}/dependency/wls-examples</outputDirectory>
521707
</configuration>
522708
</execution>
709+
<execution>
710+
<id>unpack-wls1213-examples</id>
711+
<phase>process-sources</phase>
712+
<goals>
713+
<goal>unpack-dependencies</goal>
714+
</goals>
715+
<configuration>
716+
<stripVersion>true</stripVersion>
717+
<includeGroupIds>org.glassfish.jersey.examples</includeGroupIds>
718+
<classifier>wls1213-project-src</classifier>
719+
<type>zip</type>
720+
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
721+
<outputDirectory>${project.build.directory}/dependency/wls1213-examples</outputDirectory>
722+
</configuration>
723+
</execution>
523724
</executions>
524725
</plugin>
525726
<plugin>
@@ -529,6 +730,7 @@
529730
<descriptor>src/main/assembly/examples-assembly.xml</descriptor>
530731
<descriptor>src/main/assembly/gf-examples-assembly.xml</descriptor>
531732
<descriptor>src/main/assembly/wls-examples-assembly.xml</descriptor>
733+
<descriptor>src/main/assembly/wls1213-examples-assembly.xml</descriptor>
532734
</descriptors>
533735
</configuration>
534736
<executions>

0 commit comments

Comments
 (0)