This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new ef67765d7b FELIX-6677 : Set correct source/release info for javadoc
plugin
ef67765d7b is described below
commit ef67765d7b82cd00ef3c81f4e055a2db85403575
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Jan 3 09:17:29 2024 +0100
FELIX-6677 : Set correct source/release info for javadoc plugin
---
pom/changelog.txt | 48 ------------------------------------------------
pom/pom.xml | 42 ++++++++++++++++++++++++++++++------------
2 files changed, 30 insertions(+), 60 deletions(-)
diff --git a/pom/changelog.txt b/pom/changelog.txt
deleted file mode 100644
index 61ac5fbd07..0000000000
--- a/pom/changelog.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Changes from 4 to 5
--------------------
-** Improvement
- * [FELIX-5820] - Update to latest Apache parent pom
- Set java min version to 7
- Reduce supported java versions to 6, 7, 8, 9 (drop 4, 5,
add 8, 9)
- Add missing encoding properties
- Remove dependency management of testing dependencies
- Update versions of plugins
- Use enforcer plugin to enforce maven and min java version
- Remove calculation of BREE header
-
-
-Changes from 3 to 4
--------------------
-** Improvement
- * [FELIX-5157] - Add m2e lifecycle mappings
- * [FELIX-5158] - Update test dependencies
- * [FELIX-5159] - Update plugin dependencies
- * [FELIX-5160] - Update configuration for Apache rat plugin
-
-
-Changes from 2.1 to 3
----------------------
-
-** Improvement
- * [FELIX-3486] - Allow for easy specification of class file compliance
- and Java API use
-
-** Task
- * [FELIX-4152] - Update to latest Apache Parent POM 13
- * [FELIX-4153] - Use latest JavaDoc plugin and provide default
- configuration
-
-
-Changes from 2 to 2.1
----------------------
-
-Generate zip and tar.gz project archives
-
-
-Changes from 1 to 2
--------------------
-
-** Wish
- * [FELIX-1747] - Use Remote Resources Plugin to generate the legal files
-
-
\ No newline at end of file
diff --git a/pom/pom.xml b/pom/pom.xml
index 654d69dffd..4625f09f4e 100644
--- a/pom/pom.xml
+++ b/pom/pom.xml
@@ -112,18 +112,6 @@
<artifactId>tools-maven-plugin</artifactId>
<version>1.4</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.23</version>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java1${felix.java.version}</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -233,6 +221,22 @@
<jdk>(,9)</jdk>
</activation>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.23</version>
+ <configuration>
+ <signature>
+
<groupId>org.codehaus.mojo.signature</groupId>
+
<artifactId>java1${felix.java.version}</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -242,6 +246,13 @@
<target>1.${felix.java.version}</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <source>1.${felix.java.version}</source>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -275,6 +286,13 @@
<release>${felix.java.version}</release>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <release>${felix.java.version}</release>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
