From 253d136c3c40d1fb43365202c1bd635accb29ef1 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Tue, 31 Mar 2020 11:20:50 +0200
Subject: [PATCH] remove samples from release/common build, keep it for travis
 (#154)

* remove samples from release/common build, keep it for travis

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .travis.yml          | 5 ++++-
 pom.xml              | 9 ++++++++-
 saaj-samples/pom.xml | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 751487f..04c7dc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,5 +20,8 @@ cache:
     - .autoconf
     - $HOME/.m2
 
+install:
+  - curl -o $HOME/.m2/settings.xml https://gist.githubusercontent.com/lukasj/c176740acd96e255a84851277b9d9d14/raw/dca8d8be04acc614f0dd03dbee1891829250d857/jakarta-settings.xml
+
 script:
-  - mvn -B -V -U -C -Pstaging,oss-release clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true -Doss.disallow.snapshots=false
+  - mvn -B -V -U -C -Pstaging,oss-release,samples clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true
diff --git a/pom.xml b/pom.xml
index acf3d03..a0976b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -305,7 +305,14 @@
 
     <modules>
         <module>saaj-ri</module>
-        <module>saaj-samples</module>
     </modules>
 
+    <profiles>
+        <profile>
+            <id>samples</id>
+            <modules>
+                <module>saaj-samples</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/saaj-samples/pom.xml b/saaj-samples/pom.xml
index 21b0f10..acd101d 100644
--- a/saaj-samples/pom.xml
+++ b/saaj-samples/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at