not anymore a bundle and deploy only for master branch
Signed-off-by: olivier lamy <olamy@apache.org>
diff --git a/Jenkinsfile b/Jenkinsfile
index 567e27c..fe52c22 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfStandardBuild cmdline:"clean deploy"
+asfStandardBuild cmdline:env.BRANCH_NAME == 'master'?"clean deploy":"clean install"
diff --git a/pom.xml b/pom.xml
index 6dd2023..5ff4770 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,6 @@
<version>2.2-SNAPSHOT</version>
<artifactId>spring-utils</artifactId>
- <packaging>bundle</packaging>
<name>Spring Utils Goodies</name>
<description>Contains some spring goodies.</description>
@@ -164,25 +163,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.archiva.redback.components.springutils*;version=${project.version};-split-package:=merge-first
- </Export-Package>
- <Import-Package>
- javax.inject;version="[1,2)",
- org.apache.commons.lang;version="[2.6,3)",
- org.codehaus.plexus*,
- org.springframework*;version="[3,4)",
- org.slf4j;resolution:=optional,
- javax.annotation
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
