You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/09/17 19:07:04 UTC
[juneau] branch master updated: Upgrade parent pom to Apache 21.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 2bcfd0c Upgrade parent pom to Apache 21.
2bcfd0c is described below
commit 2bcfd0c80fe185beac65cb1089fc5c8f0b3a0ae5
Author: JamesBognar <ja...@apache.org>
AuthorDate: Mon Sep 17 15:02:27 2018 -0400
Upgrade parent pom to Apache 21.
---
.../juneau-marshall/.settings/org.eclipse.core.resources.prefs | 1 +
juneau-examples/juneau-examples-rest/pom.xml | 2 +-
juneau-microservice/juneau-microservice-test/.classpath | 2 +-
.../juneau-all/bin/.settings/org.eclipse.core.resources.prefs | 2 --
juneau-releng/juneau-all/bin/.settings/org.eclipse.jdt.core.prefs | 5 -----
juneau-releng/juneau-all/bin/pom.xml | 4 ++--
juneau-releng/juneau-all/pom.xml | 2 +-
juneau-rest/juneau-rest-server/.classpath | 6 +++++-
.../juneau-rest-server/.settings/org.eclipse.core.resources.prefs | 1 +
pom.xml | 2 +-
10 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/juneau-core/juneau-marshall/.settings/org.eclipse.core.resources.prefs b/juneau-core/juneau-marshall/.settings/org.eclipse.core.resources.prefs
index abdea9a..839d647 100644
--- a/juneau-core/juneau-marshall/.settings/org.eclipse.core.resources.prefs
+++ b/juneau-core/juneau-marshall/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
diff --git a/juneau-examples/juneau-examples-rest/pom.xml b/juneau-examples/juneau-examples-rest/pom.xml
index 984ec51..e413f67 100644
--- a/juneau-examples/juneau-examples-rest/pom.xml
+++ b/juneau-examples/juneau-examples-rest/pom.xml
@@ -114,7 +114,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.3</version>
+ <!--version>2.4.3</version-->
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<minimizeJar>false</minimizeJar>
diff --git a/juneau-microservice/juneau-microservice-test/.classpath b/juneau-microservice/juneau-microservice-test/.classpath
index d496ea1..644b8f9 100644
--- a/juneau-microservice/juneau-microservice-test/.classpath
+++ b/juneau-microservice/juneau-microservice-test/.classpath
@@ -17,7 +17,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
diff --git a/juneau-releng/juneau-all/bin/.settings/org.eclipse.core.resources.prefs b/juneau-releng/juneau-all/bin/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/juneau-releng/juneau-all/bin/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/juneau-releng/juneau-all/bin/.settings/org.eclipse.jdt.core.prefs b/juneau-releng/juneau-all/bin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ec4300d..0000000
--- a/juneau-releng/juneau-all/bin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/juneau-releng/juneau-all/bin/pom.xml b/juneau-releng/juneau-all/bin/pom.xml
index b69e56e..b88b559 100644
--- a/juneau-releng/juneau-all/bin/pom.xml
+++ b/juneau-releng/juneau-all/bin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-releng</artifactId>
- <version>7.0.1-SNAPSHOT</version>
+ <version>7.2.0-SNAPSHOT</version>
</parent>
<artifactId>juneau-all</artifactId>
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.3</version>
+ <!--version>2.4.3</version-->
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
diff --git a/juneau-releng/juneau-all/pom.xml b/juneau-releng/juneau-all/pom.xml
index bb43e3a..b88b559 100644
--- a/juneau-releng/juneau-all/pom.xml
+++ b/juneau-releng/juneau-all/pom.xml
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.3</version>
+ <!--version>2.4.3</version-->
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
diff --git a/juneau-rest/juneau-rest-server/.classpath b/juneau-rest/juneau-rest-server/.classpath
index 86d7df8..58364e7 100644
--- a/juneau-rest/juneau-rest-server/.classpath
+++ b/juneau-rest/juneau-rest-server/.classpath
@@ -17,7 +17,11 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path="src/test/resources"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
diff --git a/juneau-rest/juneau-rest-server/.settings/org.eclipse.core.resources.prefs b/juneau-rest/juneau-rest-server/.settings/org.eclipse.core.resources.prefs
index 839d647..29abf99 100644
--- a/juneau-rest/juneau-rest-server/.settings/org.eclipse.core.resources.prefs
+++ b/juneau-rest/juneau-rest-server/.settings/org.eclipse.core.resources.prefs
@@ -2,4 +2,5 @@ eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
diff --git a/pom.xml b/pom.xml
index ef0e225..d618eb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>21</version>
</parent>
<properties>