Compare commits

..

No commits in common. "master" and "feature/25414" have entirely different histories.

2 changed files with 7 additions and 15 deletions

View File

@ -1,10 +1,6 @@
# Changelog for Maven-Parent
## [v1.2.0] - 2024-04-03
### Bug
* update maven-javadoc-plugin to from 2.6.8 to 3.6.3. #25877
* update groovy-all plugin dependency from 3.0.0-beta to 3.0.13 #25872
## [v1.2.0] - 2023-05-12
### Features
* new maven profiles for managing jdk7 (gcore-legacy) and jdk17 build (see #24259)
@ -12,9 +8,6 @@
* update groovy-maven and javadoc plugin configuration #25108
* add classpath external folder. see #25106
### Bug
* removed set-local-classpath profile. see #26841
## [v1.1.0] - 2022-10-27
### Features

13
pom.xml
View File

@ -78,8 +78,7 @@
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
<!--profile set-local-classpath commented see #26841-->
<!--profile>
<profile>
<id>set-local-classpath</id>
<activation>
<jdk>[1.8,)</jdk>
@ -91,7 +90,7 @@
</resource>
</resources>
</build>
</profile-->
</profile>
<profile>
<id>generate-distribution-packages</id>
<activation>
@ -364,6 +363,7 @@
<name>!Release</name>
</property>
</activation>
<!-- Repositories for dependency resolution -->
<repositories>
<repository>
@ -1524,8 +1524,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>3.0.13</version>
<!--version>3.0.0-beta-3</version-->
<version>3.0.0-beta-3</version>
<type>pom</type>
</dependency>
</dependencies>
@ -1545,7 +1544,7 @@
<plugin.assembly.version>2.6</plugin.assembly.version>
<plugin.compiler.version>3.10.1</plugin.compiler.version>
<plugin.source.version>2.1.2</plugin.source.version>
<plugin.javadoc.version>3.6.3</plugin.javadoc.version>
<plugin.javadoc.version>2.8</plugin.javadoc.version>
<plugin.resources.version>3.1.0</plugin.resources.version>
<!-- default value for the distro directory -->
@ -1557,7 +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-->
<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>