Remove parent declaration
Cleanup dependencies
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1470280 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/distributions/handler-tutorial/Log-Handler-In-Felix/pom.xml b/ipojo/distributions/handler-tutorial/Log-Handler-In-Felix/pom.xml
index 2c94c8d..70020b6 100644
--- a/ipojo/distributions/handler-tutorial/Log-Handler-In-Felix/pom.xml
+++ b/ipojo/distributions/handler-tutorial/Log-Handler-In-Felix/pom.xml
@@ -37,20 +37,6 @@
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main.distribution</artifactId>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.arch.gogo</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
<version>1.0.1</version>
</dependency>
@@ -107,7 +93,8 @@
org.apache.felix.log,org.apache.felix.ipojo,
org.apache.felix.ipojo.arch.gogo
</includeArtifactIds>
- <outputDirectory>${project.build.directory}/felix-framework-${felix.version}/bundle</outputDirectory>
+ <outputDirectory>${project.build.directory}/felix-framework-${felix.version}/bundle
+ </outputDirectory>
</configuration>
</execution>
</executions>
@@ -116,5 +103,5 @@
</plugins>
</build>
-
+
</project>
\ No newline at end of file
diff --git a/ipojo/distributions/handler-tutorial/Property-Handler-In-Felix/pom.xml b/ipojo/distributions/handler-tutorial/Property-Handler-In-Felix/pom.xml
index dac5110..ba34f23 100644
--- a/ipojo/distributions/handler-tutorial/Property-Handler-In-Felix/pom.xml
+++ b/ipojo/distributions/handler-tutorial/Property-Handler-In-Felix/pom.xml
@@ -29,33 +29,12 @@
<version>1.9.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix</groupId>
<artifactId>Property-Handler-In-Felix</artifactId>
<version>1.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main.distribution</artifactId>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.arch.gogo</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>1.0.1</version>
- </dependency>
-
<!-- our project -->
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/ipojo/distributions/handler-tutorial/pom.xml b/ipojo/distributions/handler-tutorial/pom.xml
index af9c88a..a0ad878 100644
--- a/ipojo/distributions/handler-tutorial/pom.xml
+++ b/ipojo/distributions/handler-tutorial/pom.xml
@@ -23,12 +23,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.distributions</artifactId>
- <version>1.9.0-SNAPSHOT</version>
- </parent>
-
+ <groupId>org.apache.felix</groupId>
<artifactId>ipojo-handler-tutorial</artifactId>
<version>1.9.0-SNAPSHOT</version>
@@ -71,9 +66,56 @@
<module>Property-Handler-In-Felix</module>
</modules>
+ <properties>
+ <felix.version>4.2.1</felix.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>1.8.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.arch.gogo</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main.distribution</artifactId>
+ <version>4.2.1</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.annotations</artifactId>
+ <version>1.8.6</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-ipojo-plugin</artifactId>
+ <version>1.8.6</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -83,7 +125,7 @@
</descriptorRefs>
<!--<descriptors>-->
- <!--<descriptor>src/main/assembly/distribution.xml</descriptor>-->
+ <!--<descriptor>src/main/assembly/distribution.xml</descriptor>-->
<!--</descriptors>-->
<attach>true</attach>
</configuration>