You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by da...@apache.org on 2021/09/03 10:20:44 UTC
[felix-dev] branch master updated (7481a12 -> adc9559)
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git.
from 7481a12 [maven-release-plugin] prepare for next development iteration
new 1fc28f2 Update johnzon dependency
new 9c29711 Convert tabs to spaces
new 41f6f34 [Features] Add SCM info
new adc9559 [Features] Update OSGi API dependency to RC1
The 4 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:
features/pom.xml | 224 +++++++++++++++++++++++++++----------------------------
1 file changed, 111 insertions(+), 113 deletions(-)
[felix-dev] 04/04: [Features] Update OSGi API dependency to RC1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit adc95597f7b75683db17782f2bfb5134135e3d1c
Author: David Bosschaert <da...@apache.org>
AuthorDate: Fri Sep 3 11:19:07 2021 +0100
[Features] Update OSGi API dependency to RC1
---
features/pom.xml | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/features/pom.xml b/features/pom.xml
index a1162e9..7539e6a 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -37,14 +37,6 @@
<felix.java.version>8</felix.java.version>
</properties>
- <repositories>
- <repository>
- <id>sonatype.snapshots</id>
- <name>OSGi Snapshot</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
@@ -101,7 +93,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
<scope>provided</scope>
</dependency>
<dependency>
[felix-dev] 02/04: Convert tabs to spaces
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 9c297110c47881319b9ec77844768339160e6e3e
Author: David Bosschaert <da...@apache.org>
AuthorDate: Fri Sep 3 11:11:23 2021 +0100
Convert tabs to spaces
---
features/pom.xml | 222 +++++++++++++++++++++++++++----------------------------
1 file changed, 111 insertions(+), 111 deletions(-)
diff --git a/features/pom.xml b/features/pom.xml
index 769028b..b46aa84 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,46 +1,46 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix-parent</artifactId>
- <version>7</version>
- <relativePath />
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix-parent</artifactId>
+ <version>7</version>
+ <relativePath />
+ </parent>
- <artifactId>org.apache.felix.feature</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <artifactId>org.apache.felix.feature</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>OSGi Feature Model API</name>
+ <name>OSGi Feature Model API</name>
<properties>
<felix.java.version>8</felix.java.version>
</properties>
- <repositories>
- <repository>
- <id>sonatype.snapshots</id>
- <name>OSGi Snapshot</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </repository>
+ <repositories>
+ <repository>
+ <id>sonatype.snapshots</id>
+ <name>OSGi Snapshot</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </repository>
</repositories>
- <build>
- <plugins>
+ <build>
+ <plugins>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
@@ -51,71 +51,71 @@
<goal>bnd-process</goal>
</goals>
<configuration>
- <bnd><![CDATA[
- Bundle-Activator: org.apache.felix.feature.impl.Activator
- ]]></bnd>
+ <bnd><![CDATA[
+ Bundle-Activator: org.apache.felix.feature.impl.Activator
+ ]]></bnd>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*.md</exclude>
- <exclude>src/main/resources/META-INF/services/*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
- <version>8.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>8.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
- <version>1.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.converter</artifactId>
- <version>1.0.18</version>
- <scope>provided</scope>
- </dependency>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>*.md</exclude>
+ <exclude>src/main/resources/META-INF/services/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>8.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>8.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.feature</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.function</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-json_1.1_spec</artifactId>
+ <version>1.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.converter</artifactId>
+ <version>1.0.18</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.cm.json</artifactId>
@@ -123,24 +123,24 @@
<scope>provided</scope>
</dependency>
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.8.9</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-core</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.8.9</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
[felix-dev] 01/04: Update johnzon dependency
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 1fc28f2ad85204b60ce0bbee3fced97b33c0ffff
Author: David Bosschaert <da...@apache.org>
AuthorDate: Fri Sep 3 11:10:33 2021 +0100
Update johnzon dependency
---
features/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/features/pom.xml b/features/pom.xml
index f86e491..769028b 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.2</version>
+ <version>1.2.14</version>
<scope>test</scope>
</dependency>
</dependencies>
[felix-dev] 03/04: [Features] Add SCM info
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 41f6f348128adcc9bf0d36ff8e484d0a816fec8d
Author: David Bosschaert <da...@apache.org>
AuthorDate: Fri Sep 3 11:15:15 2021 +0100
[Features] Add SCM info
---
features/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/features/pom.xml b/features/pom.xml
index b46aa84..a1162e9 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -27,6 +27,12 @@
<name>OSGi Feature Model API</name>
+ <scm>
+ <connection>scm:git:https://github.com/apache/felix-dev.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
+ </scm>
+
<properties>
<felix.java.version>8</felix.java.version>
</properties>