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

Commit 7e5d08c

Browse files
committed
Glassfish examples shouldn't run integration tests.
Change-Id: I8546583be9a0b589e4112d7797e75d95e17684c3
1 parent 23c54e8 commit 7e5d08c

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

bundles/examples/pom.xml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
44
~
5-
~ Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
5+
~ Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved.
66
~
77
~ The contents of this file are subject to the terms of either the GNU
88
~ General Public License Version 2 only ("GPL") or the Common Development
@@ -511,21 +511,6 @@
511511
<classifier>project-src</classifier>
512512
<type>zip</type>
513513
</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>-->
529514
<dependency>
530515
<groupId>org.glassfish.jersey.examples</groupId>
531516
<artifactId>rx-client-webapp</artifactId>

examples/etc/gf-project-src-pom.xsl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2010-2017 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -221,6 +221,10 @@
221221
<xsl:template match="pom:plugin[pom:artifactId='jetty-maven-plugin']">
222222
</xsl:template>
223223

224+
<!-- remove failsafe plugin (integration testing not possible without jetty/other container) -->
225+
<xsl:template match="pom:plugin[pom:artifactId='maven-failsafe-plugin']">
226+
</xsl:template>
227+
224228
<xsl:template match="comment()">
225229
<xsl:comment>
226230
<xsl:value-of select="." />

0 commit comments

Comments
 (0)