Skip to content

Commit

Permalink
Revert "fix some osgi build"
Browse files Browse the repository at this point in the history 
This reverts commit accf071.
  • Loading branch information
@olamy
olamy committed Mar 8, 2017
1 parent ed4eb43 commit d5aa619
Show file tree
Hide file tree
Showing 39 changed files with 27 additions and 37 deletions.
2 changes: 1 addition & 1 deletion apache-jsp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>generate-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-alpn/jetty-alpn-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-alpn/jetty-alpn-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-annotations/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>generate-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-continuation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-deploy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-http-spi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 0 additions & 1 deletion jetty-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 0 additions & 1 deletion jetty-io/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-jaas/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-jaspi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 0 additions & 1 deletion jetty-jmx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 0 additions & 1 deletion jetty-jndi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-monitor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-nosql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
<Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.server.session.jmx;version="9.1";resolution:=optional,,org.eclipse.jetty.*;version="9.1",*</Import-Package>
</instructions>
</configuration>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 1 addition & 0 deletions jetty-osgi/jetty-osgi-boot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
Expand Down
1 change: 0 additions & 1 deletion jetty-plus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-proxy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-rewrite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-rhttp/jetty-rhttp-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-rhttp/jetty-rhttp-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-rhttp/jetty-rhttp-gateway/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 0 additions & 1 deletion jetty-security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 0 additions & 1 deletion jetty-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<executions>
<execution>
<id>generate-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 0 additions & 1 deletion jetty-servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-servlets/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 0 additions & 1 deletion jetty-spdy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-spdy/spdy-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-spdy/spdy-http-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-spdy/spdy-http-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-util-ajax/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 0 additions & 1 deletion jetty-util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 0 additions & 1 deletion jetty-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion jetty-websocket/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 0 additions & 1 deletion jetty-xml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<extensions>true</extensions>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<id>attach-sources</id>
<phase>process-classes</phase>
<goals>
<goal>jar-no-fork</goal>
<goal>jar</goal>
</goals>
<configuration>
<archive>
Expand Down
2 changes: 1 addition & 1 deletion tests/test-webapps/test-mock-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>generate-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
Expand Down
1 change: 1 addition & 0 deletions tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
Expand Down

0 comments on commit d5aa619

Please sign in to comment.