Maybe not cherry-pick:

- removed modelgen jar (and lib)
- added new dependency jshop-receipt-core
- updated jar(s)

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

diff --git a/lib/eclipselinkmodelgen/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar b/lib/eclipselinkmodelgen/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
deleted file mode 100644 (file)
index 0135c65..0000000
Binary files a/lib/eclipselinkmodelgen/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar and /dev/null differ

diff --git a/lib/jshop-receipt-core.jar b/lib/jshop-receipt-core.jar
new file mode 100644 (file)
index 0000000..b55bd69
Binary files /dev/null and b/lib/jshop-receipt-core.jar differ

diff --git a/lib/jshop-receipt-lib.jar b/lib/jshop-receipt-lib.jar
index a8e4d0da5d663c8972e5f18b2fe5b3c323f12714..5e22e40419f29d86d522d8750330e99cd1a54e77 100644 (file)
Binary files a/lib/jshop-receipt-lib.jar and b/lib/jshop-receipt-lib.jar differ

diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index 3eaecf1e266b83484e1cf6cb09d8d329ef586282..686d06233c0b8a9e5f18c0d6b23a431653843937 100644 (file)
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -9,12 +9,8 @@ libs.eclipselink.classpath=\
 libs.eclipselink.displayName=EclipseLink (JPA 2.1)
 libs.eclipselink.javadoc=
 libs.eclipselink.prop-maven-dependencies=\n                org.eclipse.persistence:eclipselink:2.5.2:jar\n            
-libs.eclipselinkmodelgen.classpath=\
-    ${base}/eclipselinkmodelgen/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-libs.eclipselinkmodelgen.displayName=EclipseLink-ModelGen (JPA 2.1)
-libs.eclipselinkmodelgen.prop-maven-dependencies=org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.5.2:jar
-libs.GNU_JPDF_1.7.0.classpath=\
+libs.gnu-jpdf.classpath=\
     ${base}/gnu-jpdf/gnujpdf-1.7.0.jar
-libs.GNU_JPDF_1.7.0.displayName=GNU JPDF 1.7.0
-libs.GNU_JPDF_1.7.0.javadoc=\
+libs.gnu-jpdf.displayName=GNU JPDF 1.7.0
+libs.gnu-jpdf.javadoc=\
     http://www.aip.de/~granzer/javadoc/jpdf/

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 214d64658afd5483cbaada68af642a270ddbba45..91468b3fb978d557f9631ceb875bc88bbd87a17a 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -866,9 +866,10 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jproduct-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jshop-receipt-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-receipt-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${libs.GNU_JPDF_1.7.0.classpath}" todir="${build.classes.dir}"/>
+        <copyfiles files="${libs.gnu-jpdf.classpath}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.pizzaservice-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.pizzaservice-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.pizzaservice-mailer-lib.jar}" todir="${build.classes.dir}"/>
@@ -897,15 +898,16 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.jproduct-lib.jar}" property="manifest.file.reference.jproduct-lib.jar"/>
         <basename file="${file.reference.jshop-core.jar}" property="manifest.file.reference.jshop-core.jar"/>
         <basename file="${file.reference.jshop-ee-lib.jar}" property="manifest.file.reference.jshop-ee-lib.jar"/>
+        <basename file="${file.reference.jshop-receipt-core.jar}" property="manifest.file.reference.jshop-receipt-core.jar"/>
         <basename file="${file.reference.jshop-receipt-lib.jar}" property="manifest.file.reference.jshop-receipt-lib.jar"/>
         <basename file="${file.reference.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.jar"/>
-        <basename file="${libs.GNU_JPDF_1.7.0.classpath}" property="manifest.libs.GNU_JPDF_1.7.0.classpath"/>
+        <basename file="${libs.gnu-jpdf.classpath}" property="manifest.libs.gnu-jpdf.classpath"/>
         <basename file="${reference.pizzaservice-core.jar}" property="manifest.reference.pizzaservice-core.jar"/>
         <basename file="${reference.pizzaservice-lib.jar}" property="manifest.reference.pizzaservice-lib.jar"/>
         <basename file="${reference.pizzaservice-mailer-lib.jar}" property="manifest.reference.pizzaservice-mailer-lib.jar"/>
         <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 jar-18 jar-19 jar-20 jar-21 jar-22 jar-23 jar-24 jar-25 jar-26 jar-27 jar-28 jar-29 "/>
+            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 jar-18 jar-19 jar-20 jar-21 jar-22 jar-23 jar-24 jar-25 jar-26 jar-27 jar-28 jar-29 jar-30 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
@@ -928,13 +930,14 @@ exists or setup the property manually. For example like this:
             <attribute name="jar-20-Extension-Name" value="${manifest.file.reference.jproduct-lib.jar}"/>
             <attribute name="jar-21-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
             <attribute name="jar-22-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
