LPS-74110 isolate bnd used during build from bnd used as runtime depe…

…ndency
GergoMathe · Apr 4, 2018 · 40b8f5b · 40b8f5b
1 parent d221af9
commit 40b8f5b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/build-common-java.xml b/build-common-java.xml
@@ -263,24 +263,4 @@
 			<attach classifier="sources" file="${artifact.name}-sources.jar" />
 		</publish-portal-artifact>
 	</target>
-
-	<target depends="jar" name="release">
-		<if>
-			<available file="bnd.bnd" />
-			<then>
-				<bndexpand propertyfile="${project.dir}/common.bnd" />
-
-				<taskdef
-					classname="com.liferay.ant.bnd.ReleaseToRepoTask"
-					classpathref="lib.classpath"
-					name="release-to-repo"
-				/>
-
-				<release-to-repo
-					bndRootFile="${project.dir}/common.bnd"
-					file="${jar.file}.jar"
-				/>
-			</then>
-		</if>
-	</target>
 </project>
diff --git a/build-common.xml b/build-common.xml
@@ -43,9 +43,17 @@
 	<property file="${project.dir}/sql/sql.${env.HOSTNAME}.properties" />
 	<property file="${project.dir}/sql/sql.properties" />
 
+	<path id="ant.bnd.classpath">
+		<fileset
+			dir="${project.dir}/lib/development"
+			includes="biz.aQute.bnd.jar,com.liferay.ant.bnd.jar"
+		/>
+	</path>
+
 	<path id="lib.classpath">
 		<fileset
 			dir="${project.dir}/lib/development"
+			excludes="biz.aQute.bnd.jar,com.liferay.ant.bnd.jar"
 			includes="*.jar"
 		/>
 		<fileset
@@ -91,7 +99,7 @@
 	</path>
 
 	<taskdef
-		classpathref="lib.classpath"
+		classpathref="ant.bnd.classpath"
 		resource="aQute/bnd/ant/taskdef.properties"
 	/>
 	<taskdef

diff --git a/lib/.gitignore b/lib/.gitignore
@@ -3,6 +3,7 @@
 /development/annotations.jar
 /development/ant-apache-bsf.jar
 /development/appium.jar
+/development/biz.aQute.bnd.jar
 /development/catalina.jar
 /development/com.liferay.ant.bnd.jar
 /development/com.liferay.util.taglib.compat.jar

diff --git a/lib/development/dependencies.properties b/lib/development/dependencies.properties
@@ -3,6 +3,7 @@ alloy-taglib=com.liferay.alloy-taglibs:alloy-taglib:1.1.12
 annotations=javax.annotation:jsr250-api:1.0
 ant-apache-bsf=org.apache.ant:ant-apache-bsf:1.8.2
 appium=io.appium:java-client:1.6.2
+biz.aQute.bnd=biz.aQute.bnd:biz.aQute.bnd:3.5.0
 catalina=org.apache.tomcat:tomcat-catalina:8.0.32
 com.liferay.ant.bnd=com.liferay:com.liferay.ant.bnd:2.0.49
 deployment=javax.enterprise.deploy:deployment-api:1.2-rev-1