Skip to content

Commit

Permalink
[NETBEANS-4329] Update eclipselink from 2.5.2 to 2.7.7
Browse files Browse the repository at this point in the history
  • Loading branch information
pepness authored and matthiasblaesing committed Jul 3, 2020
1 parent 526e0ae commit cef8320
Show file tree
Hide file tree
Showing 19 changed files with 110 additions and 105 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-container-servlet.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-container-servlet-core.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.websvc.restlib/modules/ext/jersey2/jersey-server.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.moxy-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.core-2.7.7.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.asm-2.7.7.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.7.7.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.7.7.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.7.7.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.moxy-2.7.7.jar!/</resource>
</volume>
<properties>
<!-- please check with [email protected] before/after updating this or "classpath" section -->
Expand Down
20 changes: 10 additions & 10 deletions java/j2ee.eclipselink/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@
<import file="../../nbbuild/templates/projectized.xml"/>

<target name="-check-jpa-doc" depends="projectized.build-init">
<available file="build/javax.persistence-2.1.0-doc.zip" property="jpa-doc-available"/>
<available file="build/javax.persistence-2.2.1-doc.zip" property="jpa-doc-available"/>
</target>

<target name="-build-jpa-doc" depends="-check-jpa-doc" unless="jpa-doc-available">
<delete dir="build/javax.persistence-2.1.0-sources" />
<delete dir="build/javax.persistence-2.1.0-doc" />
<delete file="build/javax.persistence-2.1.0-doc.zip" />
<unzip dest="build/javax.persistence-2.1.0-sources"
src="external/javax.persistence-2.1.0-sources.jar" />
<javadoc destdir="build/javax.persistence-2.1.0-doc">
<packageset dir="build/javax.persistence-2.1.0-sources" defaultexcludes="yes">
<delete dir="build/javax.persistence-2.2.1-sources" />
<delete dir="build/javax.persistence-2.2.1-doc" />
<delete file="build/javax.persistence-2.2.1-doc.zip" />
<unzip dest="build/javax.persistence-2.2.1-sources"
src="external/javax.persistence-2.2.1-sources.jar" />
<javadoc destdir="build/javax.persistence-2.2.1-doc">
<packageset dir="build/javax.persistence-2.2.1-sources" defaultexcludes="yes">
<include name="javax/persistence/**" />
</packageset>
</javadoc>
<zip destfile="build/javax.persistence-2.1.0-doc.zip">
<zipfileset dir="build/javax.persistence-2.1.0-doc" prefix="docs/"/>
<zip destfile="build/javax.persistence-2.2.1-doc.zip">
<zipfileset dir="build/javax.persistence-2.2.1-doc" prefix="docs/"/>
</zip>
</target>

Expand Down
16 changes: 8 additions & 8 deletions java/j2ee.eclipselink/external/binaries-list
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
04C4E53577658440409783942AEE0D37DA0A67F9 org.eclipse.persistence:org.eclipse.persistence.core:2.5.2
83298D74D26BDDD95C5025AB2A1E545BB5424739 org.eclipse.persistence:org.eclipse.persistence.asm:2.5.2
189DB51E5A42710F16B5CF880AECC19B2820B0F9 org.eclipse.persistence:org.eclipse.persistence.antlr:2.5.2
2A54E88F70B488381F837D644A16A2219FB4FD64 org.eclipse.persistence:org.eclipse.persistence.jpa:2.5.2
29AF1D338CBB76290D1A96F5A6610F1E8C319AE5 org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.5.2
AF39466383E372E3AB4737F6014ABE0D69470675 org.eclipse.persistence:org.eclipse.persistence.moxy:2.5.2
5BAB675816DBE0F64BB86004B108BF2A00292358 org.eclipse.persistence:javax.persistence:2.1.0
DA95A959929234C57B988644696C065D79774FC4 org.eclipse.persistence:javax.persistence:2.1.0:sources
165FF90EF6904E7A14F84C2C921C4109558C676D org.eclipse.persistence:org.eclipse.persistence.core:2.7.7
EEA79261168918E4638D11DAC47C80557473F56A org.eclipse.persistence:org.eclipse.persistence.asm:2.7.7
78712ED5187194106A5563F3DE0539BED69ED8E5 org.eclipse.persistence:org.eclipse.persistence.antlr:2.7.7
CEEA5C43E5A92585846CC7A6F5D9F1E67FAC6B84 org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.7
B4BCDECDC32C907D04108FE2E39F1CAB3AAAF186 org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.7.7
8DED6B5CD72F934DD643A89C1CC792FC4079CAB8 org.eclipse.persistence:org.eclipse.persistence.moxy:2.7.7
7EA990B062655A52CA5010CF8716FB3FBDE46D2E org.eclipse.persistence:javax.persistence:2.2.1
865540770A6BB480AFA34A785F765B567D14909B org.eclipse.persistence:javax.persistence:2.2.1:sources
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Name: EclipseLink
Origin: Eclipse
Version: 2.5.2
Version: 2.7.7
Description: The Eclipse Persistence Services Project ( EclipseLink) project.
License: EPL-v10-eclipselink
Origin: http://www.eclipse.org/eclipselink/
Files: javax.persistence-2.1.0-sources.jar, javax.persistence-2.1.0.jar, org.eclipse.persistence.core-2.5.2.jar, org.eclipse.persistence.asm-2.5.2.jar, org.eclipse.persistence.antlr-2.5.2.jar, org.eclipse.persistence.jpa-2.5.2.jar, org.eclipse.persistence.jpa.jpql-2.5.2.jar,org.eclipse.persistence.moxy-2.5.2.jar
Files: javax.persistence-2.2.1-sources.jar, javax.persistence-2.2.1.jar, org.eclipse.persistence.core-2.7.7.jar, org.eclipse.persistence.asm-2.7.7.jar, org.eclipse.persistence.antlr-2.7.7.jar, org.eclipse.persistence.jpa-2.7.7.jar, org.eclipse.persistence.jpa.jpql-2.7.7.jar,org.eclipse.persistence.moxy-2.7.7.jar

