converted jar-based dependency to project-based as this is fine for this case

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/lib/jjobs-core.jar b/lib/jjobs-core.jar
deleted file mode 100644 (file)
index 5f7ce3a..0000000
Binary files a/lib/jjobs-core.jar and /dev/null differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 725a0a88e19134e0821fa6d18d7f04ac72538ff1..91e15ede857ed77bf9280f5ef613edcef5d8942a 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -927,6 +927,14 @@ is divided into following sections:
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-jar.properties}"/>
+            <param location="${project.jjobs-core}" name="call.subproject"/>
+            <param location="${project.jjobs-core}/build.xml" name="call.script"/>
+            <param name="call.target" value="jar"/>
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
@@ -1412,6 +1420,14 @@ is divided into following sections:
         <propertyfile file="${built-clean.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-clean.properties}"/>
+            <param location="${project.jjobs-core}" name="call.subproject"/>
+            <param location="${project.jjobs-core}/build.xml" name="call.script"/>
+            <param name="call.target" value="clean"/>
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index e618f2a6d1b44594a552ad5c2abb346e28791160..f72c9239505400daca0fa59577d765d592329243 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -36,7 +36,6 @@ file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
 file.reference.jcountry-core.jar=lib/jcountry-core.jar
 file.reference.jphone-core.jar=lib/jphone-core.jar
 file.reference.juser-core.jar=lib/juser-core.jar
-file.reference.jjobs-core.jar=lib/jjobs-core.jar
 includes=**
 jar.compress=false
 javac.classpath=\
@@ -46,7 +45,7 @@ javac.classpath=\
     ${file.reference.jcontacts-business-core.jar}:\
     ${file.reference.juser-core.jar}:\
     ${file.reference.jaddressbook-core.jar}:\
-    ${file.reference.jjobs-core.jar}:\
+    ${reference.jjobs-core.jar}:\
     ${libs.javaee-api-7.0.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
@@ -75,7 +74,9 @@ javadoc.windowtitle=Jobs EJB Library
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform
+project.jjobs-core=../../NetBeansProjects/jjobs-core
 project.license=gpl30
+reference.jjobs-core.jar=${project.jjobs-core}/dist/jjobs-core.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -91,7 +92,6 @@ source.reference.jaddressbook-core.jar=../jaddressbook-core/src/
 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcountry-core.jar=../jcountry-core/src/
-source.reference.jjobs-core.jar=../jjobs-core/src/
 source.reference.jphone-core.jar=../jphone-core/src/
 source.reference.juser-core.jar=../juser-core/src/
 src.dir=src

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 2512f32b447ec6a9a89dbf64c80d21f867f5a5fa..14a05d0cc551a96cf5649e286a3073809869990e 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -14,5 +14,15 @@
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
             <definitions>./lib/nblibraries.properties</definitions>
         </libraries>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>jjobs-core</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
     </configuration>
 </project>