From 19319d080f1f8b91283cf0029d120517ec83db77 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 23 Jun 2017 22:27:58 +0200 Subject: [PATCH] converted jar-based dependency to project-based as this is fine for this case MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/jjobs-core.jar | Bin 17487 -> 0 bytes nbproject/build-impl.xml | 7 +++++++ nbproject/project.properties | 6 +++--- nbproject/project.xml | 10 +++++++++- 4 files changed, 19 insertions(+), 4 deletions(-) delete mode 100644 lib/jjobs-core.jar diff --git a/lib/jjobs-core.jar b/lib/jjobs-core.jar deleted file mode 100644 index 5f7ce3aedb0df2d2a059c9fb227f7f23b4022cb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17487 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 + + + @@ -886,6 +889,9 @@ exists or setup the property manually. For example like this: + + + @@ -1452,6 +1458,7 @@ exists or setup the property manually. For example like this: CLEANUP SECTION --> + diff --git a/nbproject/project.properties b/nbproject/project.properties index d6605bf8..7d804f70 100644 --- 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 89a35017..ce8e5228 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -55,7 +55,7 @@ ${file.reference.jaddressbook-lib.jar} - ${file.reference.jjobs-core.jar} + ${reference.jjobs-core.jar} ${reference.jjobs-lib.jar} @@ -88,6 +88,14 @@ ./lib/nblibraries.properties + + jjobs-core + jar + + jar + clean + jar + jjobs-lib jar -- 2.39.5