Skip to content

Commit e841484

Browse files
committed
Add xcore-cli and xsd dependencies; remove XcoreCommand classes
1 parent 784abc2 commit e841484

6 files changed

Lines changed: 12 additions & 174 deletions

File tree

pom.xml

Lines changed: 10 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,16 @@
4343
<artifactId>jul-to-slf4j</artifactId>
4444
<version>2.0.17</version>
4545
</dependency>
46-
46+
<dependency>
47+
<groupId>org.nasdanika.core</groupId>
48+
<artifactId>xcore-cli</artifactId>
49+
<version>2026.2.0</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.nasdanika.core</groupId>
53+
<artifactId>xsd</artifactId>
54+
<version>2026.2.0</version>
55+
</dependency>
4756
<dependency>
4857
<groupId>org.nasdanika.models.app</groupId>
4958
<artifactId>cli</artifactId>
@@ -131,51 +140,6 @@
131140
<version>6.0.1</version>
132141
<scope>test</scope>
133142
</dependency>
134-
135-
136-
<!-- XCore dependencies -->
137-
<dependency>
138-
<groupId>org.nasdanika</groupId>
139-
<artifactId>xtext</artifactId>
140-
<classifier>jpms-ready</classifier>
141-
<version>2.42.0</version>
142-
</dependency>
143-
<dependency>
144-
<groupId>org.eclipse.emf</groupId>
145-
<artifactId>org.eclipse.emf.ecore.xcore</artifactId>
146-
<version>1.36.0</version>
147-
<exclusions>
148-
<exclusion>
149-
<groupId>org.eclipse.xtext</groupId>
150-
<artifactId>org.eclipse.xtext</artifactId>
151-
</exclusion>
152-
<exclusion>
153-
<groupId>org.eclipse.xtext</groupId>
154-
<artifactId>org.eclipse.xtext.util</artifactId>
155-
</exclusion>
156-
</exclusions>
157-
</dependency>
158-
<dependency>
159-
<groupId>org.eclipse.emf</groupId>
160-
<artifactId>org.eclipse.emf.ecore.xcore.lib</artifactId>
161-
<version>1.7.1</version>
162-
</dependency>
163-
<dependency>
164-
<groupId>org.apache.logging.log4j</groupId>
165-
<artifactId>log4j-api</artifactId>
166-
<version>2.25.4</version>
167-
</dependency>
168-
<dependency>
169-
<groupId>org.apache.logging.log4j</groupId>
170-
<artifactId>log4j-core</artifactId>
171-
<version>2.25.4</version>
172-
</dependency>
173-
174-
<dependency>
175-
<groupId>org.apache.logging.log4j</groupId>
176-
<artifactId>log4j-1.2-api</artifactId>
177-
<version>2.25.4</version>
178-
</dependency>
179143

180144
</dependencies>
181145

@@ -372,12 +336,4 @@
372336
</profile>
373337
</profiles>
374338

375-
<!-- For Xtext wrapper -->
376-
<repositories>
377-
<repository>
378-
<id>nasdanika-releases</id>
379-
<url>https://maven.nasdanika.org/releases</url>
380-
</repository>
381-
</repositories>
382-
383339
</project>

src/main/java/module-info.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import org.nasdanika.capability.CapabilityFactory;
2-
import org.nasdanika.launcher.XcoreCommandFactory;
3-
41
module org.nasdanika.launcher {
52

63
exports org.nasdanika.launcher;
@@ -14,14 +11,4 @@
1411
requires org.nasdanika.models.echarts.graph;
1512
requires java.sql;
1613

17-
// For XcoreCommand
18-
requires org.nasdanika.xtext;
19-
requires org.eclipse.emf.ecore.xcore;
20-
requires com.google.guice;
21-
requires org.eclipse.xtext.common.types;
22-
requires org.apache.log4j;
23-
24-
opens org.nasdanika.launcher to info.picocli, org.nasdanika.cli;
25-
26-
provides CapabilityFactory with XcoreCommandFactory;
2714
}

src/main/java/org/nasdanika/launcher/Launcher.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Collections;
55
import java.util.List;
66
import java.util.Objects;
7+
import java.util.concurrent.atomic.AtomicInteger;
78

89
import org.nasdanika.capability.CapabilityLoader;
910
import org.nasdanika.capability.CapabilityProvider;
@@ -57,7 +58,7 @@ public static void main(String[] args) {
5758

5859
// Sub-commands, sorting alphabetically
5960
List<CommandLine> rootCommands = new ArrayList<>();
60-
Requirement<SubCommandRequirement, CommandLine> subCommandRequirement = ServiceCapabilityFactory.createRequirement(CommandLine.class, null, new SubCommandRequirement(Collections.emptyList()));
61+
Requirement<SubCommandRequirement, CommandLine> subCommandRequirement = ServiceCapabilityFactory.createRequirement(CommandLine.class, null, new SubCommandRequirement(Collections.emptyList(), new AtomicInteger()));
6162
for (CapabilityProvider<Object> cp: capabilityLoader.load(subCommandRequirement, progressMonitor)) {
6263
cp.getPublisher().filter(Objects::nonNull).collectList().block().forEach(cmd -> rootCommands.add((CommandLine) cmd));
6364
}

src/main/java/org/nasdanika/launcher/ModuleVersionProvider.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/main/java/org/nasdanika/launcher/XcoreCommand.java

Lines changed: 0 additions & 74 deletions
This file was deleted.

src/main/java/org/nasdanika/launcher/XcoreCommandFactory.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)