Skip to content

Commit b52bf27

Browse files
committed
upgrade to Eclipse 4.35 (2025-03)
- resolve all .bndruns - fixed some compilation problems because of stuff which was removed from Eclipse 4.35 Signed-off-by: Christoph Rueger <chrisrueger@gmail.com>
1 parent 625b005 commit b52bf27

8 files changed

+538
-618
lines changed

bndtools.core/bndtools.cocoa.macosx.aarch64.bndrun

Lines changed: 134 additions & 148 deletions
Large diffs are not rendered by default.

bndtools.core/bndtools.cocoa.macosx.x86_64.bndrun

Lines changed: 134 additions & 148 deletions
Large diffs are not rendered by default.

bndtools.core/bndtools.gtk.linux.x86_64.bndrun

Lines changed: 133 additions & 147 deletions
Large diffs are not rendered by default.

bndtools.core/bndtools.shared.bndrun

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@
115115
bnd.identity;id='org.apache.felix.scr';version='[0,2.1.16)',\
116116
bnd.identity;id='osgi.*',\
117117
bnd.identity;id='org.osgi.*.annotations',\
118-
bnd.identity;id='biz.aQute.bndlib';version='[7.0.0,7.0.1)'
118+
bnd.identity;id='biz.aQute.bndlib';version='[7.0.0,7.2.0)',\
119+
bnd.identity;id='aQute.libg';version='[7.0.0,7.2.0)'
119120

120121

121122
-runee: JavaSE-21

bndtools.core/bndtools.win32.x86_64.bndrun

Lines changed: 133 additions & 147 deletions
Large diffs are not rendered by default.

bndtools.core/src/org/bndtools/core/ui/wizards/ds/NewTypeWizardPage.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.eclipse.jdt.core.dom.CompilationUnit;
4646
import org.eclipse.jdt.core.dom.ITypeBinding;
4747
import org.eclipse.jdt.core.dom.ImportDeclaration;
48-
import org.eclipse.jdt.core.dom.ParameterizedType;
4948
import org.eclipse.jdt.core.dom.Type;
5049
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
5150
import org.eclipse.jdt.core.formatter.CodeFormatter;
@@ -1421,12 +1420,6 @@ protected IStatus containerChanged() {
14211420
IJavaProject project = root.getJavaProject();
14221421

14231422
if ((fTypeKind == ANNOTATION_TYPE || fTypeKind == ENUM_TYPE) && !status.matches(IStatus.ERROR)) {
1424-
if (!JavaModelUtil.is50OrHigher(project)) {
1425-
// error as createType will fail otherwise (bug 96928)
1426-
return new StatusInfo(IStatus.ERROR,
1427-
Messages.format(NewWizardMessages.NewTypeWizardPage_warning_NotJDKCompliant,
1428-
BasicElementLabels.getJavaElementName(project.getElementName())));
1429-
}
14301423
if (fTypeKind == ENUM_TYPE) {
14311424
try {
14321425
// if findType(...) == null then Enum is unavailable
@@ -1716,10 +1709,6 @@ protected IStatus typeNameChanged() {
17161709
}
17171710

17181711
if (!typeNameWithParameters.equals(typeName) && project != null) {
1719-
if (!JavaModelUtil.is50OrHigher(project)) {
1720-
status.setError(NewWizardMessages.NewTypeWizardPage_error_TypeParameters);
1721-
return status;
1722-
}
17231712
String typeDeclaration = "class " + typeNameWithParameters + " {}"; //$NON-NLS-1$//$NON-NLS-2$
17241713
ASTParser parser = ASTParser.newParser(IASTSharedValues.SHARED_AST_LEVEL);
17251714
parser.setSource(typeDeclaration.toCharArray());
@@ -1764,10 +1753,6 @@ protected IStatus superClassChanged() {
17641753
status.setError(NewWizardMessages.NewTypeWizardPage_error_InvalidSuperClassName);
17651754
return status;
17661755
}
1767-
if (type instanceof ParameterizedType && !JavaModelUtil.is50OrHigher(root.getJavaProject())) {
1768-
status.setError(NewWizardMessages.NewTypeWizardPage_error_SuperClassNotParameterized);
1769-
return status;
1770-
}
17711756
} else {
17721757
status.setError(""); //$NON-NLS-1$
17731758
}
@@ -1815,12 +1800,6 @@ protected IStatus superInterfacesChanged() {
18151800
BasicElementLabels.getJavaElementName(intfname)));
18161801
return status;
18171802
}
1818-
if (type instanceof ParameterizedType && !JavaModelUtil.is50OrHigher(root.getJavaProject())) {
1819-
status.setError(
1820-
Messages.format(NewWizardMessages.NewTypeWizardPage_error_SuperInterfaceNotParameterized,
1821-
BasicElementLabels.getJavaElementName(intfname)));
1822-
return status;
1823-
}
18241803
}
18251804
}
18261805
return status;

bndtools.core/src/org/bndtools/core/ui/wizards/ds/SuperInterfaceSelectionDialog.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.eclipse.jdt.core.search.SearchEngine;
1515
import org.eclipse.jdt.core.search.TypeNameMatch;
1616
import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
17-
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
1817
import org.eclipse.jdt.internal.corext.util.Messages;
1918
import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
2019
import org.eclipse.jdt.internal.ui.JavaPlugin;
@@ -229,9 +228,6 @@ protected void configureShell(Shell newShell) {
229228

230229
public static String getNameWithTypeParameters(IType type) {
231230
String superName = type.getFullyQualifiedName('.');
232-
if (!JavaModelUtil.is50OrHigher(type.getJavaProject())) {
233-
return superName;
234-
}
235231
try {
236232
ITypeParameter[] typeParameters = type.getTypeParameters();
237233
if (typeParameters.length > 0) {

cnf/ext/repositories.bnd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ ossrh: https://oss.sonatype.org/content/repositories/snapshots
2929

3030
-plugin.1.Eclipse:\
3131
aQute.bnd.repository.p2.provider.P2Repository; \
32-
url = https://download.eclipse.org/releases/2024-12/; \
33-
name = "Eclipse 4.34 (2024-12)"
32+
url = https://download.eclipse.org/releases/2025-03/; \
33+
name = "Eclipse 4.35 (2025-03)"
3434

3535
-plugin.9.Baseline:\
3636
aQute.bnd.repository.maven.provider.MavenBndRepository;\

0 commit comments

Comments
 (0)