You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/03/16 10:09:54 UTC
[maven-archetype] 01/02: [ARCHETYPE-560] Require Java 7
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch ARCHETYPE-560
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit 9f548e8fa656a776ee6ecb5a8ce2ad4e6b1baba1
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Mar 15 23:21:55 2019 +0100
[ARCHETYPE-560] Require Java 7
---
maven-archetype-plugin/pom.xml | 2 ++
maven-archetype-plugin/src/it/projects/build-and-run-its/pom.xml | 4 +++-
maven-archetype-plugin/src/it/projects/build-archetype/pom.xml | 4 +++-
maven-archetype-plugin/src/it/projects/build-ignore-eol/pom.xml | 4 +++-
pom.xml | 3 ++-
5 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
index d3435ba..98cbaaf 100644
--- a/maven-archetype-plugin/pom.xml
+++ b/maven-archetype-plugin/pom.xml
@@ -233,6 +233,8 @@
<archetype-repo.proxy.url>${archetype-repo.proxy.url}</archetype-repo.proxy.url>
</filterProperties>
<properties>
+ <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+ <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
<!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
<https.protocols>${https.protocols}</https.protocols>
</properties>
diff --git a/maven-archetype-plugin/src/it/projects/build-and-run-its/pom.xml b/maven-archetype-plugin/src/it/projects/build-and-run-its/pom.xml
index 4261595..c1c3b67 100644
--- a/maven-archetype-plugin/src/it/projects/build-and-run-its/pom.xml
+++ b/maven-archetype-plugin/src/it/projects/build-and-run-its/pom.xml
@@ -54,7 +54,9 @@ under the License.
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<ignoreEOLStyle>true</ignoreEOLStyle>
<properties>
- <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+ <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+ <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+ <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
<https.protocols>${https.protocols}</https.protocols>
</properties>
</configuration>
diff --git a/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml b/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml
index 37f7aef..10970b9 100644
--- a/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml
+++ b/maven-archetype-plugin/src/it/projects/build-archetype/pom.xml
@@ -55,7 +55,9 @@ under the License.
<localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
<ignoreEOLStyle>true</ignoreEOLStyle>
<properties>
- <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+ <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+ <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+ <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
<https.protocols>${https.protocols}</https.protocols>
</properties>
</configuration>
diff --git a/maven-archetype-plugin/src/it/projects/build-ignore-eol/pom.xml b/maven-archetype-plugin/src/it/projects/build-ignore-eol/pom.xml
index ae35464..004fb4d 100644
--- a/maven-archetype-plugin/src/it/projects/build-ignore-eol/pom.xml
+++ b/maven-archetype-plugin/src/it/projects/build-ignore-eol/pom.xml
@@ -57,7 +57,9 @@ under the License.
<settingsFile>${basedir}/test-settings.xml</settingsFile>
<localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
<properties>
- <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+ <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+ <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+ <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
<https.protocols>${https.protocols}</https.protocols>
</properties>
</configuration>
diff --git a/pom.xml b/pom.xml
index d74ecce..80c54ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,9 +75,10 @@
<properties>
<maven.archetype.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-archetype.git</maven.archetype.scm.devConnection>
<mavenVersion>3.0</mavenVersion>
+ <javaVersion>7</javaVersion>
<netbeans.hint.useExternalMaven>true</netbeans.hint.useExternalMaven>
<wagonVersion>2.8</wagonVersion>
- <surefire.version>2.22.1</surefire.version>
+ <surefire.version>2.21.0</surefire.version>
<maven.site.path>archetype-archives/archetype-LATEST</maven.site.path>
</properties>