Merge pull request 'add classpath resource #25106, change groovy-mavn and javadoc plugin configurations #25108' (!22) from feature/25106 into master

Reviewed-on: #22
This commit is contained in:
Roberto Cirillo 2023-05-12 14:32:01 +02:00
commit 113972a821
1 changed files with 24 additions and 4 deletions

26
pom.xml
View File

@ -78,6 +78,19 @@
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
<profile>
<id>set-local-classpath</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<build>
<resources>
<resource>
<directory>${maven.local.classpath}</directory>
</resource>
</resources>
</build>
</profile>
<profile>
<id>generate-distribution-packages</id>
<activation>
@ -1476,13 +1489,12 @@
<goal>jar</goal>
</goals>
<configuration>
<source>${java_version}</source>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
@ -1508,8 +1520,15 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>3.0.0-beta-3</version>
<type>pom</type>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
@ -1537,6 +1556,7 @@
<java.expected.vm>.*OpenJDK.*</java.expected.vm>
<maven.compiler.source>${java_version}</maven.compiler.source>
<maven.compiler.target>${java_version}</maven.compiler.target>
<maven.local.classpath>/opt/gcube/local-classpath</maven.local.classpath>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.version>3.3.9</maven.version>