Commit 41716aad authored by Lionel Seinturier's avatar Lionel Seinturier

Fix used version numbers.

parent 8aac1609
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
<executions> <executions>
<execution> <execution>
<id>copy-bundles</id> <id>copy-bundles</id>
......
...@@ -20,8 +20,10 @@ ...@@ -20,8 +20,10 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.felix</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -30,7 +32,6 @@ ...@@ -30,7 +32,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>2.0.1</version>
<executions> <executions>
<execution> <execution>
<id>bundle-bundle</id> <id>bundle-bundle</id>
......
...@@ -13,10 +13,12 @@ ...@@ -13,10 +13,12 @@
<name>Tinfi OSGi Example HelloWorld - Interfaces</name> <name>Tinfi OSGi Example HelloWorld - Interfaces</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.felix</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>org.osgi.core</artifactId>
</dependency> <version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -24,7 +26,6 @@ ...@@ -24,7 +26,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>2.0.1</version>
<executions> <executions>
<execution> <execution>
<id>bundle-bundle</id> <id>bundle-bundle</id>
......
...@@ -19,15 +19,4 @@ ...@@ -19,15 +19,4 @@
<module>assembly</module> <module>assembly</module>
</modules> </modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project> </project>
...@@ -14,12 +14,28 @@ ...@@ -14,12 +14,28 @@
<name>Tinfi OSGi</name> <name>Tinfi OSGi</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties>
<osgi.version>4.2.0</osgi.version>
</properties>
<modules> <modules>
<module>opt</module> <module>opt</module>
<module>plugin</module> <module>plugin</module>
<module>mixed</module> <module>mixed</module>
</modules> </modules>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.3.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<profiles> <profiles>
<profile> <profile>
<id>tinfi:examples</id> <id>tinfi:examples</id>
......
...@@ -242,6 +242,11 @@ ...@@ -242,6 +242,11 @@
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment