summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2017-07-24 10:43:48 +0200
committerGitHub <noreply@github.com>2017-07-24 10:43:48 +0200
commit737979601f25ace7e5444dd3c925329c5a0a8b6d (patch)
tree507d6d33e2bea101abd3ecebd73aff76f8ccced2
parent2b38f8b102042f23f7dea8a8c65b88e15793467d (diff)
parent77b22f35b96782bd3930d3c5671d3ca49b32d918 (diff)
Merge pull request #2991 from yahoo/bjorncs/pom-cleanup
Configgen is not a bundle
-rw-r--r--configgen/pom.xml4
-rw-r--r--configgen/src/main/manifest.mf9
2 files changed, 3 insertions, 10 deletions
diff --git a/configgen/pom.xml b/configgen/pom.xml
index c328ea53635..8f6f65a7f49 100644
--- a/configgen/pom.xml
+++ b/configgen/pom.xml
@@ -59,7 +59,9 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>src/main/manifest.mf</manifestFile>
+ <manifest>
+ <mainClass>com.yahoo.config.codegen.MakeConfig</mainClass>
+ </manifest>
</archive>
</configuration>
</plugin>
diff --git a/configgen/src/main/manifest.mf b/configgen/src/main/manifest.mf
deleted file mode 100644
index a998997f7c2..00000000000
--- a/configgen/src/main/manifest.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: com.yahoo.config.codegen
-Bundle-Vendor: Yahoo!
-Bundle-ClassPath: .,dependencies/annotation-6-SNAPSHOT.jar,dependenc
- ies/scala-library-2.9.1.jar
-Bundle-ManifestVersion: 2
-Bundle-Name: vespa config generator
-Bundle-SymbolicName: configgen
-Main-Class: com.yahoo.config.codegen.MakeConfig