Skip to content
This repository was archived by the owner on Oct 21, 2025. It is now read-only.

Commit 5c89bd6

Browse files
01Parzival1001Parzival10
committed
Merge Fix branch
2 parents af1473a + a660d8d commit 5c89bd6

3 files changed

Lines changed: 51 additions & 59 deletions

File tree

‎bundles/org.dataflowanalysis.standalone/Standalone.product‎

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

‎pom.xml‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<packaging>pom</packaging>
88

99
<properties>
10-
<tycho.version>4.0.9</tycho.version>
10+
<tycho.version>2.7.5</tycho.version>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
</properties>
1313

@@ -22,6 +22,7 @@
2222
<artifactId>jakarta.websocket-api</artifactId>
2323
<version>2.1.0</version>
2424
</dependency>
25+
2526
</dependencies>
2627

2728
<build>
@@ -35,6 +36,25 @@
3536
</plugins>
3637
</pluginManagement>
3738
<plugins>
39+
<plugin>
40+
<groupId>org.eclipse.tycho</groupId>
41+
<artifactId>tycho-source-plugin</artifactId>
42+
<version>${tycho.version}</version>
43+
<executions>
44+
<execution>
45+
<id>plugin-source</id>
46+
<goals>
47+
<goal>plugin-source</goal>
48+
</goals>
49+
</execution>
50+
<execution>
51+
<id>feature-source</id>
52+
<goals>
53+
<goal>feature-source</goal>
54+
</goals>
55+
</execution>
56+
</executions>
57+
</plugin>
3858
<plugin>
3959
<groupId>org.eclipse.tycho</groupId>
4060
<artifactId>tycho-maven-plugin</artifactId>
@@ -85,25 +105,6 @@
85105
</environments>
86106
</configuration>
87107
</plugin>
88-
<plugin>
89-
<groupId>org.eclipse.tycho</groupId>
90-
<artifactId>tycho-source-plugin</artifactId>
91-
<version>${tycho.version}</version>
92-
<executions>
93-
<execution>
94-
<id>plugin-source</id>
95-
<goals>
96-
<goal>plugin-source</goal>
97-
</goals>
98-
</execution>
99-
<execution>
100-
<id>feature-source</id>
101-
<goals>
102-
<goal>feature-source</goal>
103-
</goals>
104-
</execution>
105-
</executions>
106-
</plugin>
107108
<plugin>
108109
<groupId>org.eclipse.tycho</groupId>
109110
<artifactId>tycho-p2-plugin</artifactId>
@@ -134,30 +135,30 @@
134135
</execution>
135136
</executions>
136137
</plugin>
137-
<plugin>
138-
<groupId>com.diffplug.spotless</groupId>
139-
<artifactId>spotless-maven-plugin</artifactId>
140-
<version>2.43.0</version>
141-
<configuration>
142-
<java>
143-
<includes>
144-
<include>bundles/**/*.java</include>
145-
<include>tests/**/*.java</include>
146-
</includes>
147-
<eclipse>
148-
<file>${maven.multiModuleProjectDirectory}/formatter.xml</file>
149-
</eclipse>
150-
<importOrder/>
151-
<removeUnusedImports/>
152-
</java>
153-
</configuration>
154-
</plugin>
138+
<plugin>
139+
<groupId>com.diffplug.spotless</groupId>
140+
<artifactId>spotless-maven-plugin</artifactId>
141+
<version>2.43.0</version>
142+
<configuration>
143+
<java>
144+
<includes>
145+
<include>bundles/**/*.java</include>
146+
<include>tests/**/*.java</include>
147+
</includes>
148+
<eclipse>
149+
<file>${maven.multiModuleProjectDirectory}/formatter.xml</file>
150+
</eclipse>
151+
<importOrder/>
152+
<removeUnusedImports/>
153+
</java>
154+
</configuration>
155+
</plugin>
155156
</plugins>
156157
</build>
157158

158159
<modules>
159160
<module>releng</module>
160161
<module>bundles</module>
161-
<module>features</module>
162+
<module>features</module>
162163
</modules>
163164
</project>

‎product/org.datadlownalysis.standalone.product/.project‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.dataflowanalysis.standalone.product</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
</buildSpec>
9+
<natures>
10+
</natures>
11+
</projectDescription>

0 commit comments

Comments
 (0)