This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 780101235d7 kie-issues#1253: Configure -sources.jar for Maven-based
packages on `kie-tools` (#2359)
780101235d7 is described below
commit 780101235d79a4374908fa91e2c0bd34dda0e28f
Author: Pere Fernández <[email protected]>
AuthorDate: Thu May 23 19:55:40 2024 +0200
kie-issues#1253: Configure -sources.jar for Maven-based packages on
`kie-tools` (#2359)
Co-authored-by: Yeser Amer <[email protected]>
---
packages/dashbuilder/pom.xml | 2 --
packages/maven-base/pom.xml | 18 ++++++++++++++++++
.../kie-wb-common-stunner-lienzo/pom.xml | 15 ---------------
.../kie-wb-common-stunner/pom.xml | 6 ------
packages/serverless-workflow-diagram-editor/pom.xml | 2 +-
.../third_party/errai/pom.xml | 15 ---------------
.../third_party/gwtbootstrap3/core/pom.xml | 15 ---------------
.../third_party/gwtbootstrap3/extras/pom.xml | 15 ---------------
.../third_party/gwtproject/pom.xml | 15 ---------------
packages/stunner-editors/errai-cdi/pom.xml | 19 -------------------
packages/stunner-editors/errai-reflections/pom.xml | 11 -----------
.../stunner-editors/kie-wb-common-stunner/pom.xml | 6 ------
packages/stunner-editors/pom.xml | 2 +-
.../pom.xml | 8 ++++++++
packages/yard-model/pom.xml | 12 ------------
15 files changed, 28 insertions(+), 133 deletions(-)
diff --git a/packages/dashbuilder/pom.xml b/packages/dashbuilder/pom.xml
index be3b130e569..03ebe329489 100644
--- a/packages/dashbuilder/pom.xml
+++ b/packages/dashbuilder/pom.xml
@@ -99,7 +99,6 @@
<version.org.javassist>3.26.0-GA</version.org.javassist>
<!-- Plugins -->
- <version.source.plugin>3.1.0</version.source.plugin>
<version.jar.plugin>3.1.2</version.jar.plugin>
<version.org.apache.maven.plugins.dependency>3.3.0</version.org.apache.maven.plugins.dependency>
<version.surefire.plugin>2.22.2</version.surefire.plugin>
@@ -569,7 +568,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>${version.source.plugin}</version>
<executions>
<execution>
<id>attach-sources</id>
diff --git a/packages/maven-base/pom.xml b/packages/maven-base/pom.xml
index 0002e804396..ff4d15359f4 100644
--- a/packages/maven-base/pom.xml
+++ b/packages/maven-base/pom.xml
@@ -193,6 +193,24 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>attach-test-sources</id>
+ <goals>
+ <goal>test-jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git
a/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml
b/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml
index b78d650a040..ce97b645efb 100644
---
a/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml
+++
b/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml
@@ -165,21 +165,6 @@
<directory>src/main/resources</directory>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
</project>
diff --git
a/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/pom.xml
b/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/pom.xml
index a2132c8451b..b0df6aae8ee 100644
--- a/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/pom.xml
+++ b/packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/pom.xml
@@ -198,12 +198,6 @@
<artifactId>maven-jar-plugin</artifactId>
</plugin>
- <plugin>
- <!-- Entry needed to create, install and deploy sources jars -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/packages/serverless-workflow-diagram-editor/pom.xml
b/packages/serverless-workflow-diagram-editor/pom.xml
index dcf7da5c236..479473fe8a8 100644
--- a/packages/serverless-workflow-diagram-editor/pom.xml
+++ b/packages/serverless-workflow-diagram-editor/pom.xml
@@ -239,7 +239,7 @@
<version.site.plugin>3.7.1</version.site.plugin>
<version.spotbugs-maven-plugin>3.1.8</version.spotbugs-maven-plugin>
<version.sonar.plugin>3.9.1.2184</version.sonar.plugin>
- <version.source.plugin>3.0.1</version.source.plugin>
+ <version.source.plugin>3.3.1</version.source.plugin>
<version.surefire.plugin>3.2.5</version.surefire.plugin>
<version.war.plugin>3.2.2</version.war.plugin>
<version.zanata.plugin>2.3.0</version.zanata.plugin>
diff --git
a/packages/serverless-workflow-diagram-editor/third_party/errai/pom.xml
b/packages/serverless-workflow-diagram-editor/third_party/errai/pom.xml
index 69f80f2cbde..260bba3a895 100644
--- a/packages/serverless-workflow-diagram-editor/third_party/errai/pom.xml
+++ b/packages/serverless-workflow-diagram-editor/third_party/errai/pom.xml
@@ -53,20 +53,5 @@
<directory>src/main/resources</directory>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
</project>
diff --git
a/packages/serverless-workflow-diagram-editor/third_party/gwtbootstrap3/core/pom.xml
b/packages/serverless-workflow-diagram-editor/third_party/gwtbootstrap3/core/pom.xml
index ec6f5b54ae0..7aa7a59b6d8 100644
---
a/packages/serverless-workflow-diagram-editor/third_party/gwtbootstrap3/core/pom.xml
+++
b/packages/serverless-workflow-diagram-editor/third_party/gwtbootstrap3/core/pom.xml
@@ -79,21 +79,6 @@
<directory>src/main/resources</directory>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
</project>
diff --git
a/packages/serverless-workflow-diagram-editor/third_party/gwtbootstrap3/extras/pom.xml
b/packages/serverless-workflow-diagram-editor/third_party/gwtbootstrap3/extras/pom.xml
index 277279d9dec..1156deac6c0 100644
---
a/packages/serverless-workflow-diagram-editor/third_party/gwtbootstrap3/extras/pom.xml
+++
b/packages/serverless-workflow-diagram-editor/third_party/gwtbootstrap3/extras/pom.xml
@@ -75,21 +75,6 @@
<directory>src/main/resources</directory>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
</project>
diff --git
a/packages/serverless-workflow-diagram-editor/third_party/gwtproject/pom.xml
b/packages/serverless-workflow-diagram-editor/third_party/gwtproject/pom.xml
index 64bbed81315..5e3fe15d166 100644
--- a/packages/serverless-workflow-diagram-editor/third_party/gwtproject/pom.xml
+++ b/packages/serverless-workflow-diagram-editor/third_party/gwtproject/pom.xml
@@ -62,20 +62,5 @@
<directory>src/main/resources</directory>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
</project>
diff --git a/packages/stunner-editors/errai-cdi/pom.xml
b/packages/stunner-editors/errai-cdi/pom.xml
index 617d0718b78..e76b2be3967 100644
--- a/packages/stunner-editors/errai-cdi/pom.xml
+++ b/packages/stunner-editors/errai-cdi/pom.xml
@@ -82,25 +82,6 @@
<module>errai-cdi-shared</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>target/classes</outputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>integration-test</id>
diff --git a/packages/stunner-editors/errai-reflections/pom.xml
b/packages/stunner-editors/errai-reflections/pom.xml
index 84046867435..eec365931fd 100644
--- a/packages/stunner-editors/errai-reflections/pom.xml
+++ b/packages/stunner-editors/errai-reflections/pom.xml
@@ -89,17 +89,6 @@
<encoding>UTF-8</encoding>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/packages/stunner-editors/kie-wb-common-stunner/pom.xml
b/packages/stunner-editors/kie-wb-common-stunner/pom.xml
index 5cf2c3f3f9d..56770e5e075 100644
--- a/packages/stunner-editors/kie-wb-common-stunner/pom.xml
+++ b/packages/stunner-editors/kie-wb-common-stunner/pom.xml
@@ -199,12 +199,6 @@
<artifactId>maven-jar-plugin</artifactId>
</plugin>
- <plugin>
- <!-- Entry needed to create, install and deploy sources jars -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml
index 5a9fc04d31b..e397a3302bb 100644
--- a/packages/stunner-editors/pom.xml
+++ b/packages/stunner-editors/pom.xml
@@ -316,7 +316,7 @@
<version.site.plugin>3.7.1</version.site.plugin>
<version.spotbugs-maven-plugin>3.1.8</version.spotbugs-maven-plugin>
<version.sonar.plugin>3.9.1.2184</version.sonar.plugin>
- <version.source.plugin>3.0.1</version.source.plugin>
+ <version.source.plugin>3.3.1</version.source.plugin>
<version.surefire.plugin>3.2.5</version.surefire.plugin>
<version.war.plugin>3.2.2</version.war.plugin>
<version.zanata.plugin>2.3.0</version.zanata.plugin>
diff --git a/packages/vscode-java-code-completion-extension-plugin/pom.xml
b/packages/vscode-java-code-completion-extension-plugin/pom.xml
index f5e4725710e..7797929f1bb 100644
--- a/packages/vscode-java-code-completion-extension-plugin/pom.xml
+++ b/packages/vscode-java-code-completion-extension-plugin/pom.xml
@@ -153,6 +153,14 @@
<forkedProcessTimeoutInSeconds>60</forkedProcessTimeoutInSeconds>
</configuration>
</plugin>
+ <!-- Do not generate a source jar - It conflicts with
tycho-source-plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <skipSource>true</skipSource>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/packages/yard-model/pom.xml b/packages/yard-model/pom.xml
index d9f074fabcb..3cf66caaca3 100644
--- a/packages/yard-model/pom.xml
+++ b/packages/yard-model/pom.xml
@@ -83,18 +83,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
