Merge pull request #2947 from yahoo/revert-2945-kraune/build-sample-apps

Revert "Build all sample apps"

7 files changed, 8 insertions, 8 deletions

diff --git a/sample-apps/basic-search-tensor/pom.xml b/sample-apps/basic-search-tensor/pom.xml
index 9b6fab87094..bc9554f9ef4 100644
--- a/sample-apps/basic-search-tensor/pom.xml
+++ b/sample-apps/basic-search-tensor/pom.xml
@@ -6,7 +6,7 @@
                              http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.yahoo.example</groupId>
-    <artifactId>basic-search-tensor</artifactId>
+    <artifactId>basic-search-java</artifactId>
     <version>1.0.1</version>
     <packaging>container-plugin</packaging>  <!-- Use Vespa packaging -->
 
diff --git a/sample-apps/blog-recommendation/pom.xml b/sample-apps/blog-recommendation/pom.xml
index 0f22cefa807..2f1582d4fbe 100644
--- a/sample-apps/blog-recommendation/pom.xml
+++ b/sample-apps/blog-recommendation/pom.xml
@@ -3,9 +3,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.yahoo.example</groupId>
-  <artifactId>blog-recommendation</artifactId>
+  <artifactId>recommendation</artifactId>
   <packaging>container-plugin</packaging>
   <version>0.0.1</version>
+  <name>application</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/sample-apps/blog-search/pom.xml b/sample-apps/blog-search/pom.xml
index 7702dab2d3f..71a02075a6b 100644
--- a/sample-apps/blog-search/pom.xml
+++ b/sample-apps/blog-search/pom.xml
@@ -6,7 +6,7 @@
                              http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.yahoo.example</groupId>
-    <artifactId>blog-search</artifactId>
+    <artifactId>search</artifactId>
     <packaging>container-plugin</packaging>
     <version>0.0.1</version>
 
diff --git a/sample-apps/boolean-search/pom.xml b/sample-apps/boolean-search/pom.xml
index 3a77ee78e55..944511e37b2 100644
--- a/sample-apps/boolean-search/pom.xml
+++ b/sample-apps/boolean-search/pom.xml
@@ -3,9 +3,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.yahoo.example</groupId>
-  <artifactId>boolean-search</artifactId>
+  <artifactId>boolean-application</artifactId>
   <packaging>container-plugin</packaging>
   <version>1.0.0</version>
+  <name>application</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/pom.xml b/sample-apps/http-api-using-request-handlers-and-processors/pom.xml
index 81896b1d64f..6e7d0da75db 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/pom.xml
+++ b/sample-apps/http-api-using-request-handlers-and-processors/pom.xml
@@ -6,7 +6,7 @@
                              http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.yahoo.demo</groupId>
-    <artifactId>http-api-using-request-handlers-and-processors</artifactId>
+    <artifactId>sample-app-http-api-processor</artifactId>
     <version>1.0.1</version>
     <packaging>container-plugin</packaging>  <!-- Use Vespa packaging -->
 
diff --git a/sample-apps/http-api-using-searcher/pom.xml b/sample-apps/http-api-using-searcher/pom.xml
index 64d9b8d0ed6..c8e222fae4b 100644
--- a/sample-apps/http-api-using-searcher/pom.xml
+++ b/sample-apps/http-api-using-searcher/pom.xml
@@ -6,7 +6,7 @@
                              http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.yahoo.demo</groupId>
-    <artifactId>http-api-using-searcher</artifactId>
+    <artifactId>sample-app-http-api-searcher</artifactId>
     <version>1.0.1</version>
     <packaging>container-plugin</packaging>  <!-- Use Vespa packaging -->
 
diff --git a/sample-apps/pom.xml b/sample-apps/pom.xml
index 44756776a5f..cd054953152 100644
--- a/sample-apps/pom.xml
+++ b/sample-apps/pom.xml
@@ -11,9 +11,7 @@
 
     <modules>
         <module>basic-search-java</module>
-        <module>basic-search-tensor</module>
         <module>blog-recommendation</module>
-        <module>blog-search</module>
         <module>boolean-search</module>
         <module>http-api-using-request-handlers-and-processors</module>
         <module>http-api-using-searcher</module>