You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2021/04/06 16:24:37 UTC
[aries] 02/04: clean various IDE warnings
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 28091f518fb2cebdc12cbe7d3178f9858c881c45
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Tue Apr 6 11:41:57 2021 -0400
clean various IDE warnings
Signed-off-by: Raymond Augé <ro...@apache.org>
---
spi-fly/pom.xml | 23 +++++++++-------------
spi-fly/spi-fly-core/pom.xml | 2 --
spi-fly/spi-fly-dynamic-bundle/pom.xml | 4 ++--
.../spi-fly-dynamic-framework-extension/pom.xml | 7 ++++---
.../spi-fly-example-provider1-bundle/pom.xml | 6 +++---
spi-fly/spi-fly-static-bundle/pom.xml | 4 ++--
spi-fly/spi-fly-static-tool/pom.xml | 2 --
spi-fly/spi-fly-weaver/pom.xml | 2 --
8 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/spi-fly/pom.xml b/spi-fly/pom.xml
index 570d344..58b1eae 100644
--- a/spi-fly/pom.xml
+++ b/spi-fly/pom.xml
@@ -97,6 +97,7 @@
<version>0.3.1</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
@@ -109,14 +110,17 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
@@ -140,6 +144,7 @@
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
</plugins>
@@ -150,25 +155,14 @@
<activation>
<jdk>[9,)</jdk>
</activation>
+ <properties>
+ <!-- <maven.compiler.release>${java.specification.version}</maven.compiler.release> -->
+ </properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
- <configuration>
- <optimize>true</optimize>
- <debug>true</debug>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- <release>${java.specification.version}</release>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
@@ -230,6 +224,7 @@
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
+ <exclude>**/.vscode/settings.json</exclude>
<exclude>**/eclipse-classes/**/*</exclude>
<!-- manifest files don't support comments so don't contain the ASL2.0 header -->
<exclude>**/*.MF</exclude>
diff --git a/spi-fly/spi-fly-core/pom.xml b/spi-fly/spi-fly-core/pom.xml
index 3390e25..dd8c774 100644
--- a/spi-fly/spi-fly-core/pom.xml
+++ b/spi-fly/spi-fly-core/pom.xml
@@ -28,9 +28,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.core-internal</artifactId>
- <version>1.3.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Aries SPI Fly Core (internal module)</name>
<description>
diff --git a/spi-fly/spi-fly-dynamic-bundle/pom.xml b/spi-fly/spi-fly-dynamic-bundle/pom.xml
index 4574c55..c2e36d1 100644
--- a/spi-fly/spi-fly-dynamic-bundle/pom.xml
+++ b/spi-fly/spi-fly-dynamic-bundle/pom.xml
@@ -28,9 +28,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
- <version>1.3.3-SNAPSHOT</version>
<name>Apache Aries SPI Fly Dynamic Weaving Bundle</name>
<description>
This bundle contains an extender that facilitates the use
@@ -230,6 +228,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -296,6 +295,7 @@
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<excludePackageNames>aQute.*</excludePackageNames>
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
index d11227f..dd4b9fd 100644
--- a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
+++ b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
@@ -28,9 +28,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
- <version>1.3.3-SNAPSHOT</version>
<name>Apache Aries SPI Fly Dynamic Weaving Framework Extension</name>
<description>
This framework extension fragment contains an extender that facilitates
@@ -150,7 +148,8 @@
osgi.extender;osgi.extender=osgi.serviceloader.processor;version:Version=1.0;uses:="org.apache.aries.spifly"
-fixupmessages: \
"Host system.bundle=extension:=framework",\
- "Export org.apache.aries.spifly, has 1, private references"
+ "Export org.apache.aries.spifly, has 1, private references",\
+ "Split package, multiple jars provide the same package:org/apache/aries/spifly"
]]></bnd>
</configuration>
<executions>
@@ -232,6 +231,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -329,6 +329,7 @@
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<excludePackageNames>aQute.*,org.objectweb.*</excludePackageNames>
diff --git a/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml b/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml
index 78d7ed9..4c9f3db 100644
--- a/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml
+++ b/spi-fly/spi-fly-examples/spi-fly-example-provider1-bundle/pom.xml
@@ -40,13 +40,13 @@
<artifactId>org.apache.aries.spifly.examples.spi.bundle</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>org.apache.aries.spifly.examples</groupId>
<artifactId>org.apache.aries.spifly.examples.provider1.jar</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
</dependencies>
<properties>
diff --git a/spi-fly/spi-fly-static-bundle/pom.xml b/spi-fly/spi-fly-static-bundle/pom.xml
index b3b3db4..0ba5d3c 100644
--- a/spi-fly/spi-fly-static-bundle/pom.xml
+++ b/spi-fly/spi-fly-static-bundle/pom.xml
@@ -28,9 +28,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.static.bundle</artifactId>
- <version>1.3.3-SNAPSHOT</version>
<name>Apache Aries SPI Fly Static Weaving Bundle</name>
<description>
This bundle contains support classes used at runtime by bundles
@@ -194,6 +192,7 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -259,6 +258,7 @@
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<excludePackageNames>aQute.*</excludePackageNames>
diff --git a/spi-fly/spi-fly-static-tool/pom.xml b/spi-fly/spi-fly-static-tool/pom.xml
index 747fbab..2ba0ad3 100644
--- a/spi-fly/spi-fly-static-tool/pom.xml
+++ b/spi-fly/spi-fly-static-tool/pom.xml
@@ -28,9 +28,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.static.tool</artifactId>
- <version>1.3.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Aries SPI Fly Static Weaving Tool</name>
<description>
diff --git a/spi-fly/spi-fly-weaver/pom.xml b/spi-fly/spi-fly-weaver/pom.xml
index c84ae37..4396e29 100644
--- a/spi-fly/spi-fly-weaver/pom.xml
+++ b/spi-fly/spi-fly-weaver/pom.xml
@@ -28,9 +28,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.weaver-internal</artifactId>
- <version>1.3.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Aries SPI Fly Weaver (internal module)</name>