You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/08/22 09:30:38 UTC
[40/50] [abbrv] karaf git commit: [KARAF-4653]enable to build and run
Karaf with JAVA9
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ad08ed..039e44d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
<aspectj.bundle.version>1.7.4_1</aspectj.bundle.version>
<ant.bundle.version>1.8.2_2</ant.bundle.version>
<antlr.bundle.version>2.7.7_5</antlr.bundle.version>
- <asm.version>5.0.4</asm.version>
+ <asm.version>6.0_ALPHA</asm.version>
<asm.springsource.version>1.5.3</asm.springsource.version>
<cglib.bundle.version>3.2.2_1</cglib.bundle.version>
<cglib2.version>2.2.0</cglib2.version>
@@ -229,7 +229,7 @@
<aries.jndi.api.version>1.1.0</aries.jndi.api.version>
<aries.jndi.core.version>1.0.2</aries.jndi.core.version>
<aries.jndi.url.version>1.1.0</aries.jndi.url.version>
- <aries.proxy.version>1.0.5</aries.proxy.version>
+ <aries.proxy.version>1.0.6-SNAPSHOT</aries.proxy.version>
<aries.proxy.api.version>1.0.1</aries.proxy.api.version>
<aries.subsystem.api.version>2.0.8</aries.subsystem.api.version>
<aries.subsystem.core.version>2.0.8</aries.subsystem.core.version>
@@ -261,7 +261,7 @@
<org.json.version>20150729</org.json.version>
<pax.cdi.version>0.12.0</pax.cdi.version>
- <pax.exam.version>4.9.0</pax.exam.version>
+ <pax.exam.version>4.10.0-SNAPSHOT</pax.exam.version>
<pax.logging.version>1.8.5</pax.logging.version>
<pax.base.version>1.5.0</pax.base.version>
<pax.url.version>2.4.7</pax.url.version>
@@ -286,13 +286,16 @@
<directory-version>2.0.0-M20</directory-version>
<struts.bundle.version>1.3.10_1</struts.bundle.version>
<xbean.version>3.18</xbean.version>
- <xerces.version>2.11.0</xerces.version>
+ <xerces.version>2.11.0_1</xerces.version>
<xalan.bundle.version>2.7.2_3</xalan.bundle.version>
<xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version>
<javax.mail.version>1.4.5</javax.mail.version>
<winsw.version>1.18</winsw.version>
+
+ <surefire.argLine/>
+
<!-- Further used maven plugin versions; e.g. in the docs -->
<plugin.depends.version>1.3.1</plugin.depends.version>
@@ -604,6 +607,7 @@
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.karaf.profile</groupId>
<artifactId>org.apache.karaf.profile.core</artifactId>
@@ -1778,7 +1782,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.6</version>
+ <version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1825,6 +1829,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ <argLine>${surefire.argLine}</argLine>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1902,7 +1910,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.6</version>
+ <version>3.0.0-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
@@ -2028,7 +2036,7 @@
<version>[3,4)</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>[1.8,1.9]</version>
+ <version>[1.8,9]</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -2331,5 +2339,14 @@
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
+ <profile>
+ <id>java9</id>
+ <properties>
+ <surefire.argLine>-addmods java.activation,java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws</surefire.argLine>
+ </properties>
+ <activation>
+ <jdk>9</jdk>
+ </activation>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/scheduler/pom.xml
----------------------------------------------------------------------
diff --git a/scheduler/pom.xml b/scheduler/pom.xml
index 0616402..5950d57 100644
--- a/scheduler/pom.xml
+++ b/scheduler/pom.xml
@@ -117,4 +117,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/scr/examples/component-factory/pom.xml
----------------------------------------------------------------------
diff --git a/scr/examples/component-factory/pom.xml b/scr/examples/component-factory/pom.xml
index e04bb4a..080509c 100644
--- a/scr/examples/component-factory/pom.xml
+++ b/scr/examples/component-factory/pom.xml
@@ -84,4 +84,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/scr/examples/managed-service/pom.xml
----------------------------------------------------------------------
diff --git a/scr/examples/managed-service/pom.xml b/scr/examples/managed-service/pom.xml
index 1f68135..7dc20e1 100644
--- a/scr/examples/managed-service/pom.xml
+++ b/scr/examples/managed-service/pom.xml
@@ -80,4 +80,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/scr/examples/service/pom.xml
----------------------------------------------------------------------
diff --git a/scr/examples/service/pom.xml b/scr/examples/service/pom.xml
index 7b9c6b0..8e5433d 100644
--- a/scr/examples/service/pom.xml
+++ b/scr/examples/service/pom.xml
@@ -80,4 +80,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/scr/pom.xml
----------------------------------------------------------------------
diff --git a/scr/pom.xml b/scr/pom.xml
index d7a5c54..e2c94bf 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -40,4 +40,4 @@
<module>examples</module>
</modules>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/service/guard/pom.xml
----------------------------------------------------------------------
diff --git a/service/guard/pom.xml b/service/guard/pom.xml
index aef09c7..c91fbd6 100644
--- a/service/guard/pom.xml
+++ b/service/guard/pom.xml
@@ -120,4 +120,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/service/pom.xml
----------------------------------------------------------------------
diff --git a/service/pom.xml b/service/pom.xml
index 651d53e..5719dce 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -38,4 +38,4 @@
<module>guard</module>
</modules>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/services/coordinator/pom.xml
----------------------------------------------------------------------
diff --git a/services/coordinator/pom.xml b/services/coordinator/pom.xml
index f960b5c..bc5dffc 100644
--- a/services/coordinator/pom.xml
+++ b/services/coordinator/pom.xml
@@ -84,4 +84,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/services/eventadmin/pom.xml
----------------------------------------------------------------------
diff --git a/services/eventadmin/pom.xml b/services/eventadmin/pom.xml
index 572ea50..a8f85d8 100644
--- a/services/eventadmin/pom.xml
+++ b/services/eventadmin/pom.xml
@@ -110,4 +110,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/services/staticcm/pom.xml
----------------------------------------------------------------------
diff --git a/services/staticcm/pom.xml b/services/staticcm/pom.xml
index ea25f3f..fdb12f8 100644
--- a/services/staticcm/pom.xml
+++ b/services/staticcm/pom.xml
@@ -89,4 +89,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml
index 40c6329..1c01767 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -34,6 +34,7 @@
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ <mvn.opts/>
</properties>
<dependencies>
@@ -225,7 +226,7 @@
<postBuildHookScript>verify</postBuildHookScript>
<!--<localRepositoryPath>${project.build.directory}/system</localRepositoryPath>-->
<!--<settingsFile>src/it/settings.xml</settingsFile>-->
- <mavenOpts>-Djava.io.tmpdir=${project.build.directory}</mavenOpts>
+ <mavenOpts>${mvn.opts}</mavenOpts>
<skipInstallation>${invoker.skip}</skipInstallation>
<skipInvocation>${invoker.skip}</skipInvocation>
<goals>
@@ -273,6 +274,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -285,5 +296,17 @@
</plugin>
</plugins>
</reporting>
+ <profiles>
+ <profile>
+ <id>java9</id>
+ <properties>
+ <mvn.opts>-XaddExports:java.base/sun.net.www.protocol.http=ALL-UNNAMED -XaddExports:java.base/sun.net.www.protocol.https=ALL-UNNAMED -XaddExports:java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED -XaddExports:jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED -addmods java.activation,java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws -Djava.io.tmpdir=${project.build.directory}</mvn.opts>
+ </properties>
+ <activation>
+ <jdk>9</jdk>
+ </activation>
+ </profile>
+ </profiles>
+
</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml
index 8e6b26a..f0009ac 100644
--- a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/pom.xml
@@ -44,6 +44,16 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -65,4 +75,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-assembly-prop-edits/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-assembly-prop-edits/pom.xml b/tooling/karaf-maven-plugin/src/it/test-assembly-prop-edits/pom.xml
index 0c8653b..886ef11 100644
--- a/tooling/karaf-maven-plugin/src/it/test-assembly-prop-edits/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-assembly-prop-edits/pom.xml
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
- <version>4.0.1</version>
+ <version>@pom.version@</version>
<type>kar</type>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>standard</artifactId>
- <version>4.0.1</version>
+ <version>@pom.version@</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-assembly/pom.xml b/tooling/karaf-maven-plugin/src/it/test-assembly/pom.xml
index 50907ba..3444f41 100644
--- a/tooling/karaf-maven-plugin/src/it/test-assembly/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-assembly/pom.xml
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
- <version>4.0.3</version>
+ <version>@pom.version@</version>
<type>kar</type>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>standard</artifactId>
- <version>4.0.3</version>
+ <version>@pom.version@</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml b/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml
index 0590a3f..45122f8 100644
--- a/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-basic-generation/pom.xml
@@ -33,6 +33,16 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml b/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml
index 7802807..f4b22b2 100644
--- a/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/pom.xml
@@ -40,6 +40,16 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -63,4 +73,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml b/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml
index 6c1f2f0..fb2e03a 100644
--- a/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-check-dependencies/pom.xml
@@ -41,6 +41,16 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -64,4 +74,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/pom.xml b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/pom.xml
index 143f0c7..b60f650 100644
--- a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/pom.xml
@@ -44,6 +44,16 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -67,4 +77,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/transitive/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/transitive/pom.xml b/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/transitive/pom.xml
index 37c2443..9f188c2 100644
--- a/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/transitive/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/transitive/pom.xml
@@ -27,6 +27,34 @@
<version>[3.0,3.4)</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.4</version>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
@@ -46,4 +74,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml b/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml
index 976e5c1..925f726 100644
--- a/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/pom.xml
@@ -33,6 +33,16 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -57,4 +67,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml b/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml
index f8af64a..a135fb1 100644
--- a/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-input-file/pom.xml
@@ -39,6 +39,16 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml b/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml
index 4fbd790..46e8ac9 100644
--- a/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-recursive/pom.xml
@@ -40,6 +40,16 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -64,4 +74,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/pom.xml b/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/pom.xml
index afd6990..d81411d 100644
--- a/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/pom.xml
@@ -33,6 +33,17 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-run-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-run-bundle/pom.xml b/tooling/karaf-maven-plugin/src/it/test-run-bundle/pom.xml
index b67aefc..ec2d234 100644
--- a/tooling/karaf-maven-plugin/src/it/test-run-bundle/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-run-bundle/pom.xml
@@ -29,6 +29,17 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.5.4</version>
@@ -52,7 +63,7 @@
<goal>run</goal>
</goals>
<configuration>
- <karafDistribution>mvn:org.apache.karaf/apache-karaf/4.0.3/zip</karafDistribution>
+ <karafDistribution>mvn:org.apache.karaf/apache-karaf/@pom.version@/zip</karafDistribution>
<keepRunning>false</keepRunning>
<deployProjectArtifact>true</deployProjectArtifact>
</configuration>
@@ -62,4 +73,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-run/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-run/pom.xml b/tooling/karaf-maven-plugin/src/it/test-run/pom.xml
index d0d4a69..c4f9b7d 100644
--- a/tooling/karaf-maven-plugin/src/it/test-run/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-run/pom.xml
@@ -39,7 +39,7 @@
<goal>run</goal>
</goals>
<configuration>
- <karafDistribution>mvn:org.apache.karaf/apache-karaf/4.0.3/zip</karafDistribution>
+ <karafDistribution>mvn:org.apache.karaf/apache-karaf/@pom.version@/zip</karafDistribution>
<keepRunning>false</keepRunning>
<deployProjectArtifact>false</deployProjectArtifact>
</configuration>
@@ -49,4 +49,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml b/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml
index eeb048a..3fc5a79 100644
--- a/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml
+++ b/tooling/karaf-maven-plugin/src/it/test-type-classifier/pom.xml
@@ -34,6 +34,17 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <maxmem>256M</maxmem>
+ <fork>${compiler.fork}</fork>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/tooling/karaf-maven-plugin/src/main/resources/config.properties
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/resources/config.properties b/tooling/karaf-maven-plugin/src/main/resources/config.properties
index 36535b6..2c4011a 100644
--- a/tooling/karaf-maven-plugin/src/main/resources/config.properties
+++ b/tooling/karaf-maven-plugin/src/main/resources/config.properties
@@ -623,5 +623,200 @@ jre-1.8= \
org.xml.sax.ext, \
org.xml.sax.helpers
+jre-9= \
+ javax.accessibility, \
+ javax.activation;version="1.1", \
+ javax.activity, \
+ javax.annotation;version="1.0", \
+ javax.annotation.processing;version="1.0", \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+ javax.jws, \
+ javax.jws.soap, \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.script, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.tools, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+ javax.xml.bind;version="2.2.1", \
+ javax.xml.bind.annotation;version="2.2.1", \
+ javax.xml.bind.annotation.adapters;version="2.2.1", \
+ javax.xml.bind.attachment;version="2.2.1", \
+ javax.xml.bind.helpers;version="2.2.1", \
+ javax.xml.bind.util;version="2.2.1", \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.soap;version="1.3", \
+ javax.xml.stream;version="1.2", \
+ javax.xml.stream.events;version="1.2", \
+ javax.xml.stream.util;version="1.2", \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+ javax.xml.ws;version="2.2", \
+ javax.xml.ws.handler;version="2.2", \
+ javax.xml.ws.handler.soap;version="2.2", \
+ javax.xml.ws.http;version="2.2", \
+ javax.xml.ws.soap;version="2.2", \
+ javax.xml.ws.spi;version="2.2", \
+ javax.xml.ws.wsaddressing;version="2.2", \
+ javax.xml.ws.spi.http;version="2.2", \
+ javax.xml.xpath, \
+ javafx.animation, \
+ javafx.application, \
+ javafx.beans, \
+ javafx.beans.binding, \
+ javafx.beans.property, \
+ javafx.beans.property.adapter, \
+ javafx.beans.value, \
+ javafx.collections, \
+ javafx.concurrent, \
+ javafx.css, \
+ javafx.embed.swing, \
+ javafx.embed.swt, \
+ javafx.event, \
+ javafx.fxml, \
+ javafx.geometry, \
+ javafx.scene, \
+ javafx.scene.canvas, \
+ javafx.scene.chart, \
+ javafx.scene.control, \
+ javafx.scene.control.cell, \
+ javafx.scene.effect, \
+ javafx.scene.image, \
+ javafx.scene.input, \
+ javafx.scene.layout, \
+ javafx.scene.media, \
+ javafx.scene.paint, \
+ javafx.scene.shape, \
+ javafx.scene.text, \
+ javafx.scene.transform, \
+ javafx.scene.web, \
+ javafx.stage, \
+ javafx.util, \
+ javafx.util.converter, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA.DynAnyPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.SendingContext, \
+ org.omg.stub.java.rmi, \
+ org.omg.stub.javax.management.remote.rmi, \
+ org.w3c.dom, \
+ org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
+ org.w3c.dom.events, \
+ org.w3c.dom.html, \
+ org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.w3c.dom.xpath, \
+ org.xml.sax, \
+ org.xml.sax.ext, \
+ org.xml.sax.helpers
+
+
osgi= \
org.osgi.framework;
http://git-wip-us.apache.org/repos/asf/karaf/blob/ca1f18e3/web/pom.xml
----------------------------------------------------------------------
diff --git a/web/pom.xml b/web/pom.xml
index 4777971..1bc4d9f 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -110,4 +110,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>