Skip to content

Commit c2e83ba

Browse files
authored
build: update the Orbit repository (#1292)
1 parent 037a637 commit c2e83ba

File tree

51 files changed

+83
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+83
-95
lines changed

com.avaloq.tools.ddk.check.core.test/META-INF/MANIFEST.MF

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ Require-Bundle: com.avaloq.tools.ddk.check.core,
2525
org.eclipse.ui.workbench;resolution:=optional,
2626
org.eclipse.xtext.xbase,
2727
org.eclipse.xtext.xbase.lib,
28-
org.apache.logging.log4j,
29-
org.apache.commons.lang,
28+
org.apache.commons.lang3,
3029
org.eclipse.xtext.xbase.testing,
3130
junit-jupiter-api,
3231
junit-jupiter-engine,
@@ -36,5 +35,5 @@ Export-Package: com.avaloq.tools.ddk.check.core.test,
3635
com.avaloq.tools.ddk.check.core.test.util,
3736
com.avaloq.tools.ddk.check.test.core,
3837
com.avaloq.tools.ddk.check
39-
Import-Package: org.hamcrest.core
38+
Import-Package: org.hamcrest.core, org.apache.logging.log4j
4039
Automatic-Module-Name: com.avaloq.tools.ddk.check.core.test

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/AbstractCheckGenerationTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.List;
2222
import java.util.Set;
2323

24-
import org.apache.commons.lang.Validate;
24+
import org.apache.commons.lang3.Validate;
2525
import org.eclipse.emf.common.util.URI;
2626
import org.eclipse.emf.ecore.EObject;
2727
import org.eclipse.emf.ecore.resource.Resource;

com.avaloq.tools.ddk.check.core/META-INF/MANIFEST.MF

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ Require-Bundle: org.eclipse.xtext,
2525
org.eclipse.jface.text,
2626
org.eclipse.xtext.xbase.lib,
2727
com.avaloq.tools.ddk.xtext,
28-
org.apache.commons.lang,
28+
org.apache.commons.lang3,
29+
org.apache.commons.text,
2930
org.objectweb.asm;resolution:=optional
3031
Export-Package: com.avaloq.tools.ddk.check,
3132
com.avaloq.tools.ddk.check.check,
@@ -46,7 +47,6 @@ Export-Package: com.avaloq.tools.ddk.check,
4647
com.avaloq.tools.ddk.check.typing,
4748
com.avaloq.tools.ddk.check.util,
4849
com.avaloq.tools.ddk.check.validation
49-
Import-Package: org.apache.logging.log4j,
50-
org.eclipse.jdt.internal.ui.text,
51-
org.apache.log4j
50+
Import-Package: org.eclipse.jdt.internal.ui.text,
51+
org.apache.logging.log4j
5252
Automatic-Module-Name: com.avaloq.tools.ddk.check.core

com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/jvmmodel/CheckJvmModelInferrer.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder
6666
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1
6767

6868
import static extension com.avaloq.tools.ddk.check.generator.CheckGeneratorExtensions.*
69-
import static extension org.apache.commons.lang.StringEscapeUtils.escapeJava
69+
import static extension org.apache.commons.text.StringEscapeUtils.escapeJava
7070

7171
/**
7272
* <p>Infers a JVM model from the source model.</p>

com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/util/CheckUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*******************************************************************************/
1111
package com.avaloq.tools.ddk.check.util;
1212

13-
import org.apache.commons.lang.StringUtils;
14-
import org.apache.commons.lang.WordUtils;
13+
import org.apache.commons.lang3.StringUtils;
14+
import org.apache.commons.text.WordUtils;
1515

1616
import com.avaloq.tools.ddk.check.runtime.registry.ICheckValidatorStandaloneSetup;
1717

@@ -69,6 +69,6 @@ public static String serviceRegistryClassName() {
6969
* @return the issue code name for the given issue name.
7070
*/
7171
public static String toIssueCodeName(final String issueName) {
72-
return StringUtils.remove(WordUtils.capitalizeFully(issueName, new char[] {'_'}), '_');
72+
return StringUtils.remove(WordUtils.capitalizeFully(issueName, '_'), '_');
7373
}
7474
}

com.avaloq.tools.ddk.check.ide/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ Require-Bundle: com.avaloq.tools.ddk.check.core,
1616
org.eclipse.xtext.xbase.ide
1717
Export-Package: com.avaloq.tools.ddk.check.ide.contentassist.antlr,
1818
com.avaloq.tools.ddk.check.ide.contentassist.antlr.internal
19-
Import-Package: org.apache.log4j,
20-
org.apache.logging.log4j
19+
Import-Package: org.apache.logging.log4j
2120
Automatic-Module-Name: com.avaloq.tools.ddk.check.ide

com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.resources,
99
org.eclipse.core.runtime,
1010
org.eclipse.xtext,
1111
org.eclipse.xtext.xbase.lib,
12-
org.apache.commons.lang,
12+
org.apache.commons.lang3,
1313
com.avaloq.tools.ddk.xtext,
1414
com.avaloq.tools.ddk
1515
Export-Package: com.avaloq.tools.ddk.check.runtime,

com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/label/CheckRuleLabelProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.concurrent.atomic.AtomicReference;
2222
import java.util.stream.Stream;
2323

24-
import org.apache.commons.lang.StringUtils;
24+
import org.apache.commons.lang3.Strings;
2525
import org.apache.logging.log4j.LogManager;
2626
import org.apache.logging.log4j.Logger;
2727

@@ -51,7 +51,7 @@ public class CheckRuleLabelProvider implements ICheckRuleLabelProvider {
5151
public String getLabel(final String issueCode) {
5252

5353
// Is this a Check?
54-
if (!StringUtils.contains(issueCode, CHECK_ISSUE_CODE_SUBSTRING)) {
54+
if (!Strings.CS.contains(issueCode, CHECK_ISSUE_CODE_SUBSTRING)) {
5555
return null;
5656
}
5757

com.avaloq.tools.ddk.check.test.runtime.ui/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ Require-Bundle: com.avaloq.tools.ddk.check.test.runtime;visibility:=reexport,
1616
org.eclipse.xtext.common.types.ui,
1717
org.eclipse.xtext.ui.codetemplates.ui,
1818
org.eclipse.compare,
19-
com.avaloq.tools.ddk.check.runtime.core,
20-
org.apache.log4j
19+
com.avaloq.tools.ddk.check.runtime.core
2120
Import-Package: org.apache.commons.logging,
2221
org.apache.log4j
2322
Bundle-RequiredExecutionEnvironment: JavaSE-21

com.avaloq.tools.ddk.check.test.runtime/META-INF/MANIFEST.MF

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
2424
com.avaloq.tools.ddk.check.lib,
2525
com.avaloq.tools.ddk.check.core,
2626
org.eclipse.xtext.xbase.lib
27-
Import-Package: org.apache.log4j,
28-
org.apache.logging.log4j,
29-
org.eclipse.xtext.xbase.lib
27+
Import-Package: org.eclipse.xtext.xbase.lib, org.apache.logging.log4j
3028
Bundle-RequiredExecutionEnvironment: JavaSE-21
3129
Export-Package: com.avaloq.tools.ddk.check,
3230
com.avaloq.tools.ddk.check.formatting,

0 commit comments

Comments
 (0)