Skip to content

First fixes for issues discovered during our move from CDO 4.7 to CDO 4.22 #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mPorhel wants to merge 13 commits into
base: master
Choose a base branch
from
Open

First fixes for issues discovered during our move from CDO 4.7 to CDO 4.22 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d2e10ad
Fix WebSocket transport #63
mPorhel Aug 14, 2024
1f0d52e
Fix org.eclipse.emf.cdo.net4j.CDONet4jViewProvider.getResourceURI #63
mPorhel Aug 14, 2024
a7d11f0
Stop owned WebSocket client on connection failure #25
mPorhel Mar 24, 2021
ca25d11
Avoid ":" in acceptor description when there is no port #25
mPorhel Mar 24, 2021
af98de9
Add a default acceptor name in WSAcceptorFactory #25
mPorhel Mar 24, 2021
75fb413
Add support for wss:// #25
mPorhel Jan 12, 2021
1e3d4e3
Handle proxy configuration and basic authentication #25
mPorhel Jan 12, 2021
682985e
Add support for cookies in WS/WSS Connectors #25
mPorhel Oct 19, 2023
60c406f
Add WSS tests suite #25
mPorhel May 10, 2021
50d7274
Disable some CDO menus when branching is not supported #65
lfasani Mar 24, 2021
fd97718
Unset IClassMapping variables #66
mPorhel Feb 22, 2024
4dbb761
Do not try to overlay/compose a null image #67
mPorhel Feb 22, 2024
414e2f1
Cleanup Net4J util/ui dependencies #68
mPorhel Mar 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 23 additions & 92 deletions features/org.eclipse.emf.cdo-feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,163 +37,94 @@

<plugin
id="org.eclipse.emf.cdo"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.edit"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.common"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.net4j"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.workspace"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.expressions"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.expressions.edit"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.security"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.security.edit"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.security.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.admin"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.ui.shared"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.ui.admin"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.ui.team"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.ui.jdt"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.transfer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.transfer.repository"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.transfer.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.transfer.workspace"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.transfer.workspace.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.explorer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.emf.cdo.explorer.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

</feature>
7 changes: 2 additions & 5 deletions features/org.eclipse.emf.cdo.doc-feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.doc"
label="%featureName"
version="4.3.11.qualifier"
version="4.3.12.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
Expand Down Expand Up @@ -40,9 +40,6 @@

<plugin
id="org.eclipse.emf.cdo.doc"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

</feature>
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.cdo.doc-feature/pom.xml
View file
Open in desktop
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.doc</artifactId>
<version>4.3.11-SNAPSHOT</version>
<version>4.3.12-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
7 changes: 2 additions & 5 deletions features/org.eclipse.emf.cdo.server.db-feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server.db"
label="%featureName"
version="4.13.1.qualifier"
version="4.13.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
Expand All @@ -36,9 +36,6 @@

<plugin
id="org.eclipse.emf.cdo.server.db"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

</feature>
2 changes: 1 addition & 1 deletion features/org.eclipse.emf.cdo.server.db-feature/pom.xml
View file
Open in desktop
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.db</artifactId>
<version>4.13.1-SNAPSHOT</version>
<version>4.13.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
4 changes: 2 additions & 2 deletions features/org.eclipse.net4j-feature/feature.xml
View file
Open in desktop
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.25.0.qualifier"
version="4.26.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
Expand All @@ -36,7 +36,7 @@
</url>

<includes
id="org.eclipse.net4j.util.ui"
id="org.eclipse.net4j.util"
version="0.0.0"/>

<plugin
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j-feature/pom.xml
View file
Open in desktop
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.25.0-SNAPSHOT</version>
<version>4.26.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
7 changes: 2 additions & 5 deletions features/org.eclipse.net4j.sdk-feature/feature.xml
View file
Open in desktop
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.27.0.qualifier"
version="4.27.1.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
Expand Down Expand Up @@ -65,9 +65,6 @@

<plugin
id="org.eclipse.net4j.sdk"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

</feature>
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.sdk-feature/pom.xml
View file
Open in desktop
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.27.0-SNAPSHOT</version>
<version>4.27.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
16 changes: 7 additions & 9 deletions features/org.eclipse.net4j.ui-feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.ui"
label="%featureName"
version="4.8.2.qualifier"
version="4.9.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
Expand All @@ -35,18 +35,16 @@
<discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
</url>

<includes
id="org.eclipse.net4j.util.ui"
version="0.0.0"/>

<plugin
id="org.eclipse.net4j.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.net4j.ui.shared"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

</feature>
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.ui-feature/pom.xml
View file
Open in desktop
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.ui</artifactId>
<version>4.8.2-SNAPSHOT</version>
<version>4.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
12 changes: 11 additions & 1 deletion features/org.eclipse.net4j.ws-feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.ws"
label="%featureName"
version="1.2.5.qualifier"
version="1.3.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
Expand All @@ -37,9 +37,19 @@

<plugin
id="org.eclipse.net4j.ws"
version="0.0.0"/>
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<requires>
<import plugin="org.apache.aries.spifly.dynamic.bundle" version="1.3.3" match="perfect"/>
<import plugin="org.objectweb.asm" version="9.1.0" match="perfect"/>
<import plugin="org.objectweb.asm.commons" version="9.1.0" match="perfect"/>
<import plugin="org.objectweb.asm.tree" version="9.1.0" match="perfect"/>
<import plugin="org.objectweb.asm.tree.analysis" version="9.1.0" match="perfect"/>
<import plugin="org.objectweb.asm.util" version="9.1.0" match="perfect"/>
</requires>

</feature>
2 changes: 1 addition & 1 deletion features/org.eclipse.net4j.ws-feature/pom.xml
View file
Open in desktop
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.ws</artifactId>
<version>1.2.5-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
Loading