From eb1619419ca638e10f78ccba3351e68d082b3ef2 Mon Sep 17 00:00:00 2001
From: "Bernhard J. Berger" <bernhard.berger@uni-bremen.de>
Date: Wed, 23 Nov 2022 07:07:59 +0100
Subject: [PATCH] Towards a proper plugin structure while building stuff.
---
src/core/de.evoal.core.plugin/pom.xml | 13 +--
src/core/de.evoal.core/pom.xml | 70 +++++++++++----
src/core/de.evoal.generator.main/pom.xml | 36 --------
src/core/de.evoal.releng.parent/pom.xml | 108 +++++++++++++++++++++++
4 files changed, 164 insertions(+), 63 deletions(-)
diff --git a/src/core/de.evoal.core.plugin/pom.xml b/src/core/de.evoal.core.plugin/pom.xml
index bbe8677c..b715eda0 100644
--- a/src/core/de.evoal.core.plugin/pom.xml
+++ b/src/core/de.evoal.core.plugin/pom.xml
@@ -186,7 +186,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/${project.artifactId}-dependencies</outputDirectory>
+ <outputDirectory>${project.build.directory}/${project.artifactId}</outputDirectory>
<includeScope>runtime</includeScope>
<excludeScope>provided</excludeScope>
<excludeTransitive>true</excludeTransitive>
@@ -194,21 +194,14 @@
</execution>
</executions>
</plugin>
-<!--
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>${project.artifactId}-dependencies/</classpathPrefix>
- </manifest>
- </archive>
+ <outputDirectory>${project.build.directory}/${project.artifactId}</outputDirectory>
</configuration>
</plugin>
--->
</plugins>
<pluginManagement>
diff --git a/src/core/de.evoal.core/pom.xml b/src/core/de.evoal.core/pom.xml
index 60776c15..e80c8343 100644
--- a/src/core/de.evoal.core/pom.xml
+++ b/src/core/de.evoal.core/pom.xml
@@ -22,11 +22,19 @@
</properties>
<dependencies>
+ <!-- Prevent me from typing -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
<!-- Weld for CDI (@runtime) -->
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<version>${weld.version}</version>
+ <scope>compile</scope>
</dependency>
<!-- Jandex results in a NPE at the moment -->
@@ -50,18 +58,21 @@
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-api</artifactId>
<version>${deltaspike.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>deltaspike-cdictrl-api</artifactId>
<version>${deltaspike.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>deltaspike-cdictrl-weld</artifactId>
<version>${deltaspike.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -73,16 +84,22 @@
<!-- Include dependencies of parent -->
<!-- CDI APIs -->
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <scope>runtime</scope>
+ <scope>compile</scope>
</dependency>
<!-- JSON API -->
@@ -90,6 +107,7 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
+ <scope>compile</scope>
</dependency>
<!-- Logging API -->
@@ -104,6 +122,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.8</version>
+ <scope>compile</scope>
</dependency>
@@ -112,36 +131,42 @@
<groupId>de.evoal.languages</groupId>
<artifactId>de.evoal.languages.model.ddl</artifactId>
<version>${evoal.languages.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>de.evoal.languages</groupId>
<artifactId>de.evoal.languages.model.dl</artifactId>
<version>${evoal.languages.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>de.evoal.languages</groupId>
<artifactId>de.evoal.languages.model.eal</artifactId>
<version>${evoal.languages.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>de.evoal.languages</groupId>
<artifactId>de.evoal.languages.model.el</artifactId>
<version>${evoal.languages.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>de.evoal.languages</groupId>
<artifactId>de.evoal.languages.model.instance</artifactId>
<version>${evoal.languages.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>de.evoal.languages</groupId>
<artifactId>de.evoal.languages.model.mll</artifactId>
<version>${evoal.languages.version}</version>
+ <scope>compile</scope>
</dependency>
<!-- dependencies to DSLs -->
@@ -156,18 +181,21 @@
<groupId>de.evoal.languages</groupId>
<artifactId>de.evoal.languages.model.dl.dsl</artifactId>
<version>${evoal.languages.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>de.evoal.languages</groupId>
<artifactId>de.evoal.languages.model.eal.dsl</artifactId>
<version>${evoal.languages.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>de.evoal.languages</groupId>
<artifactId>de.evoal.languages.model.el.dsl</artifactId>
<version>${evoal.languages.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -207,6 +235,7 @@
<groupId>io.jenetics</groupId>
<artifactId>jenetics.ext</artifactId>
<version>${jenetics.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -222,36 +251,24 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.haifengl</groupId>
<artifactId>smile-math</artifactId>
<version>${smile.version}</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/modules</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
+<!-- <configuration>
<archive>
<manifest>
<mainClass>de.evoal.core.main.Evoal</mainClass>
@@ -260,6 +277,25 @@
</manifest>
</archive>
</configuration>
+--> </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${project.artifactId}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeScope>test</excludeScope>
+ <excludeScope>system</excludeScope>
+ <excludeTransitive>false</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
diff --git a/src/core/de.evoal.generator.main/pom.xml b/src/core/de.evoal.generator.main/pom.xml
index d1526451..61a872ad 100644
--- a/src/core/de.evoal.generator.main/pom.xml
+++ b/src/core/de.evoal.generator.main/pom.xml
@@ -99,40 +99,4 @@
<version>${evoal.languages.version}</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/${project.artifactId}-dependencies</outputDirectory>
- <includeScope>runtime</includeScope>
- <excludeScope>provided</excludeScope>
- <excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>${project.artifactId}-dependencies/</classpathPrefix>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/src/core/de.evoal.releng.parent/pom.xml b/src/core/de.evoal.releng.parent/pom.xml
index 8fc9d906..57870ba1 100644
--- a/src/core/de.evoal.releng.parent/pom.xml
+++ b/src/core/de.evoal.releng.parent/pom.xml
@@ -147,6 +147,93 @@
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
+
+
+ <!-- dependencies to language models -->
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.ddl</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.dl</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.eal</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.el</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.instance</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.mll</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- dependencies to DSLs -->
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.ddl.dsl</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.dl.dsl</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.eal.dsl</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.el.dsl</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.instance.dsl</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>de.evoal.languages</groupId>
+ <artifactId>de.evoal.languages.model.mll.dsl</artifactId>
+ <version>${evoal.languages.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -156,6 +243,27 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${project.artifactId}</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${project.artifactId}</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeScope>provided</excludeScope>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
--
GitLab