Use of EclipseLink version 2.5.2 is governed by the terms of the license below:
Use of EclipseLink version 2.7.7 is governed by the terms of the license below:

License

Expand Down
34 changes: 18 additions & 16 deletions java/j2ee.eclipselink/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,24 @@

is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
javac.source=1.8
jnlp.indirect.jars=\
modules/ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar,\
modules/ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar,\
modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar,\
modules/ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar,\
modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar,\
modules/ext/eclipselink/javax.persistence-2.1.0.jar,\
modules/ext/docs/javax.persistence-2.1.0-doc.zip
modules/ext/eclipselink/org.eclipse.persistence.core-2.7.7.jar,\
modules/ext/eclipselink/org.eclipse.persistence.asm-2.7.7.jar,\
modules/ext/eclipselink/org.eclipse.persistence.antlr-2.7.7.jar,\
modules/ext/eclipselink/org.eclipse.persistence.jpa-2.7.7.jar,\
modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.7.7.jar,\
modules/ext/eclipselink/org.eclipse.persistence.moxy-2.7.7.jar,\
modules/ext/eclipselink/javax.persistence-2.2.1.jar,\
modules/ext/docs/javax.persistence-2.2.1-doc.zip

release.external/org.eclipse.persistence.core-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar
release.external/org.eclipse.persistence.asm-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar
release.external/org.eclipse.persistence.antlr-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar
release.external/org.eclipse.persistence.jpa-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar
release.external/org.eclipse.persistence.jpa.jpql-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar
release.external/javax.persistence-2.1.0.jar=modules/ext/eclipselink/javax.persistence-2.1.0.jar
release.build/javax.persistence-2.1.0-doc.zip=modules/ext/docs/javax.persistence-2.1.0-doc.zip
release.external/org.eclipse.persistence.core-2.7.7.jar=modules/ext/eclipselink/org.eclipse.persistence.core-2.7.7.jar
release.external/org.eclipse.persistence.asm-2.7.7.jar=modules/ext/eclipselink/org.eclipse.persistence.asm-2.7.7.jar
release.external/org.eclipse.persistence.antlr-2.7.7.jar=modules/ext/eclipselink/org.eclipse.persistence.antlr-2.7.7.jar
release.external/org.eclipse.persistence.jpa-2.7.7.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa-2.7.7.jar
release.external/org.eclipse.persistence.jpa.jpql-2.7.7.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.7.7.jar
release.external/org.eclipse.persistence.moxy-2.7.7.jar=modules/ext/eclipselink/org.eclipse.persistence.moxy-2.7.7.jar
release.external/javax.persistence-2.2.1.jar=modules/ext/eclipselink/javax.persistence-2.2.1.jar
release.build/javax.persistence-2.2.1-doc.zip=modules/ext/docs/javax.persistence-2.2.1-doc.zip

