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 60f4db37c80d5f39f4aa4a96855ffa7dca6ee43a..190db591229baba0cf87d53723b0d0b81e9a87b0 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -878,6 +878,9 @@ exists or setup the property manually. For example like this:
                 COMPILATION SECTION
             -->
     <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
+        <ant antfile="${project.jjobs-core}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
         <ant antfile="${project.jjobs-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
@@ -886,6 +889,9 @@ exists or setup the property manually. For example like this:
         </ant>
     </target>
     <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
+        <ant antfile="${project.jjobs-core}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
         <ant antfile="${project.jjobs-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
@@ -1452,6 +1458,7 @@ exists or setup the property manually. For example like this:
                 CLEANUP SECTION
             -->
     <target depends="init" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.jjobs-core}/build.xml" inheritall="false" target="clean"/>
         <ant antfile="${project.jjobs-lib}/build.xml" inheritall="false" target="clean"/>
         <ant antfile="${project.jjobs-mailer}/build.xml" inheritall="false" target="clean"/>
     </target>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index d6605bf8015d9fbf6abeea23fb512dec66a06c43..7d804f7043d11b3c5357085d7cc465ceabdeb222 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -39,7 +39,6 @@ file.reference.jaddressbook-core.jar=lib/jaddressbook-core.jar
 file.reference.jaddressbook-lib.jar=lib/jaddressbook-lib.jar
 file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
 file.reference.jcontacts-business-lib.jar=lib/jcontacts-business-lib.jar
-file.reference.jjobs-core.jar=lib/jjobs-core.jar
 file.reference.cdi-api.jar=lib/cdi-api.jar
 file.reference.gf-client.jar=lib/gf-client.jar
 file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
@@ -84,7 +83,7 @@ javac.classpath=\
     ${file.reference.juser-activity-lib.jar}:\
     ${file.reference.jaddressbook-core.jar}:\
     ${file.reference.jaddressbook-lib.jar}:\
-    ${file.reference.jjobs-core.jar}:\
+    ${reference.jjobs-core.jar}:\
     ${reference.jjobs-lib.jar}:\
     ${reference.jjobs-mailer.jar}:\
     ${file.reference.cdi-api.jar}:\
@@ -122,9 +121,11 @@ javadoc.windowtitle=jjobs Web Application
 lib.dir=${web.docbase.dir}/WEB-INF/lib
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
+project.jjobs-core=../../NetBeansProjects/jjobs-core
 project.jjobs-lib=../jjobs-lib
 project.jjobs-mailer=../jjobs-mailer
 project.license=agpl30
+reference.jjobs-core.jar=${project.jjobs-core}/dist/jjobs-core.jar
 reference.jjobs-lib.jar=${project.jjobs-lib}/dist/jjobs-lib.jar
 reference.jjobs-mailer.jar=${project.jjobs-mailer}/dist/jjobs-mailer.jar
 resource.dir=setup
@@ -137,7 +138,6 @@ runmain.jvmargs=
 source.encoding=UTF-8
 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
 source.reference.jcontacts-business-lib.jar=../jcontacts-business-lib/src/
-source.reference.jjobs-core.jar=../jjobs-core/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcontacts-lib.jar=../jcontacts-lib/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 89a35017c5d5cdc35c3bbea6bc26abd29b84608c..ce8e52286288fa1ec6dde19c2d335d3acb96d00e 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -55,7 +55,7 @@
                     <file>${file.reference.jaddressbook-lib.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jjobs-core.jar}</file>
+                    <file>${reference.jjobs-core.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${reference.jjobs-lib.jar}</file>
@@ -88,6 +88,14 @@
             <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>
             <reference>
                 <foreign-project>jjobs-lib</foreign-project>
                 <artifact-type>jar</artifact-type>