Repository: cxf-fediz Updated Branches: refs/heads/master eccd097ab -> 58701747d
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/58701747 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/58701747 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/58701747 Branch: refs/heads/master Commit: 58701747d1d0171f857790736218bc64e6d5f402 Parents: eccd097 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Dec 16 20:07:23 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Dec 16 20:07:23 2015 +0000 ---------------------------------------------------------------------- pom.xml | 98 +++----------------- .../apache/cxf/fediz/systests/idp/IdpTest.java | 21 +++-- .../fediz/integrationtests/AbstractTests.java | 4 +- 3 files changed, 26 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/58701747/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8a86875..7561533 100644 --- a/pom.xml +++ b/pom.xml @@ -334,6 +334,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> @@ -658,6 +661,16 @@ </plugin> </plugins> </pluginManagement> + <plugins> + <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> <profiles> @@ -707,37 +720,6 @@ </build> </profile> <profile> - <id>jdk17</id> - <activation> - <jdk>1.7</jdk> - </activation> - <properties> - <jdk.version>1.7</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> - <encoding>UTF-8</encoding> - </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> @@ -774,37 +756,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> - <encoding>UTF-8</encoding> - </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> @@ -818,29 +769,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> - <encoding>UTF-8</encoding> - </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/58701747/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 3138cb5..954f75b 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/58701747/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 c8c7df2..baa4ee0 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; @@ -33,8 +35,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; import com.gargoylesoftware.htmlunit.xml.XmlPage; -import java.net.URLEncoder; - import org.apache.cxf.fediz.core.ClaimTypes; import org.apache.cxf.fediz.core.FederationConstants; import org.apache.cxf.fediz.core.util.DOMUtils;