extra.module.files=modules/ext/docs/javax.persistence-2.1.0-doc.zip
extra.module.files=modules/ext/docs/javax.persistence-2.2.1-doc.zip
15 changes: 9 additions & 6 deletions java/j2ee.eclipselink/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,25 @@
<subpackages>javax.persistence</subpackages>
</public-packages>
<class-path-extension>
<runtime-relative-path>ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar</runtime-relative-path>
<runtime-relative-path>ext/eclipselink/org.eclipse.persistence.core-2.7.7.jar</runtime-relative-path>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar</runtime-relative-path>
<runtime-relative-path>ext/eclipselink/org.eclipse.persistence.asm-2.7.7.jar</runtime-relative-path>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar</runtime-relative-path>
<runtime-relative-path>ext/eclipselink/org.eclipse.persistence.antlr-2.7.7.jar</runtime-relative-path>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar</runtime-relative-path>
<runtime-relative-path>ext/eclipselink/org.eclipse.persistence.jpa-2.7.7.jar</runtime-relative-path>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar</runtime-relative-path>
<runtime-relative-path>ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.7.7.jar</runtime-relative-path>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/eclipselink/javax.persistence-2.1.0.jar</runtime-relative-path>
<runtime-relative-path>ext/eclipselink/org.eclipse.persistence.moxy-2.7.7.jar</runtime-relative-path>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/eclipselink/javax.persistence-2.2.1.jar</runtime-relative-path>
</class-path-extension>
</data>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,30 @@
<localizing-bundle>org.netbeans.modules.j2ee.eclipselink.Bundle</localizing-bundle>
<volume>
<type>classpath</type>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.moxy-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/javax.persistence-2.1.0.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.core-2.7.7.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.asm-2.7.7.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.7.7.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.7.7.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.7.7.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.moxy-2.7.7.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/javax.persistence-2.2.1.jar!/</resource>
</volume>
<volume>
<type>javadoc</type>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/docs/javax.persistence-2.1.0-doc.zip!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/docs/javax.persistence-2.2.1-doc.zip!/</resource>
</volume>
<properties>
<!-- please check with [email protected] before/after updating this or "classpath" section -->
<property>
<name>maven-dependencies</name>
<value>
org.eclipse.persistence:org.eclipse.persistence.core:2.5.2:jar
org.eclipse.persistence:org.eclipse.persistence.asm:2.5.2:jar
org.eclipse.persistence:org.eclipse.persistence.antlr:2.5.2:jar
org.eclipse.persistence:org.eclipse.persistence.jpa:2.5.2:jar
org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.5.2:jar
org.eclipse.persistence:org.eclipse.persistence.moxy:2.5.2
org.eclipse.persistence:javax.persistence:2.1.0:jar
org.eclipse.persistence:org.eclipse.persistence.core:2.7.7:jar
org.eclipse.persistence:org.eclipse.persistence.asm:2.7.7:jar
org.eclipse.persistence:org.eclipse.persistence.antlr:2.7.7:jar
org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.7:jar
org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.7.7:jar
org.eclipse.persistence:org.eclipse.persistence.moxy:2.7.7:jar
org.eclipse.persistence:javax.persistence:2.2.1:jar
</value>
</property>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
<localizing-bundle>org.netbeans.modules.j2ee.eclipselink.Bundle</localizing-bundle>
<volume>
<type>classpath</type>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/javax.persistence-2.1.0.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/javax.persistence-2.2.1.jar!/</resource>
</volume>
<volume>
<type>javadoc</type>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/docs/javax.persistence-2.1.0-doc.zip!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/docs/javax.persistence-2.2.1-doc.zip!/</resource>
</volume>
<properties>
<!-- please check with [email protected] before/after updating this or "classpath" section -->
<property>
<name>maven-dependencies</name>
<value>org.eclipse.persistence:javax.persistence:2.1.0:jar</value>
<value>org.eclipse.persistence:javax.persistence:2.2.1:jar</value>
</property>
</properties>
</library>
2 changes: 1 addition & 1 deletion java/j2ee.eclipselinkmodelgen/external/binaries-list
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
85A0C541AFE89159B3DD6BC213D8CB95E6FE911B org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.5.2
B04976CFF167CC9FF4EB84BCEA663CED9477959B org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.7.7
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Name: EclipseLink
Origin: Eclipse
Version: 2.5.2
Version: 2.7.7
Description: The Eclipse Persistence Services Project ( EclipseLink) project.
License: EPL-v10-eclipselink
Origin: http://www.eclipse.org/eclipselink/
Files: org.eclipse.persistence.jpa.modelgen.processor-2.5.2.jar
Files: org.eclipse.persistence.jpa.modelgen.processor-2.7.7.jar

Use of EclipseLink version 2.5.2 is governed by the terms of the license below:
Use of EclipseLink version 2.7.7 is governed by the terms of the license below:

License

Expand Down
4 changes: 2 additions & 2 deletions java/j2ee.eclipselinkmodelgen/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
# under the License.

jnlp.indirect.jars=\
modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.5.2.jar
modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.7.7.jar

release.external/org.eclipse.persistence.jpa.modelgen.processor-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.5.2.jar
release.external/org.eclipse.persistence.jpa.modelgen.processor-2.7.7.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.7.7.jar
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<localizing-bundle>org.netbeans.modules.j2ee.eclipselinkmodelgen.Bundle</localizing-bundle>
<volume>
<type>classpath</type>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselinkmodelgen/modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.5.2.jar!/</resource>
<resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselinkmodelgen/modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.7.7.jar!/</resource>
</volume>
<volume>
<type>javadoc</type>
Expand All @@ -37,7 +37,7 @@
<!-- please check with [email protected] before/after updating this or "classpath" section -->
<property>
<name>maven-dependencies</name>
<value>org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.5.2:jar</value>
<value>org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.7.7:jar</value>
</property>
</properties>
</library>
Loading

0 comments on commit cef8320

Please sign in to comment.