From: Roland Häder Date: Wed, 15 Apr 2020 22:21:58 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=67e4b42799b05d0e22ab8ff7ff7ef9556680d3d0;p=jshop-receipt-core.git Continued: - replaced JavaEE 7.0 API with smaller JPA 2.1 API Signed-off-by: Roland Häder --- 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 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 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 058913f..555884c 100644 --- 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 794850d..2d4b7bb 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -927,14 +927,6 @@ is divided into following sections: - - - - - - - - @@ -1420,14 +1412,6 @@ is divided into following sections: - - - - - - - - diff --git a/nbproject/project.properties b/nbproject/project.properties index ee89148..770140e 100644 --- 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 3490a51..6c40166 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -14,15 +14,6 @@ ./lib/nblibraries.properties - - - jshop-receipt-lib - jar - - jar - clean - jar - - +