Permalink
Browse files

fix manifestLocation to use default location under target

all tests pass and resulting artifacts appear identical to before - should not normally be generating bits outside target
  • Loading branch information...
1 parent 9ae3845 commit f7aac07f018cc62184fade9388362490298d7778 @peterlynch peterlynch committed Dec 2, 2012
Showing with 4 additions and 12 deletions.
  1. +0 −1 .gitignore
  2. +1 −2 harness-runner/pom.xml
  3. +0 −1 hth-api/pom.xml
  4. +0 −1 junit-runner/pom.xml
  5. +3 −6 pom.xml
  6. +0 −1 server-provider/pom.xml
View
@@ -3,6 +3,5 @@ target/
.classpath
.settings/
bin/
-*/META-INF
build.properties
test-output/
View
@@ -5,7 +5,7 @@
<groupId>org.sonatype.http-testing-harness</groupId>
<version>0.6-SNAPSHOT</version>
</parent>
-
+
<artifactId>harness-runner</artifactId>
<dependencies>
@@ -21,7 +21,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-Version>$(replace;$(project.version);-SNAPSHOT;.$(tstamp;yyyyMMdd-HHmm))</Bundle-Version>
<Import-Package>
View
@@ -23,7 +23,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-Version>$(replace;$(project.version);-SNAPSHOT;.$(tstamp;yyyyMMdd-HHmm))</Bundle-Version>
<Import-Package>
View
@@ -36,7 +36,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-Version>$(replace;$(project.version);-SNAPSHOT;.$(tstamp;yyyyMMdd-HHmm))</Bundle-Version>
<Import-Package>
View
@@ -6,7 +6,7 @@
<parent>
<groupId>org.sonatype.forge</groupId>
<artifactId>forge-parent</artifactId>
- <version>23-SNAPSHOT</version>
+ <version>24</version>
</parent>
<groupId>org.sonatype.http-testing-harness</groupId>
@@ -16,7 +16,7 @@
<inceptionYear>2010</inceptionYear>
<url>http://github.com/sonatype/http-testing-harness</url>
-
+
<scm>
<connection>scm:git:git@github.com:sonatype/http-testing-harness.git</connection>
<developerConnection>scm:git:git@github.com:sonatype/http-testing-harness.git</developerConnection>
@@ -37,7 +37,7 @@
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<version>4.10</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.sonatype.sisu.litmus</groupId>
@@ -88,9 +88,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- </configuration>
<executions>
<execution>
<id>osgi-bundle</id>
View
@@ -73,7 +73,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-Version>$(replace;$(project.version);-SNAPSHOT;.$(tstamp;yyyyMMdd-HHmm))</Bundle-Version>
<Import-Package>

0 comments on commit f7aac07

Please sign in to comment.