You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2021/09/19 13:57:04 UTC
[myfaces-build-tools] branch master updated: Upgrade to JDK6
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-build-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 8a56259 Upgrade to JDK6
new fa9bf3e Merge pull request #11 from melloware/JDK6
8a56259 is described below
commit 8a5625914fe68c175b34db5561759f1966b3bd36
Author: melloware <me...@gmail.com>
AuthorDate: Sun Sep 19 08:27:13 2021 -0400
Upgrade to JDK6
---
maven2-plugins/myfaces-builder-annotations/pom.xml | 6 +++---
maven2-plugins/myfaces-faces-plugin/pom.xml | 4 ++--
maven2-plugins/myfaces-i18n-plugin/pom.xml | 4 ++--
maven2-plugins/myfaces-javacc-plugin/pom.xml | 19 +++++++++++++++++++
maven2-plugins/myfaces-javascript-plugin/pom.xml | 4 ++--
maven2-plugins/myfaces-jdev-plugin/pom.xml | 19 +++++++++++++++++++
maven2-plugins/myfaces-jsdoc-plugin/pom.xml | 4 ++--
maven2-plugins/myfaces-plugin-parent/pom.xml | 2 +-
maven2-plugins/myfaces-tagdoc-plugin/pom.xml | 4 ++--
maven2-plugins/myfaces-wagon-plugin/pom.xml | 17 +++++++++++++++++
maven2-plugins/myfaces-xrts-plugin/pom.xml | 4 ++--
maven2-plugins/pom.xml | 19 +++++++++++++++++++
12 files changed, 90 insertions(+), 16 deletions(-)
diff --git a/maven2-plugins/myfaces-builder-annotations/pom.xml b/maven2-plugins/myfaces-builder-annotations/pom.xml
index e85c512..c42d64e 100644
--- a/maven2-plugins/myfaces-builder-annotations/pom.xml
+++ b/maven2-plugins/myfaces-builder-annotations/pom.xml
@@ -35,7 +35,7 @@
<name>Apache MyFaces Buildtools Maven2 Builder Annotations</name>
<description>
- A set of Java 1.5 Annotation classes that can be applied to classes that are
+ A set of Java 1.6 Annotation classes that can be applied to classes that are
intended to be JSF components, validators, etc. The maven-builder-plugin will
recognise these annotations and process the class appropriately.
</description>
@@ -53,8 +53,8 @@
<version>2.0.2</version>
<inherited>true</inherited>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
diff --git a/maven2-plugins/myfaces-faces-plugin/pom.xml b/maven2-plugins/myfaces-faces-plugin/pom.xml
index db5af37..4a92c71 100644
--- a/maven2-plugins/myfaces-faces-plugin/pom.xml
+++ b/maven2-plugins/myfaces-faces-plugin/pom.xml
@@ -51,8 +51,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
diff --git a/maven2-plugins/myfaces-i18n-plugin/pom.xml b/maven2-plugins/myfaces-i18n-plugin/pom.xml
index b712bc2..40e05ba 100644
--- a/maven2-plugins/myfaces-i18n-plugin/pom.xml
+++ b/maven2-plugins/myfaces-i18n-plugin/pom.xml
@@ -47,8 +47,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
diff --git a/maven2-plugins/myfaces-javacc-plugin/pom.xml b/maven2-plugins/myfaces-javacc-plugin/pom.xml
index 9f02445..075353a 100644
--- a/maven2-plugins/myfaces-javacc-plugin/pom.xml
+++ b/maven2-plugins/myfaces-javacc-plugin/pom.xml
@@ -68,6 +68,25 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </build>
+
<reporting>
<plugins>
<plugin>
diff --git a/maven2-plugins/myfaces-javascript-plugin/pom.xml b/maven2-plugins/myfaces-javascript-plugin/pom.xml
index e32b109..eb9971c 100644
--- a/maven2-plugins/myfaces-javascript-plugin/pom.xml
+++ b/maven2-plugins/myfaces-javascript-plugin/pom.xml
@@ -47,8 +47,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
diff --git a/maven2-plugins/myfaces-jdev-plugin/pom.xml b/maven2-plugins/myfaces-jdev-plugin/pom.xml
index 3977ee3..40aecaf 100644
--- a/maven2-plugins/myfaces-jdev-plugin/pom.xml
+++ b/maven2-plugins/myfaces-jdev-plugin/pom.xml
@@ -63,6 +63,25 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </build>
+
<reporting>
<plugins>
<plugin>
diff --git a/maven2-plugins/myfaces-jsdoc-plugin/pom.xml b/maven2-plugins/myfaces-jsdoc-plugin/pom.xml
index 7321305..6009f13 100644
--- a/maven2-plugins/myfaces-jsdoc-plugin/pom.xml
+++ b/maven2-plugins/myfaces-jsdoc-plugin/pom.xml
@@ -57,8 +57,8 @@
<version>2.0.2</version>
<inherited>true</inherited>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
diff --git a/maven2-plugins/myfaces-plugin-parent/pom.xml b/maven2-plugins/myfaces-plugin-parent/pom.xml
index b97f190..99476df 100644
--- a/maven2-plugins/myfaces-plugin-parent/pom.xml
+++ b/maven2-plugins/myfaces-plugin-parent/pom.xml
@@ -136,7 +136,7 @@
</rulesets>
<linkXref>true</linkXref>
<minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>1.6</targetJdk>
</configuration>
-->
</plugin>
diff --git a/maven2-plugins/myfaces-tagdoc-plugin/pom.xml b/maven2-plugins/myfaces-tagdoc-plugin/pom.xml
index 2c7e029..3fa13f6 100644
--- a/maven2-plugins/myfaces-tagdoc-plugin/pom.xml
+++ b/maven2-plugins/myfaces-tagdoc-plugin/pom.xml
@@ -47,8 +47,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
diff --git a/maven2-plugins/myfaces-wagon-plugin/pom.xml b/maven2-plugins/myfaces-wagon-plugin/pom.xml
index 97733be..65146f2 100644
--- a/maven2-plugins/myfaces-wagon-plugin/pom.xml
+++ b/maven2-plugins/myfaces-wagon-plugin/pom.xml
@@ -50,6 +50,22 @@
<version>1.0-alpha-5</version>
</extension>
</extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<dependency>
@@ -83,6 +99,7 @@
</snapshotRepository>
</distributionManagement>
+
<reporting>
<plugins>
<plugin>
diff --git a/maven2-plugins/myfaces-xrts-plugin/pom.xml b/maven2-plugins/myfaces-xrts-plugin/pom.xml
index 47592f3..ca53f6f 100644
--- a/maven2-plugins/myfaces-xrts-plugin/pom.xml
+++ b/maven2-plugins/myfaces-xrts-plugin/pom.xml
@@ -48,8 +48,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
<showWarnings>true</showWarnings>
<compilerArgument>-Xlint:all,-serial,-fallthrough</compilerArgument>
</configuration>
diff --git a/maven2-plugins/pom.xml b/maven2-plugins/pom.xml
index b2dfa32..c515af4 100644
--- a/maven2-plugins/pom.xml
+++ b/maven2-plugins/pom.xml
@@ -68,4 +68,23 @@
<module>myfaces-xrts-plugin</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </build>
+
</project>