Author: dkulp
Date: Fri Nov 16 17:00:23 2012
New Revision: 1410470
URL: http://svn.apache.org/viewvc?rev=1410470&view=rev
Log:
Merged revisions 1410438 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1410438 | dkulp | 2012-11-16 11:31:40 -0500 (Fri, 16 Nov 2012) | 2 lines
Remove an unused property
........
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/oauth/client/pom.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/oauth/server/pom.xml
cxf/branches/2.6.x-fixes/parent/pom.xml
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/oauth/client/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/oauth/client/pom.xml?rev=1410470&r1=1410469&r2=1410470&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/oauth/client/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/oauth/client/pom.xml
Fri Nov 16 17:00:23 2012
@@ -34,14 +34,6 @@
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${jdk.version}</source>
- <target>${jdk.version}</target>
- </configuration>
- </plugin>
</plugins>
</build>
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/oauth/server/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/oauth/server/pom.xml?rev=1410470&r1=1410469&r2=1410470&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/oauth/server/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/oauth/server/pom.xml
Fri Nov 16 17:00:23 2012
@@ -33,14 +33,6 @@
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${jdk.version}</source>
- <target>${jdk.version}</target>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1410470&r1=1410469&r2=1410470&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Fri Nov 16 17:00:23 2012
@@ -1544,7 +1544,6 @@
<cxf.jaxb.version>${cxf.jaxb22.version}</cxf.jaxb.version>
<cxf.jaxb.impl.version>${cxf.jaxb22.impl.version}</cxf.jaxb.impl.version>
<cxf.jaxb.xjc.version>${cxf.jaxb22.impl.version}</cxf.jaxb.xjc.version>
- <jdk.version>1.6</jdk.version>
</properties>
<build>
<plugins>