-            <attribute name="jar-23-Extension-Name" value="${manifest.file.reference.jshop-receipt-lib.jar}"/>
-            <attribute name="jar-24-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
-            <attribute name="jar-25-Extension-Name" value="${manifest.libs.GNU_JPDF_1.7.0.classpath}"/>
-            <attribute name="jar-26-Extension-Name" value="${manifest.reference.pizzaservice-core.jar}"/>
-            <attribute name="jar-27-Extension-Name" value="${manifest.reference.pizzaservice-lib.jar}"/>
-            <attribute name="jar-28-Extension-Name" value="${manifest.reference.pizzaservice-mailer-lib.jar}"/>
-            <attribute name="jar-29-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
+            <attribute name="jar-23-Extension-Name" value="${manifest.file.reference.jshop-receipt-core.jar}"/>
+            <attribute name="jar-24-Extension-Name" value="${manifest.file.reference.jshop-receipt-lib.jar}"/>
+            <attribute name="jar-25-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
+            <attribute name="jar-26-Extension-Name" value="${manifest.libs.gnu-jpdf.classpath}"/>
+            <attribute name="jar-27-Extension-Name" value="${manifest.reference.pizzaservice-core.jar}"/>
+            <attribute name="jar-28-Extension-Name" value="${manifest.reference.pizzaservice-lib.jar}"/>
+            <attribute name="jar-29-Extension-Name" value="${manifest.reference.pizzaservice-mailer-lib.jar}"/>
+            <attribute name="jar-30-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -960,9 +963,10 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jproduct-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jshop-receipt-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-receipt-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${libs.GNU_JPDF_1.7.0.classpath}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${libs.gnu-jpdf.classpath}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.pizzaservice-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.pizzaservice-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.pizzaservice-mailer-lib.jar}" todir="${dist.ear.dir}/lib"/>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 27acdf057b1abe5d53bf34c02c2126b8f618d0b9..59ac4dfd7b2bc323267e2a97a8a8db393a828e77 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -39,6 +39,7 @@ file.reference.jproduct-core.jar=lib/jproduct-core.jar
 file.reference.jproduct-lib.jar=lib/jproduct-lib.jar
 file.reference.jshop-core.jar=lib/jshop-core.jar
 file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar
+file.reference.jshop-receipt-core.jar=lib/jshop-receipt-core.jar
 file.reference.jshop-receipt-lib.jar=lib/jshop-receipt-lib.jar
 file.reference.juser-core.jar=lib/juser-core.jar
 file.reference.juser-lib.jar=lib/juser-lib.jar
@@ -84,9 +85,10 @@ javac.classpath=\
     ${file.reference.jproduct-lib.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
+    ${file.reference.jshop-receipt-core.jar}:\
     ${file.reference.jshop-receipt-lib.jar}:\
     ${file.reference.jmailer-ee.jar}:\
-    ${libs.GNU_JPDF_1.7.0.classpath}:\
+    ${libs.gnu-jpdf.classpath}:\
     ${reference.pizzaservice-core.jar}:\
     ${reference.pizzaservice-lib.jar}:\
     ${reference.pizzaservice-mailer-lib.jar}:\
@@ -152,6 +154,7 @@ source.reference.jproduct-core.jar=../jproduct-core/src/
 source.reference.jproduct-lib.jar=../jproduct-lib/src/
 source.reference.jshop-core.jar=../../jshop-core/src/
 source.reference.jshop-ee-lib.jar=../jshop-ee-lib/src/
+source.reference.jshop-receipt-core.jar=../jshop-receipt-core/src/
 source.reference.jshop-receipt-lib.jar=../jshop-receipt-lib/src/
 source.reference.juser-core.jar=../juser-core/src/
 source.reference.juser-lib.jar=../juser-lib/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index c0581746ec37800d22f8efc5ce0ba46b04efb28b..1bc0a6c24989231374bff67c4f6658f95820d179 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -27,9 +27,10 @@
             <included-library dirs="200">file.reference.jproduct-lib.jar</included-library>
             <included-library dirs="200">file.reference.jshop-core.jar</included-library>
             <included-library dirs="200">file.reference.jshop-ee-lib.jar</included-library>
+            <included-library dirs="200">file.reference.jshop-receipt-core.jar</included-library>
             <included-library dirs="200">file.reference.jshop-receipt-lib.jar</included-library>
             <included-library dirs="200">file.reference.jmailer-ee.jar</included-library>
-            <included-library dirs="200">libs.GNU_JPDF_1.7.0.classpath</included-library>
+            <included-library dirs="200">libs.gnu-jpdf.classpath</included-library>
             <included-library dirs="200">reference.pizzaservice-core.jar</included-library>
             <included-library dirs="200">reference.pizzaservice-lib.jar</included-library>
             <included-library dirs="200">reference.pizzaservice-mailer-lib.jar</included-library>