You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/12/16 22:32:18 UTC
[1/2] cxf-fediz git commit: Simplifying the build structure a bit
Repository: cxf-fediz
Updated Branches:
refs/heads/1.2.x-fixes 8399a50cb -> 3a534c1c5
Simplifying the build structure a bit
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/088741ca
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/088741ca
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/088741ca
Branch: refs/heads/1.2.x-fixes
Commit: 088741caeb5fa0a3376fa9a54ab7e6fdce679aef
Parents: 8399a50
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Dec 16 20:07:23 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Dec 16 21:31:44 2015 +0000
----------------------------------------------------------------------
pom.xml | 92 +++-----------------
.../apache/cxf/fediz/systests/idp/IdpTest.java | 21 ++---
.../fediz/integrationtests/AbstractTests.java | 2 +
3 files changed, 23 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/088741ca/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0a7a610..597737f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -333,6 +333,9 @@
<maxmem>256M</maxmem>
<fork>${cxf.compiler.fork}</fork>
<encoding>UTF-8</encoding>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <compilerArgument>${fediz.compile.flags}</compilerArgument>
</configuration>
</plugin>
<plugin>
@@ -700,6 +703,13 @@
<version>1.0-beta-3</version>
</dependency>
</dependencies>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -750,36 +760,6 @@
</build>
</profile>
<profile>
- <id>jdk17</id>
- <activation>
- <jdk>1.7</jdk>
- </activation>
- <properties>
- <jdk.version>1.6</jdk.version>
- </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>${fediz.compile.show.deprecation}</showDeprecation>
- <showWarnings>true</showWarnings>
- <compilerArgument>${fediz.compile.flags}</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>jdk18</id>
<activation>
<jdk>1.8</jdk>
@@ -816,36 +796,6 @@
<checkstyle.skip>true</checkstyle.skip>
</properties>
</profile>
-
- <profile>
- <!-- default profile enables checkstyle and Xlint stuff -->
- <id>sourcecheck</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <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>
- <version>3.3</version>
- <configuration>
- <showDeprecation>${fediz.compile.show.deprecation}</showDeprecation>
- <showWarnings>true</showWarnings>
- <compilerArgument>${fediz.compile.flags}</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>set.eclipse.output</id>
<properties>
@@ -859,28 +809,6 @@
<properties>
<maven.test.skip.exec>true</maven.test.skip.exec>
</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>
- <version>3.3</version>
- <configuration>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <compilerArgument>${fediz.compile.flags}</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/088741ca/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
----------------------------------------------------------------------
diff --git a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
index 752913d..a7edf44 100644
--- a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
+++ b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
@@ -23,6 +23,17 @@ import java.io.File;
import java.io.FileInputStream;
import java.net.URLEncoder;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.DomElement;
+import com.gargoylesoftware.htmlunit.html.DomNodeList;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.xml.XmlPage;
+
import org.apache.catalina.LifecycleState;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
@@ -37,16 +48,6 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.DomElement;
-import com.gargoylesoftware.htmlunit.html.DomNodeList;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.xml.XmlPage;
/**
* Some tests invoking directly on the IdP
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/088741ca/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
index c636aeb..2ccbcbc 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
@@ -19,6 +19,8 @@
package org.apache.cxf.fediz.integrationtests;
+import java.net.URLEncoder;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
[2/2] cxf-fediz git commit: Fixing build with JDK8
Posted by co...@apache.org.
Fixing build with JDK8
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/3a534c1c
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/3a534c1c
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/3a534c1c
Branch: refs/heads/1.2.x-fixes
Commit: 3a534c1c50dd237a608bfa2be8b7846dd04af63e
Parents: 088741c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Dec 16 21:32:05 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Dec 16 21:32:05 2015 +0000
----------------------------------------------------------------------
systests/jetty8/pom.xml | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3a534c1c/systests/jetty8/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jetty8/pom.xml b/systests/jetty8/pom.xml
index f56bed2..bf1e594 100644
--- a/systests/jetty8/pom.xml
+++ b/systests/jetty8/pom.xml
@@ -232,4 +232,30 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <!-- Skip Jetty8 tests if we are using JDK8 -->
+ <profile>
+ <id>jdk18</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <excludes>
+ <exclude>**/integrationtests/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>