summaryrefslogtreecommitdiffstats
path: root/sample-apps
diff options
context:
space:
mode:
authorKristian Aune <kraune@yahoo-inc.com>2017-02-07 16:07:31 +0100
committerKristian Aune <kraune@yahoo-inc.com>2017-02-07 16:07:31 +0100
commit751553c9a0a7754e57856f2f42dc6d79a8191a7c (patch)
treecfe1d141810b3a4836c0c6f2b9f25187aeed7f43 /sample-apps
parent8d1bf01f6bba9d20a808c746bbcfc11cba846274 (diff)
fix deps and build, not using parent pom
Diffstat (limited to 'sample-apps')
-rw-r--r--sample-apps/blog-recommendation/pom.xml111
1 files changed, 55 insertions, 56 deletions
diff --git a/sample-apps/blog-recommendation/pom.xml b/sample-apps/blog-recommendation/pom.xml
index 6e55e109f43..5166be0f6aa 100644
--- a/sample-apps/blog-recommendation/pom.xml
+++ b/sample-apps/blog-recommendation/pom.xml
@@ -10,63 +10,29 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<test.hide>true</test.hide>
- <application>blog-recommendation</application>
- <instance>default</instance>
- </properties>
+ <vespa_version>6-SNAPSHOT</vespa_version>
+ </properties>
- <parent>
- <groupId>com.yahoo.vespa.tenant</groupId>
- <artifactId>base</artifactId>
- <version>RELEASE</version>
- </parent>
-
- <pluginRepositories>
- <pluginRepository>
- <id>ymaven</id>
- <url>http://ymaven.corp.yahoo.com:9999/proximity/repository/public</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>maven2-repository.dev.java.net</id>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>vespa-maven-release</id>
- <name>vespa-maven-release</name>
- <url>http://edge.artifactory.yahoo.com:8000/artifactory/vespa-maven-libs-release-local</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- <repositories>
- <repository>
- <id>ymaven</id>
- <url>http://ymaven.corp.yahoo.com:9999/proximity/repository/public</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>vespa-maven-release</id>
- <name>vespa-maven-release</name>
- <url>http://edge.artifactory.yahoo.com:8000/artifactory/vespa-maven-libs-release-local</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>application</artifactId>
+ <version>${vespa_version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>container</artifactId>
+ <version>${vespa_version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
@@ -78,8 +44,41 @@
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
</compilerArgs>
+ <optimize>true</optimize>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.13</version>
+ <configuration>
+ <systemPropertyVariables>
+ <isMavenSurefirePlugin>true</isMavenSurefirePlugin>
+ </systemPropertyVariables>
+ <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>vespa-application-maven-plugin</artifactId>
+ <version>${vespa_version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>packageApplication</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
</plugins>
</build>
</project>