Skip to content

Commit

Permalink
Use com.h2database 2.2.224 instead of org.h2
Browse files Browse the repository at this point in the history
- org.apache.commons.logging -> org.apache.commons.commons-logging

eclipse-simrel/simrel.build#438
  • Loading branch information
merks authored and estepper committed Jul 13, 2024
1 parent c39e12c commit b4d9082
Show file tree
Hide file tree
Showing 65 changed files with 157 additions and 169 deletions.
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.cdo.all-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.cdo.all"
label="%featureName"
version="4.26.0.qualifier"
version="5.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.cdo.all-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.all</artifactId>
<version>4.26.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.cdo.examples-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.examples"
label="%featureName"
version="4.6.3.qualifier"
version="4.6.4.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.cdo.examples-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.examples</artifactId>
<version>4.6.3-SNAPSHOT</version>
<version>4.6.4-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.examples.installer"
label="%featureName"
version="4.4.3.qualifier"
version="4.4.4.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.examples.installer</artifactId>
<version>4.4.3-SNAPSHOT</version>
<version>4.4.4-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server.lissome"
label="%featureName"
version="4.3.9.qualifier"
version="4.3.10.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.server.lissome</artifactId>
<version>4.3.9-SNAPSHOT</version>
<version>4.3.10-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j"
label="%featureName"
version="4.26.0.qualifier"
version="5.0.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j</artifactId>
<version>4.26.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.db-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db"
label="%featureName"
version="4.24.0.qualifier"
version="5.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.db-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.db</artifactId>
<version>4.24.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
4 changes: 2 additions & 2 deletions features/org.eclipse.net4j.db.h2-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.db.h2"
label="%featureName"
version="4.5.5.qualifier"
version="5.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
Expand Down Expand Up @@ -42,7 +42,7 @@
unpack="false"/>

<plugin
id="org.h2"
id="com.h2database"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.db.h2-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.db.h2</artifactId>
<version>4.5.5-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.sdk-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.sdk"
label="%featureName"
version="4.26.0.qualifier"
version="5.0.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.sdk-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.sdk</artifactId>
<version>4.26.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.tests-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.tests"
label="%featureName"
version="4.3.12.qualifier"
version="4.3.13.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.tests-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.tests</artifactId>
<version>4.3.12-SNAPSHOT</version>
<version>4.3.13-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
4 changes: 2 additions & 2 deletions features/org.eclipse.net4j.util-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.util"
label="%featureName"
version="4.24.0.qualifier"
version="5.0.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
Expand Down Expand Up @@ -43,7 +43,7 @@
unpack="false"/>

<plugin
id="org.apache.commons.logging"
id="org.apache.commons.commons-logging"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.util-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.util</artifactId>
<version>4.24.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.util.ui-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.util.ui"
label="%featureName"
version="4.24.0.qualifier"
version="5.0.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.util.ui-feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.util.ui</artifactId>
<version>4.24.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client.offline;singleton:=true
Bundle-Version: 4.4.1.qualifier
Bundle-Version: 4.4.2.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Expand All @@ -21,9 +21,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
Bundle-ClassPath: .
Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.4.1";x-internal:=true,
org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.4.1";x-internal:=true,
org.eclipse.wb.swt;version="4.4.1";x-internal:=true
Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.4.2";x-internal:=true,
org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.4.2";x-internal:=true,
org.eclipse.wb.swt;version="4.4.2";x-internal:=true
Automatic-Module-Name: org.eclipse.emf.cdo.examples.client.offline
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.examples.client.offline</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.4.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.clone;singleton:=true
Bundle-Version: 4.2.1.qualifier
Bundle-Version: 4.2.2.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Expand All @@ -17,6 +17,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.examples.company;bundle-version="[4.0.0,5.0.0)"
Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
Export-Package: org.eclipse.emf.cdo.examples.server.offline;version="4.2.1";x-internal:=true
Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.emf.cdo.examples.server.offline;version="4.2.2";x-internal:=true
Automatic-Module-Name: org.eclipse.emf.cdo.examples.clone
2 changes: 1 addition & 1 deletion plugins/org.eclipse.emf.cdo.examples.clone/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.examples.clone</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.2.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.installer;singleton:=true
Bundle-Version: 4.3.3.qualifier
Bundle-Version: 4.3.4.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client.offline;singleton:=true
Bundle-Version: 4.4.1.qualifier
Bundle-Version: 4.4.2.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Expand All @@ -21,9 +21,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
Bundle-ClassPath: .
Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.4.1";x-internal:=true,
org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.4.1";x-internal:=true,
org.eclipse.wb.swt;version="4.4.1";x-internal:=true
Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.4.2";x-internal:=true,
org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.4.2";x-internal:=true,
org.eclipse.wb.swt;version="4.4.2";x-internal:=true
Automatic-Module-Name: org.eclipse.emf.cdo.examples.client.offline
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.examples.client.offline</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.4.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.clone;singleton:=true
Bundle-Version: 4.2.1.qualifier
Bundle-Version: 4.2.2.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Expand All @@ -17,6 +17,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.examples.company;bundle-version="[4.0.0,5.0.0)"
Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
Export-Package: org.eclipse.emf.cdo.examples.server.offline;version="4.2.1";x-internal:=true
Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.emf.cdo.examples.server.offline;version="4.2.2";x-internal:=true
Automatic-Module-Name: org.eclipse.emf.cdo.examples.clone
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.examples.clone</artifactId>
<version>4.2.1-SNAPSHOT</version>
<version>4.2.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.master;singleton:=true
Bundle-Version: 4.2.7.qualifier
Bundle-Version: 4.2.8.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Expand All @@ -14,5 +14,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)"
Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
Automatic-Module-Name: org.eclipse.emf.cdo.examples.master
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.examples.master</artifactId>
<version>4.2.7-SNAPSHOT</version>
<version>4.2.8-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.gastro.server.web;singleton:=true
Bundle-Version: 4.4.1.qualifier
Bundle-Version: 4.4.2.qualifier
Bundle-Activator: org.gastro.server.internal.web.OM$Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)",
Require-Bundle: org.apache.commons.commons-logging;bundle-version="[1.1.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.equinox.http.registry;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.http.servlet;bundle-version="[1.0.0,2.0.0)",
Expand All @@ -22,6 +22,6 @@ Import-Package: javax.servlet;version="[2.3.0,5.0.0)",
org.apache.commons.lang;version="[2.3.0,3.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Export-Package: org.gastro.server.internal.web;version="4.4.1";x-internal:=true,
templates;version="4.4.1";x-internal:=true
Export-Package: org.gastro.server.internal.web;version="4.4.2";x-internal:=true,
templates;version="4.4.2";x-internal:=true
Automatic-Module-Name: org.gastro.server.web
Loading

0 comments on commit b4d9082

Please sign in to comment.