midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5909:use jdbc library as bundle (#2092) 

* IDEMPIERE-5909:use jdbc library as bundle

* IDEMPIERE-5909:use jdbc library as bundle (version up)

* IDEMPIERE-5909:use jdbc library as bundle (update target id as CarlosRuiz suggest)
This commit is contained in:
hieplq 2023-11-08 18:12:35 +07:00 committed by GitHub
parent 0c831cd9c8
commit ee66699d4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 128 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.adempiere.base-feature/model.generator.launch
View File

@ -47,6 +47,7 @@
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/>
@ -113,10 +114,12 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jdk14@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>

3
org.adempiere.base-feature/packinfolder.app.launch
View File

@ -47,6 +47,7 @@
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/>
@ -131,10 +132,12 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jdk14@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>

3
org.adempiere.base-feature/sign.database.build.launch
View File

@ -48,6 +48,7 @@
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/>
@ -131,10 +132,12 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jdk14@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>

3
org.adempiere.base-feature/synchronize-terminology.app.launch
View File

@ -48,6 +48,7 @@
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/>
@ -132,10 +133,12 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jdk14@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>

3
org.adempiere.base-feature/translation.app.launch
View File

@ -48,6 +48,7 @@
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/>
@ -131,10 +132,12 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jdk14@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>

3
org.adempiere.install/install.app.launch
View File

@ -45,6 +45,7 @@
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.gimap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/>
@ -115,10 +116,12 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jdk14@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>

3
org.adempiere.install/install.console.app.launch
View File

@ -45,6 +45,7 @@
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.gimap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/>
@ -112,10 +113,12 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jdk14@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>

3
org.adempiere.install/install.silent.app.launch
View File

@ -45,6 +45,7 @@
<setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.gimap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy@default:default"/>
<setEntry value="io.github.classgraph.classgraph@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/>
@ -112,10 +113,12 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jdk14@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>

5
org.adempiere.server-feature/server.product.functionaltest.launch
View File

@ -119,6 +119,7 @@
<setEntry value="com.sun.xml.stream.buffer.streambuffer@default:default"/>
<setEntry value="com.sun.xml.ws.jaxws-rt@default:default"/>
<setEntry value="com.sun.xml.ws.policy@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/>
@ -258,7 +259,7 @@
<setEntry value="org.eclipse.equinox.servletbridge@default:default"/>
<setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/>
<setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
<setEntry value="org.eclipse.jdt.core.compiler.batch*3.33.0.v20230218-1114@default:default"/>
<setEntry value="org.eclipse.jdt.core.compiler.batch@default:default"/>
<setEntry value="org.eclipse.jdt.core@default:default"/>
<setEntry value="org.eclipse.jetty.alpn.client@default:default"/>
<setEntry value="org.eclipse.jetty.annotations@default:true"/>
@ -358,6 +359,7 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="org.sat4j.core@default:default"/>
<setEntry value="org.sat4j.pb@default:default"/>
<setEntry value="org.tukaani.xz@default:default"/>
@ -371,6 +373,7 @@
<setEntry value="stax2-api@default:default"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.com.sun.net.httpserver.http@default:default"/>
<setEntry value="wrapped.com.sun.org.apache.xml.internal.resolver@default:default"/>
<setEntry value="wrapped.com.zaxxer.SparseBitSet@default:default"/>

3
org.adempiere.server-feature/server.product.launch
View File

@ -119,6 +119,7 @@
<setEntry value="com.sun.xml.stream.buffer.streambuffer@default:default"/>
<setEntry value="com.sun.xml.ws.jaxws-rt@default:default"/>
<setEntry value="com.sun.xml.ws.policy@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/>
@ -358,6 +359,7 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="org.sat4j.core@default:default"/>
<setEntry value="org.sat4j.pb@default:default"/>
<setEntry value="org.tukaani.xz@default:default"/>
@ -371,6 +373,7 @@
<setEntry value="stax2-api@default:default"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.com.sun.net.httpserver.http@default:default"/>
<setEntry value="wrapped.com.sun.org.apache.xml.internal.resolver@default:default"/>
<setEntry value="wrapped.com.zaxxer.SparseBitSet@default:default"/>

5
org.adempiere.server-feature/setup/configuration/config.ini
View File

@ -102,7 +102,10 @@ osgi.bundles=org.apache.felix.scr@1:start,\
org.osgi.util.promise,\
org.osgi.util.pushstream,\
org.osgi.util.tracker,\
org.osgi.util.xml
org.osgi.util.xml,\
org.postgresql.jdbc,\
com.zaxxer.HikariCP,\
wrapped.com.oracle.database.jdbc.ojdbc10
osgi.framework.extensions=
osgi.bundles.defaultStartLevel=4
osgi.compatibility.bootdelegation=true

2
org.compiere.db.oracle.provider/.classpath
View File

@ -3,7 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/HikariCP.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ojdbc10.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

8
org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
View File

@ -6,10 +6,10 @@ Bundle-Version: 11.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.adempiere.install;bundle-version="0.0.0";resolution:=optional
Bundle-ClassPath: .,
lib/HikariCP.jar,
lib/ojdbc10.jar
org.adempiere.install;bundle-version="0.0.0";resolution:=optional,
com.zaxxer.HikariCP;bundle-version="5.0.1",
wrapped.com.oracle.database.jdbc.ojdbc10;bundle-version="19.16.0"
Bundle-ClassPath: .
Import-Package: org.osgi.framework,
org.slf4j;version="1.7.2"
Bundle-ActivationPolicy: lazy

4
org.compiere.db.oracle.provider/build.properties
View File

@ -3,8 +3,6 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
OSGI-INF/oracleprovider.xml,\
OSGI-INF/,\
lib/ojdbc10.jar,\
lib/HikariCP.jar
OSGI-INF/
source.. = src/
jre.compilation.profile = JavaSE-17

35
org.compiere.db.oracle.provider/pom.xml
View File

@ -9,39 +9,4 @@
</parent>
<artifactId>org.compiere.db.oracle.provider</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.0.1</version>
</artifactItem>
<artifactItem>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc10</artifactId>
<version>19.16.0.0</version>
</artifactItem>
</artifactItems>
<outputDirectory>lib</outputDirectory>
<stripVersion>true</stripVersion>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

2
org.compiere.db.postgresql.provider/.classpath
View File

@ -7,7 +7,5 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/postgresql.jar"/>
<classpathentry exported="true" kind="lib" path="lib/HikariCP.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

8
org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
View File

@ -5,11 +5,11 @@ Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
Bundle-Version: 11.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
Bundle-ClassPath: .,
lib/postgresql.jar,
lib/HikariCP.jar
Bundle-ClassPath: .
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.adempiere.install;bundle-version="0.0.0";resolution:=optional
org.adempiere.install;bundle-version="0.0.0";resolution:=optional,
com.zaxxer.HikariCP;bundle-version="5.0.1",
org.postgresql.jdbc;bundle-version="42.6.0"
Import-Package: org.osgi.framework,
org.slf4j;version="1.7.2"
Bundle-ActivationPolicy: lazy

4
org.compiere.db.postgresql.provider/build.properties
View File

@ -3,8 +3,6 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
OSGI-INF/pgprovider.xml,\
OSGI-INF/,\
lib/postgresql.jar,\
lib/HikariCP.jar
OSGI-INF/
source.. = src/
jre.compilation.profile = JavaSE-17

35
org.compiere.db.postgresql.provider/pom.xml
View File

@ -9,39 +9,4 @@
</parent>
<artifactId>org.compiere.db.postgresql.provider</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.0.1</version>
</artifactItem>
<artifactItem>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.5.0</version>
</artifactItem>
</artifactItems>
<outputDirectory>lib</outputDirectory>
<stripVersion>true</stripVersion>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

21
org.compiere.db.provider-feature/feature.xml
View File

@ -31,4 +31,25 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.postgresql.jdbc"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.zaxxer.HikariCP"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.com.oracle.database.jdbc.ojdbc10"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

25
org.idempiere.p2.targetplatform/maven.locations.xml
View File

@ -1496,4 +1496,29 @@ Export-Package: *;version="${version}";-noimport:=true
<version>4.5.13</version>
<type>jar</type>
</location>
<!-- for jdbc drive -->
<location includeSource="true" missingManifest="error" type="Maven">
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.0.1</version>
</location>
<location includeSource="true" missingManifest="error" type="Maven">
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc10</artifactId>
<version>19.21.0.0</version>
<type>jar</type>
<instructions><![CDATA[Bundle-Name: Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<!--for jdbc drive -->
</locations>

3
org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target
View File

@ -364,5 +364,8 @@
<plugin id="org.osgi.util.pushstream"/>
<plugin id="org.osgi.util.tracker"/>
<plugin id="org.osgi.util.xml"/>
<plugin id="com.zaxxer.HikariCP"/>
<plugin id="org.postgresql.jdbc"/>
<plugin id="wrapped.com.oracle.database.jdbc.ojdbc10"/>
</includeBundles>
</target>

27
org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="idempiere-230620" sequenceNumber="1688978988">
<target name="idempiere-231107" sequenceNumber="1688978989">
<locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="zcommon" version="9.6.4"/>
@ -1642,5 +1642,30 @@ Export-Package: *;version="${version}";-noimport:=true
<version>4.5.13</version>
<type>jar</type>
</location>
<!-- for jdbc library -->
<location includeSource="true" missingManifest="error" type="Maven">
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.0.1</version>
</location>
<location includeSource="true" missingManifest="error" type="Maven">
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc10</artifactId>
<version>19.21.0.0</version>
<type>jar</type>
<instructions><![CDATA[Bundle-Name: Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}}
Bundle-SymbolicName: wrapped.${mvnGroupId}.${mvnArtifactId}
Bundle-Version: ${version}
Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
]]></instructions>
</location>
<!-- for jdbc library -->
</locations>
</target>

3
org.idempiere.test/idempiere.unit.test.launch
View File

@ -106,6 +106,7 @@
<setEntry value="com.sun.xml.fastinfoset.FastInfoset*2.0.0@default:default"/>
<setEntry value="com.sun.xml.messaging.saaj.impl@default:default"/>
<setEntry value="com.sun.xml.stream.buffer.streambuffer@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/>
@ -347,6 +348,7 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="org.sat4j.core@default:default"/>
<setEntry value="org.sat4j.pb@default:default"/>
<setEntry value="org.tukaani.xz@default:default"/>
@ -360,6 +362,7 @@
<setEntry value="stax2-api@default:default"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.com.sun.org.apache.xml.internal.resolver@default:default"/>
<setEntry value="wrapped.com.zaxxer.SparseBitSet@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>

3
org.idempiere.test/idempiere.unit.test.parallel.launch
View File

@ -106,6 +106,7 @@
<setEntry value="com.sun.xml.fastinfoset.FastInfoset*2.0.0@default:default"/>
<setEntry value="com.sun.xml.messaging.saaj.impl@default:default"/>
<setEntry value="com.sun.xml.stream.buffer.streambuffer@default:default"/>
<setEntry value="com.zaxxer.HikariCP@default:default"/>
<setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/>
@ -347,6 +348,7 @@
<setEntry value="org.osgi.util.tracker@default:default"/>
<setEntry value="org.osgi.util.xml@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.postgresql.jdbc@default:default"/>
<setEntry value="org.sat4j.core@default:default"/>
<setEntry value="org.sat4j.pb@default:default"/>
<setEntry value="org.tukaani.xz@default:default"/>
@ -360,6 +362,7 @@
<setEntry value="stax2-api@default:default"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.oracle.database.jdbc.ojdbc10@default:default"/>
<setEntry value="wrapped.com.sun.org.apache.xml.internal.resolver@default:default"/>
<setEntry value="wrapped.com.zaxxer.SparseBitSet@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>

4
utils_dev/oomph/idempiere.setup
View File

@ -10,7 +10,7 @@
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Maven.ecore http://www.eclipse.org/oomph/setup/pde/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore"
name="idempiere.11.230620"
name="idempiere.11.231107"
label="iDempiere 11">
<setupTask
xsi:type="setup:PreferenceTask"
@ -26,7 +26,7 @@
<setupTask
xsi:type="setup:VariableTask"
name="idempiere.target.platform"
defaultValue="idempiere-230620"
defaultValue="idempiere-231107"
storageURI="scope://Workspace"
label="Target Platform"/>
<setupTask