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/03/06 14:16:54 UTC
karaf git commit: KARAF-4384 - Upgrade to maven-compiler-plugin 3.5.1
Repository: karaf
Updated Branches:
refs/heads/master 26bff67e4 -> ae835274b
KARAF-4384 - Upgrade to maven-compiler-plugin 3.5.1
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ae835274
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ae835274
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ae835274
Branch: refs/heads/master
Commit: ae835274bc2692c1d4631a577b8746659bc7fd43
Parents: 26bff67
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sun Mar 6 14:15:42 2016 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sun Mar 6 14:15:42 2016 +0100
----------------------------------------------------------------------
.../command/src/main/resources/archetype-resources/pom.xml | 6 +++---
demos/web/pom.xml | 4 ++--
manual/src/main/asciidoc/developer-guide/extending.adoc | 6 +++---
pom.xml | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ae835274/archetypes/command/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/command/src/main/resources/archetype-resources/pom.xml b/archetypes/command/src/main/resources/archetype-resources/pom.xml
index 208f292..dd7077f 100644
--- a/archetypes/command/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/command/src/main/resources/archetype-resources/pom.xml
@@ -62,10 +62,10 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
- <version>2.3.2</version>
+ <version>3.5.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ae835274/demos/web/pom.xml
----------------------------------------------------------------------
diff --git a/demos/web/pom.xml b/demos/web/pom.xml
index e19ac5f..8954775 100644
--- a/demos/web/pom.xml
+++ b/demos/web/pom.xml
@@ -89,8 +89,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ae835274/manual/src/main/asciidoc/developer-guide/extending.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/developer-guide/extending.adoc b/manual/src/main/asciidoc/developer-guide/extending.adoc
index 809b1ec..21c05eb 100644
--- a/manual/src/main/asciidoc/developer-guide/extending.adoc
+++ b/manual/src/main/asciidoc/developer-guide/extending.adoc
@@ -112,7 +112,7 @@ Alternatively, you can simply create the directory `shell-sample-commands` and c
</project>
----
-===== Configuring for Java 6/7
+===== Configuring for Java 8
We are using annotations to define commands, so we need to ensure Maven will actually use JDK 1.6 or 1.7 to compile the jar.
Just add the following snippet after the `dependencies` section.
@@ -124,8 +124,8 @@ Just add the following snippet after the `dependencies` section.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <target>1.6</target>
- <source>1.6</source>
+ <target>1.8</target>
+ <source>1.8</source>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ae835274/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b6f9b00..af16e28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1759,7 +1759,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>