Commit ba37b667 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ refined cleaning, removed customisations, -Djava-21 fixes the issues

parent 8e655f64
Loading
Loading
Loading
Loading
+72 −34
Original line number Diff line number Diff line
@@ -43,44 +43,10 @@
					</dependency>
				</dependencies>
			</plugin>
            <!-- customization to address issues with xtend build, review and refine -->
			<plugin>
				<groupId>org.eclipse.tycho</groupId>
				<artifactId>tycho-compiler-plugin</artifactId>
				<configuration>
					<includes>
						<!--						
						<include>**/*</include>
						-->
						<include>src-gen/</include>
					</includes>
				</configuration>
                <executions>
                    <execution>
                        <id>compile-generated</id>
                        <phase>generate-sources</phase>
                        <goals>
                            <goal>compile</goal>
                        </goals>
                    </execution>
                    <execution>
                        <id>compile-xtend</id>
                        <phase>process-sources</phase>
                        <goals>
	                        <goal>compile</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>

			<plugin>
				<groupId>org.eclipse.xtend</groupId>
				<artifactId>xtend-maven-plugin</artifactId>
				<configuration>
					<skipXtend>true</skipXtend>
				</configuration>
			</plugin>
			<!-- end of customisations -->
	
			<plugin>
				<groupId>org.apache.maven.plugins</groupId>
@@ -92,36 +58,108 @@
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/../de.ugoe.cs.swe.TTCN3/xtend-gen/</directory>
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/../de.ugoe.cs.swe.TTCN3.tests/src-gen/</directory>
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/../de.ugoe.cs.swe.TTCN3.tests/xtend-gen/</directory>
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/../de.ugoe.cs.swe.TTCN3.ide/src-gen/</directory>
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/../de.ugoe.cs.swe.TTCN3.ide/xtend-gen/</directory>
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/../de.ugoe.cs.swe.TTCN3.ui/src-gen/</directory>
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/../de.ugoe.cs.swe.TTCN3.ui/xtend-gen/</directory>
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/../de.ugoe.cs.swe.TTCN3.ui.tests/src-gen/</directory>
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/../de.ugoe.cs.swe.TTCN3.ui.tests/xtend-gen/</directory>
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/../de.ugoe.cs.swe.TTCN3.web/src-gen/</directory>
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/../de.ugoe.cs.swe.TTCN3.web/xtend-gen/</directory>
							<includes>
								<include>**/*</include>
							</includes>
							<excludes>
								<exclude>.gitignore</exclude>
							</excludes>
						</fileset>
						<fileset>
							<directory>${basedir}/model/generated/</directory>