updated jcore.jar, jcoreee.jar, jshop-core.jar, jshop-ee-lib.jar

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

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 7318d475bd60750789a5af0d8c58471ad7d4f1d8..217c364fc77db0e54d31c837de5517fdce382fb0 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index f479cd85f681296c81d035819d67d492850194ec..9f0039fef5c5783f9feefb340c1781b104232d23 100644 (file)
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ

diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
index 9965f385e61d36baf52fba5fce71f241d62a54ea..3772ba4f64521091bb8321d30622e5475449b72d 100644 (file)
Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ

diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar
index 54ab89b53838c3734cca1275258252fce03841f1..7b5364022b09a7af86a6f90ceecc825c6c3a74dd 100644 (file)
Binary files a/lib/jshop-ee-lib.jar and b/lib/jshop-ee-lib.jar differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 8b76c5361ba146fafb622b97979db4afdfa167e4..4b03fbaea67500616b5dfbbb3a7ec5a1e2667794 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -921,6 +921,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.jcore-ee-logger}" name="call.subproject"/>
+            <param location="${project.jcore-ee-logger}/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">
@@ -1406,6 +1414,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.jcore-ee-logger}" name="call.subproject"/>
+            <param location="${project.jcore-ee-logger}/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/genfiles.properties b/nbproject/genfiles.properties
index 46dc8cf295279e9d309f90906333b7453accb3f4..56a9e7c2aff649eae20cb349ca3e04b8e10743b3 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=f0670d99
+build.xml.data.CRC32=c13df2fe
 build.xml.script.CRC32=c005ff3b
 build.xml.stylesheet.CRC32=8064a381@1.75.2.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=f0670d99
-nbproject/build-impl.xml.script.CRC32=ba48679e
+nbproject/build-impl.xml.data.CRC32=c13df2fe
+nbproject/build-impl.xml.script.CRC32=2f278340
 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 406473dce6881a4b52ec8f682fbf56e45401d72f..e4552c18cbcbfcad8b4a6e367f317b3d93f67a71 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -31,7 +31,6 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.cdi-api.jar=lib/cdi-api.jar
-file.reference.jcore.jar=lib/jcore.jar
 file.reference.jcoreee.jar=lib/jcoreee.jar
 file.reference.jshop-core.jar=lib/jshop-core.jar
 file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar
@@ -40,7 +39,7 @@ jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${file.reference.jcore.jar}:\
+    ${reference.jcore-ee-logger.jar}:\
     ${file.reference.jcoreee.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
@@ -85,7 +84,9 @@ manifest.custom.permissions=
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform
+project.jcore-ee-logger=../jcore-ee-logger
 project.license=gpl30
+reference.jcore-ee-logger.jar=${project.jcore-ee-logger}/dist/jcore-ee-logger.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -97,7 +98,6 @@ run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 source.encoding=UTF-8
-source.reference.jcore.jar=../jcore/src/
 source.reference.jcoreee.jar=../jcoreee/src/
 source.reference.jshop-core.jar=../jshop-core/src/
 source.reference.jshop-ee-lib.jar=../jshop-ee-lib/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index c0e59c77d35d0436551b9d838c95cb5e7e81dc72..51cecfd8571d855e532b319f0e8a815923d6d69c 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>jcore-ee-logger</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>