Continued:

- replaced JavaEE 7.0 API with smaller JPA 2.1 API

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

diff --git a/lib/javaee-api-7.0/javaee-api-7.0.jar b/lib/javaee-api-7.0/javaee-api-7.0.jar
deleted file mode 100644 (file)
index 9e38d4c..0000000
Binary files a/lib/javaee-api-7.0/javaee-api-7.0.jar and /dev/null differ

diff --git a/lib/jpa20-persistence/javax.persistence_2.1.0.v201304241213.jar b/lib/jpa20-persistence/javax.persistence_2.1.0.v201304241213.jar
new file mode 100644 (file)
index 0000000..841d2e1
Binary files /dev/null and b/lib/jpa20-persistence/javax.persistence_2.1.0.v201304241213.jar differ

diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index 058913ff29c52f9c7f27edb3e71c3d0af4688686..555884c39be56b9932d8a3baf5edcc67c7cb03e8 100644 (file)
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -7,9 +7,9 @@ libs.gnu-jpdf.classpath=\
 libs.gnu-jpdf.displayName=GNU JPDF 1.7.0
 libs.gnu-jpdf.javadoc=\
     http://www.aip.de/~granzer/javadoc/jpdf/
-libs.javaee-api-7.0.classpath=\
-    ${base}/javaee-api-7.0/javaee-api-7.0.jar
-libs.javaee-api-7.0.displayName=Java EE 7 API Library
-libs.javaee-api-7.0.javadoc=\
+libs.jpa20-persistence.classpath=\
+    ${base}/jpa20-persistence/javax.persistence_2.1.0.v201304241213.jar
+libs.jpa20-persistence.displayName=Persistence (JPA 2.1)
+libs.jpa20-persistence.javadoc=\
     https://docs.oracle.com/javaee/7/api/
-libs.javaee-api-7.0.prop-maven-dependencies=javax:javaee-api:7.0:jar
+libs.jpa20-persistence.prop-maven-dependencies=org.eclipse.persistence:javax.persistence:2.1.0:jar

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 794850dc2e0a1fafec5e96b59f57b6df1ed4e677..2d4b7bbbdf693fe7e55a051a71a2a8f532b0e442 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -927,14 +927,6 @@ 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.jshop-receipt-lib}" name="call.subproject"/>
-            <param location="${project.jshop-receipt-lib}/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">
@@ -1420,14 +1412,6 @@ 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.jshop-receipt-lib}" name="call.subproject"/>
-            <param location="${project.jshop-receipt-lib}/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 ee8914870f460297c6d5419da9bd6735a57fef76..770140ef9c143f193fdd00984b02dbc0c333edbe 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -35,9 +35,8 @@ jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${reference.jshop-receipt-lib.jar}:\
     ${libs.gnu-jpdf.classpath}:\
-    ${libs.javaee-api-7.0.classpath}
+    ${libs.jpa20-persistence.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.deprecation=true
@@ -78,9 +77,7 @@ manifest.custom.permissions=
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform
-project.jshop-receipt-lib=../jshop-receipt-lib
 project.license=gpl30
-reference.jshop-receipt-lib.jar=${project.jshop-receipt-lib}/dist/jshop-receipt-lib.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 3490a51f78f0bd4df6413b5111b23006976edff5..6c40166e3e790d431c11e3060e927102d24f06fc 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -14,15 +14,6 @@
         <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>jshop-receipt-lib</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>jar</target>
-                <clean-target>clean</clean-target>
-                <id>jar</id>
-            </reference>
-        </references>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
     </configuration>
 </project>