You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by tj...@apache.org on 2020/08/21 18:15:36 UTC
[felix-atomos] branch master updated (09f3fd1 -> 63b5031)
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git.
from 09f3fd1 Use --no-server to build native images
new 8474d2b Fix NPE when there is no manifest file.
new 7e65880 Remove signer info from indexed JAR
new 63b5031 Update web console version
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/maven.yml | 2 +-
atomos.examples/atomos.examples.index/pom.xml | 12 +++++++++++-
.../atomos.examples.substrate.equinox/pom.xml | 4 ++--
.../atomos.examples.substrate.felix/pom.xml | 4 ++--
.../atomos.examples.substrate.maven/pom.xml | 6 ++++++
.../atomos.examples.webconsole.bom/pom.xml | 6 ++++++
.../atomos/utils/core/plugins/index/IndexPlugin.java | 11 +++++++----
pom.xml | 19 +++++++++++++++----
8 files changed, 50 insertions(+), 14 deletions(-)
[felix-atomos] 03/03: Update web console version
Posted by tj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git
commit 63b5031cf313c32ccde9fc6564a84d414b034f54
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Fri Aug 21 11:42:15 2020 -0500
Update web console version
---
.github/workflows/maven.yml | 2 +-
.../atomos.examples.substrate.equinox/pom.xml | 4 ++--
.../atomos.examples.substrate.felix/pom.xml | 4 ++--
.../atomos.examples.substrate.maven/pom.xml | 6 ++++++
.../atomos.examples.webconsole.bom/pom.xml | 6 ++++++
pom.xml | 19 +++++++++++++++----
6 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index dee18f2..41064ae 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -34,7 +34,7 @@ jobs:
uses: DeLaGuardo/setup-graalvm@2.0
with:
# The GraalVM version to make available on the path.
- graalvm-version: '20.0.0.java8'
+ graalvm-version: '20.2.0.java11'
- name: Install substrate native-image support
if: matrix.os == 'ubuntu-latest'
run: gu install native-image
diff --git a/atomos.examples/atomos.examples.substrate.equinox/pom.xml b/atomos.examples/atomos.examples.substrate.equinox/pom.xml
index 7c19f6a..81df360 100644
--- a/atomos.examples/atomos.examples.substrate.equinox/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.equinox/pom.xml
@@ -138,7 +138,7 @@
<plugin>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>native-image-maven-plugin</artifactId>
- <version>19.3.1</version>
+ <version>20.2.0</version>
<executions>
<execution>
<goals>
@@ -154,7 +154,7 @@
--no-server
--allow-incomplete-classpath
--no-fallback
- --initialize-at-build-time=org.apache.felix.atomos.runtime,org.apache.felix.atomos.runtime.launch,org.apache.felix.atomos.impl,javax.servlet,org.apache.felix.service.command.Converter
+ --initialize-at-build-time=org.eclipse.jetty.util.TypeUtil,org.eclipse.jetty.http.HttpTokens,org.eclipse.jetty.util.log.Log,org.eclipse.jetty.util.log.StdErrLog,org.eclipse.jetty.util.Uptime,org.eclipse.jetty.server.HttpOutput,org.apache.felix.atomos.runtime,org.apache.felix.atomos.runtime.launch,org.apache.felix.atomos.impl,javax.servlet,org.apache.felix.service.command.Converter
-H:ReflectionConfigurationFiles=${project.basedir}/graal_class_config.json
-H:ResourceConfigurationFiles=${project.basedir}/graal_resource_config.json
-H:DynamicProxyConfigurationFiles=${project.basedir}/graal_proxy_config.json
diff --git a/atomos.examples/atomos.examples.substrate.felix/pom.xml b/atomos.examples/atomos.examples.substrate.felix/pom.xml
index e9d5bcc..e8ebe71 100644
--- a/atomos.examples/atomos.examples.substrate.felix/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.felix/pom.xml
@@ -151,7 +151,7 @@
<plugin>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>native-image-maven-plugin</artifactId>
- <version>19.3.1</version>
+ <version>20.2.0</version>
<executions>
<execution>
<goals>
@@ -167,7 +167,7 @@
--no-server
--allow-incomplete-classpath
--no-fallback
- --initialize-at-build-time=org.apache.felix.atomos.runtime,org.apache.felix.atomos.launch,org.apache.felix.atomos.impl,javax.servlet,org.apache.felix.framework.util.Util,org.apache.felix.framework.util.SecureAction,org.apache.felix.framework.BundleWiringImpl,org.apache.felix.framework.BundleRevisionImpl,org.apache.felix.service.command.Converter
+ --initialize-at-build-time=org.eclipse.jetty.util.TypeUtil,org.eclipse.jetty.http.HttpTokens,org.eclipse.jetty.util.log.Log,org.eclipse.jetty.util.log.StdErrLog,org.eclipse.jetty.util.Uptime,org.eclipse.jetty.server.HttpOutput,org.apache.felix.atomos.runtime,org.apache.felix.atomos.launch,org.apache.felix.atomos.impl,javax.servlet,org.apache.felix.framework.util.Util,org.apache.felix.framework.util.SecureAction,org.apache.felix.framework.BundleWiringImpl,org.apach [...]
-H:ReflectionConfigurationFiles=${project.basedir}/graal_class_config.json
-H:ResourceConfigurationFiles=${project.basedir}/graal_resource_config.json
-H:DynamicProxyConfigurationFiles=${project.basedir}/graal_proxy_config.json
diff --git a/atomos.examples/atomos.examples.substrate.maven/pom.xml b/atomos.examples/atomos.examples.substrate.maven/pom.xml
index b89fec9..22316ba 100644
--- a/atomos.examples/atomos.examples.substrate.maven/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.maven/pom.xml
@@ -88,6 +88,12 @@
<additionalInitializeAtBuildTime>org.apache.felix.atomos.impl</additionalInitializeAtBuildTime>
<additionalInitializeAtBuildTime>javax.servlet</additionalInitializeAtBuildTime>
<additionalInitializeAtBuildTime>org.apache.felix.service.command.Converter</additionalInitializeAtBuildTime>
+ <additionalInitializeAtBuildTime>org.eclipse.jetty.util.TypeUtil</additionalInitializeAtBuildTime>
+ <additionalInitializeAtBuildTime>org.eclipse.jetty.http.HttpTokens</additionalInitializeAtBuildTime>
+ <additionalInitializeAtBuildTime>org.eclipse.jetty.util.log.Log</additionalInitializeAtBuildTime>
+ <additionalInitializeAtBuildTime>org.eclipse.jetty.util.log.StdErrLog</additionalInitializeAtBuildTime>
+ <additionalInitializeAtBuildTime>org.eclipse.jetty.util.Uptime</additionalInitializeAtBuildTime>
+ <additionalInitializeAtBuildTime>org.eclipse.jetty.server.HttpOutput</additionalInitializeAtBuildTime>
<!-- <additionalInitializeAtBuildTime>org.apache.felix.atomos.impl.runtime.base</additionalInitializeAtBuildTime> -->
</additionalInitializeAtBuildTime>
<resourceConfigurationFiles>
diff --git a/atomos.examples/atomos.examples.webconsole.bom/pom.xml b/atomos.examples/atomos.examples.webconsole.bom/pom.xml
index ec8de38..b6596ad 100644
--- a/atomos.examples/atomos.examples.webconsole.bom/pom.xml
+++ b/atomos.examples/atomos.examples.webconsole.bom/pom.xml
@@ -53,6 +53,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -67,5 +68,10 @@
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 1371218..78f44d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore/>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
@@ -199,7 +199,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>3.1.0</version>
+ <version>4.0.20</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -221,7 +221,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>3.0.0</version>
+ <version>4.0.0</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -232,7 +232,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>4.3.16</version>
+ <version>4.5.4</version>
<classifier>all</classifier>
<exclusions>
<exclusion>
@@ -285,6 +285,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>3.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
[felix-atomos] 01/03: Fix NPE when there is no manifest file.
Posted by tj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git
commit 8474d2b7456ed10b4c93d3e674aa3fb3cbd5ca3c
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Fri Aug 21 11:39:58 2020 -0500
Fix NPE when there is no manifest file.
---
.../felix/atomos/utils/core/plugins/index/IndexPlugin.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/index/IndexPlugin.java b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/index/IndexPlugin.java
index b6bacbc..67342b2 100644
--- a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/index/IndexPlugin.java
+++ b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/index/IndexPlugin.java
@@ -109,12 +109,15 @@ public class IndexPlugin implements JarPlugin<IndexPluginConfig>
IndexInfoImpl info = new IndexInfoImpl();
- Attributes attributes;
try
{
- attributes = jar.getManifest().getMainAttributes();
- info.setBsn(attributes.getValue(Constants.BUNDLE_SYMBOLICNAME));
- info.setVersion(attributes.getValue(Constants.BUNDLE_VERSION));
+ Manifest mf = jar.getManifest();
+ Attributes attributes = mf == null ? null : mf.getMainAttributes();
+ if (attributes != null)
+ {
+ info.setBsn(attributes.getValue(Constants.BUNDLE_SYMBOLICNAME));
+ info.setVersion(attributes.getValue(Constants.BUNDLE_VERSION));
+ }
}
catch (IOException e1)
{
[felix-atomos] 02/03: Remove signer info from indexed JAR
Posted by tj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git
commit 7e658806aaabe8fdc1b45346956c1873c09155e2
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Fri Aug 21 11:40:36 2020 -0500
Remove signer info from indexed JAR
---
atomos.examples/atomos.examples.index/pom.xml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/atomos.examples/atomos.examples.index/pom.xml b/atomos.examples/atomos.examples.index/pom.xml
index ce85e7e..124b93e 100644
--- a/atomos.examples/atomos.examples.index/pom.xml
+++ b/atomos.examples/atomos.examples.index/pom.xml
@@ -89,7 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
@@ -102,6 +102,16 @@
<mainClass>org.apache.felix.atomos.launch.AtomosLauncher</mainClass>
</transformer>
</transformers>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
</executions>