diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-04-06 14:19:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 14:19:35 +0200 |
| commit | 778894b29b13831115c19ff13285541a10ab2d30 (patch) | |
| tree | 62ea7aa8689a3d5421f54cd0ac6c5290e82f23dc /container-core/pom.xml | |
| parent | 5df00bb90a04082847440716bcb6146bdda0ca06 (diff) | |
Revert "Gjoranv/merge di into core (rebased)"
Diffstat (limited to 'container-core/pom.xml')
| -rw-r--r-- | container-core/pom.xml | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/container-core/pom.xml b/container-core/pom.xml index bc40984d934..d0722a081d1 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -13,7 +13,7 @@ </parent> <artifactId>container-core</artifactId> <version>7-SNAPSHOT</version> - <packaging>jar</packaging> + <packaging>container-plugin</packaging> <dependencies> <!-- COMPILE scope --> @@ -24,6 +24,11 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>container-di</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>container-documentapi</artifactId> <version>${project.version}</version> </dependency> @@ -144,6 +149,16 @@ <artifactId>httpclient</artifactId> </dependency> <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> <!-- TODO Vespa 8: stop providing org.json:json --> <groupId>org.json</groupId> <artifactId>json</artifactId> @@ -312,6 +327,17 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> <groupId>com.yahoo.vespa</groupId> <artifactId>config-class-plugin</artifactId> <version>${project.version}</version> @@ -336,6 +362,11 @@ </executions> </plugin> <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> |