Fix poms
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@773576 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/pom.xml b/karaf/assembly/pom.xml
index e332156..7140135 100644
--- a/karaf/assembly/pom.xml
+++ b/karaf/assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.felix.karaf</groupId>
- <artifactId>kernel</artifactId>
+ <artifactId>karaf</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
diff --git a/karaf/deployer/pom.xml b/karaf/deployer/pom.xml
index b347046..d43af9e 100644
--- a/karaf/deployer/pom.xml
+++ b/karaf/deployer/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.felix.karaf</groupId>
- <artifactId>kernel</artifactId>
+ <artifactId>karaf</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
diff --git a/karaf/gshell/pom.xml b/karaf/gshell/pom.xml
index 99aa516..503fc53 100644
--- a/karaf/gshell/pom.xml
+++ b/karaf/gshell/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.felix.karaf</groupId>
- <artifactId>kernel</artifactId>
+ <artifactId>karaf</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
diff --git a/karaf/itests/pom.xml b/karaf/itests/pom.xml
index 18828f4..533d207 100644
--- a/karaf/itests/pom.xml
+++ b/karaf/itests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.felix.karaf</groupId>
- <artifactId>kernel</artifactId>
+ <artifactId>karaf</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
diff --git a/karaf/jaas/pom.xml b/karaf/jaas/pom.xml
index 2dfd4bb..2c824b7 100644
--- a/karaf/jaas/pom.xml
+++ b/karaf/jaas/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.felix.karaf</groupId>
- <artifactId>kernel</artifactId>
+ <artifactId>karaf</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 9f76a46..9f28627 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -854,17 +854,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <maxmem>256M</maxmem>
- <fork>${compiler.fork}</fork>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
<version>2.1</version>
<configuration>
@@ -907,6 +896,17 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
<executions>