You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2018/06/14 18:32:19 UTC
svn commit: r1833539 - in /felix/trunk/gogo: command/pom.xml
gogo-parent/pom.xml jline/pom.xml pom.xml runtime/pom.xml shell/pom.xml
Author: gnodet
Date: Thu Jun 14 18:32:18 2018
New Revision: 1833539
URL: http://svn.apache.org/viewvc?rev=1833539&view=rev
Log:
Upgrade to latest felix parent, fix poms
Modified:
felix/trunk/gogo/command/pom.xml
felix/trunk/gogo/gogo-parent/pom.xml
felix/trunk/gogo/jline/pom.xml
felix/trunk/gogo/pom.xml
felix/trunk/gogo/runtime/pom.xml
felix/trunk/gogo/shell/pom.xml
Modified: felix/trunk/gogo/command/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/command/pom.xml?rev=1833539&r1=1833538&r2=1833539&view=diff
==============================================================================
--- felix/trunk/gogo/command/pom.xml (original)
+++ felix/trunk/gogo/command/pom.xml Thu Jun 14 18:32:18 2018
@@ -1,79 +1,90 @@
-<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">
+<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">
- <!--
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>gogo-parent</artifactId>
- <version>3</version>
- <relativePath>../gogo-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.apache.felix.gogo.command</artifactId>
- <packaging>bundle</packaging>
- <version>1.1.0-SNAPSHOT</version>
- <name>Apache Felix Gogo Command</name>
-
- <description>
- Provides basic shell commands for Gogo.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
+ <!--
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.osgi.service.log</Export-Package>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Private-Package>${pom.artifactId}</Private-Package>
- <Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
- <Import-Package>org.apache.felix.service.command, org.osgi.framework; version="[1.5,2.0)", org.osgi.framework.wiring; resolution:=optional, *</Import-Package>
- <Include-Resource>{maven-resources},META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
- <DynamicImport-Package>org.apache.felix.bundlerepository, org.apache.felix.bundlerepository.*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <artifactId>gogo-parent</artifactId>
+ <version>4-SNAPSHOT</version>
+ <relativePath>../gogo-parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.felix.gogo.command</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.1.0-SNAPSHOT</version>
+ <name>Apache Felix Gogo Command</name>
+
+ <description>
+ Provides basic shell commands for Gogo.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.osgi.service.log</Export-Package>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Private-Package>${pom.artifactId}</Private-Package>
+ <Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
+ <Import-Package>org.apache.felix.service.command, org.osgi.framework; version="[1.5,2.0)",
+ org.osgi.framework.wiring; resolution:=optional, *
+ </Import-Package>
+ <Include-Resource>
+ {maven-resources},META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
+ <DynamicImport-Package>org.apache.felix.bundlerepository, org.apache.felix.bundlerepository.*
+ </DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: felix/trunk/gogo/gogo-parent/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/gogo-parent/pom.xml?rev=1833539&r1=1833538&r2=1833539&view=diff
==============================================================================
--- felix/trunk/gogo/gogo-parent/pom.xml (original)
+++ felix/trunk/gogo/gogo-parent/pom.xml Thu Jun 14 18:32:18 2018
@@ -22,7 +22,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
<version>5</version>
- <relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
@@ -31,6 +30,12 @@
<artifactId>gogo-parent</artifactId>
<version>4-SNAPSHOT</version>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/gogo/gogo-parent</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/gogo-parent</developerConnection>
+ <url>http://svn.apache.org/repos/asf/felix/gogo/gogo-parent</url>
+ </scm>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -52,9 +57,15 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.2.0</version>
+ <version>2.2.29</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -69,14 +80,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <preparationGoals>clean verify install</preparationGoals>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.5.0</version>
@@ -84,14 +87,6 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
</build>
+
</project>
Modified: felix/trunk/gogo/jline/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/pom.xml?rev=1833539&r1=1833538&r2=1833539&view=diff
==============================================================================
--- felix/trunk/gogo/jline/pom.xml (original)
+++ felix/trunk/gogo/jline/pom.xml Thu Jun 14 18:32:18 2018
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>gogo-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
<relativePath>../gogo-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -61,6 +61,16 @@
<optional>true</optional>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: felix/trunk/gogo/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/pom.xml?rev=1833539&r1=1833538&r2=1833539&view=diff
==============================================================================
--- felix/trunk/gogo/pom.xml (original)
+++ felix/trunk/gogo/pom.xml Thu Jun 14 18:32:18 2018
@@ -21,8 +21,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>4</version>
- <relativePath>../pom/pom.xml</relativePath>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
Modified: felix/trunk/gogo/runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/pom.xml?rev=1833539&r1=1833538&r2=1833539&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/pom.xml (original)
+++ felix/trunk/gogo/runtime/pom.xml Thu Jun 14 18:32:18 2018
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>gogo-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
<relativePath>../gogo-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -49,6 +49,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: felix/trunk/gogo/shell/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/shell/pom.xml?rev=1833539&r1=1833538&r2=1833539&view=diff
==============================================================================
--- felix/trunk/gogo/shell/pom.xml (original)
+++ felix/trunk/gogo/shell/pom.xml Thu Jun 14 18:32:18 2018
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>gogo-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
<relativePath>../gogo-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -20,6 +20,11 @@
<name>Apache Felix Gogo Shell</name>
<artifactId>org.apache.felix.gogo.shell</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/gogo/shell</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/gogo/shell</developerConnection>
+ <url>http://svn.apache.org/repos/asf/felix/gogo/shell</url>
+ </scm>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -36,6 +41,16 @@
<artifactId>org.apache.felix.gogo.runtime</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>