You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2015/11/06 17:48:43 UTC
cxf git commit: More pom/profile work
Repository: cxf
Updated Branches:
refs/heads/master 57ac08948 -> 0d4cd0bbc
More pom/profile work
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0d4cd0bb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0d4cd0bb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0d4cd0bb
Branch: refs/heads/master
Commit: 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9
Parents: 57ac089
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Nov 6 11:48:27 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Nov 6 11:48:27 2015 -0500
----------------------------------------------------------------------
parent/pom.xml | 45 +--------------------------------------------
pom.xml | 5 +++--
2 files changed, 4 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0d4cd0bb/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 84df93e..e678538 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,7 +40,7 @@
<cxf.compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</cxf.compile.flags>
<cxf.compile.show.deprecation>true</cxf.compile.show.deprecation>
<cxf.codegenplugin.forkmode>once</cxf.codegenplugin.forkmode>
- <cxf.codegen.jvmArgs />
+ <cxf.codegen.jvmArgs>-Djavax.xml.accessExternalSchema=file</cxf.codegen.jvmArgs>
<cxf.eclipse.outputDirectory>${basedir}/target/classes</cxf.eclipse.outputDirectory>
<!-- stuff related to ASM -->
<cxf.asm.groupId>org.ow2.asm</cxf.asm.groupId>
@@ -1801,49 +1801,6 @@
</dependencyManagement>
<profiles>
<profile>
- <id>jdk18</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <properties>
- <cxf.codegen.jvmArgs>-Djavax.xml.accessExternalSchema=file</cxf.codegen.jvmArgs>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>${cxf.compile.show.deprecation}</showDeprecation>
- <showWarnings>true</showWarnings>
- <compilerArgument>${cxf.compile.flags}</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalJOptions>
- <additionalJOption>-Xdoclint:none</additionalJOption>
- </additionalJOptions>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
<id>validateServices</id>
<properties>
<cxf.validateServices>true</cxf.validateServices>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0d4cd0bb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 13d8a70..e1fad1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -459,13 +459,14 @@
<version>2.10.3</version>
<configuration>
<attach>true</attach>
- <source>1.7</source>
+ <source>${cxf.jdk.version}</source>
<quiet>true</quiet>
<bottom>Apache CXF</bottom>
- <javadocVersion>1.7</javadocVersion>
+ <javadocVersion>${cxf.jdk.version}</javadocVersion>
<encoding>UTF-8</encoding>
<detectOfflineLinks>false</detectOfflineLinks>
<notimestamp>true</notimestamp>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
<!--subpackages>org.apache.cxf</subpackages-->
</configuration>
</plugin>