Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge branch 'master' into multi-file-upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidmason
davidmason committed Aug 6, 2014
2 parents ed23803 + d82b111 commit 1bc2358
Show file tree
Hide file tree
Showing 76 changed files with 605 additions and 402 deletions.
21 changes: 4 additions & 17 deletions functional-test/pom.xml
View file
Expand Up @@ -222,6 +222,10 @@
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -764,23 +768,6 @@
</excludes>
<searchTransitive>true</searchTransitive>
</bannedDependencies>
<banDuplicateClasses>
<dependencies combine.children="append">
<!-- multiple versions in the dependency tree -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-remote-naming</artifactId>
<ignoreClasses>
<ignoreClass>org.jboss.naming.remote.*</ignoreClass>
</ignoreClasses>
</dependency>
</dependencies>
<ignoreClasses combine.children="append">
<!-- multiple versions of selenium artifacts in the dependency tree -->
<ignoreClass>com.thoughtworks.selenium.*</ignoreClass>
<ignoreClass>org.openqa.selenium.*</ignoreClass>
</ignoreClasses>
</banDuplicateClasses>
</rules>
</configuration>
</plugin>
Expand Down
86 changes: 26 additions & 60 deletions pom.xml
View file
Expand Up @@ -129,6 +129,18 @@
<scope>import</scope>
</dependency>

<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.2</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand All @@ -147,6 +159,16 @@
<groupId>org.zanata</groupId>
<artifactId>zanata-common-api</artifactId>
<version>${zanata.api.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- zanata common -->
Expand Down Expand Up @@ -484,6 +506,10 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
Expand Down Expand Up @@ -707,66 +733,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<rules>
<banDuplicateClasses>
<dependencies combine.children="append">
<!-- multiple versions in the dependency tree -->
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<ignoreClasses>
<ignoreClass>com.beust.jcommander.*</ignoreClass>
</ignoreClasses>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<ignoreClasses>
<ignoreClass>org.apache.*</ignoreClass>
</ignoreClasses>
</dependency>
<!-- multiple versions in the dependency tree -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<ignoreClasses>
<ignoreClass>org.apache.commons.fileupload.*</ignoreClass>
</ignoreClasses>
</dependency>
<!-- multiple versions in the dependency tree -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven*</artifactId>
<ignoreClasses>
<ignoreClass>org.apache.maven.*</ignoreClass>
</ignoreClasses>
</dependency>
<!-- multiple versions in the dependency tree -->
<dependency>
<groupId>org.picketbox</groupId>
<artifactId>picketbox</artifactId>
<ignoreClasses>
<ignoreClass>org.picketbox.*</ignoreClass>
<ignoreClass>org.jboss.*</ignoreClass>
</ignoreClasses>
</dependency>
<!-- multiple versions in the dependency tree -->
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
<ignoreClasses>
<ignoreClass>net.sf.ehcache.*</ignoreClass>
</ignoreClasses>
</dependency>
<!-- lombok is "provided", so these duplicate classes don't get deployed -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<ignoreClasses>
<ignoreClass>com.sun.jna.*</ignoreClass>
</ignoreClasses>
</dependency>
</dependencies>
</banDuplicateClasses>
<requireNoRepositories>
<allowedRepositories combine.children="append">
<allowedRepository>jboss-public-repository-group</allowedRepository>
Expand Down
135 changes: 71 additions & 64 deletions zanata-war/pom.xml
View file
Expand Up @@ -144,18 +144,10 @@
<usedDependency>antlr:antlr</usedDependency>
<!-- required for guava in gwt -->
<usedDependency>com.google.guava:guava-gwt</usedDependency>
<!-- used for org.hibernate:hibernate-validator -->
<usedDependency>com.ibm.icu:icu4j</usedDependency>
<!-- Used by org.zanata.util.HashUtil.md5Hex -->
<usedDependency>commons-codec:commons-codec</usedDependency>
<!-- used by jboss-as-parent-7.2.0.Final.pom -->
<usedDependency>commons-collections:commons-collections</usedDependency>
<!-- Used for StringUtils lib -->
<usedDependency>commons-lang:commons-lang</usedDependency>
<!-- Needed by ui rendering on runtime -->
<usedDependency>javax.el:el-api</usedDependency>
<usedDependency>javax.servlet.jsp:jsp-api</usedDependency>
<usedDependency>org.richfaces.core:richfaces-core-impl</usedDependency>
<usedDependency>com.sun.faces:jsf-impl</usedDependency>
<!-- Used for different content analyzers based on langugage for search. -->
<usedDependency>org.apache.solr:solr-core</usedDependency>
Expand Down Expand Up @@ -213,53 +205,45 @@
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.ning.maven.plugins</groupId>
<artifactId>maven-duplicate-finder-plugin</artifactId>
<configuration>
<rules>
<banDuplicateClasses>
<ignoreClasses combine.children="append">
<!-- TODO remove exclusions as offending jars are fixed or removed -->

<!-- caused by gwt jars -->
<!-- https://code.google.com/p/google-web-toolkit/issues/detail?id=4484 -->
<ignoreClass>com.google.common.*</ignoreClass>
<ignoreClass>com.google.gwt.*</ignoreClass>
<ignoreClass>com.google.web.bindery.*</ignoreClass>
<ignoreClass>com.ibm.icu.*</ignoreClass>
<ignoreClass>com.steadystate.css.*</ignoreClass>
<ignoreClass>javax.annotation.*</ignoreClass>
<ignoreClass>javax.servlet.*</ignoreClass>
<ignoreClass>javax.servlet.jsp.*</ignoreClass>
<ignoreClass>javax.validation.ConstraintViolationException_CustomFieldSerializer</ignoreClass>
<ignoreClass>javax.xml.*</ignoreClass>
<ignoreClass>org.apache.commons.beanutils.*</ignoreClass>
<ignoreClass>org.apache.commons.codec.*</ignoreClass>
<ignoreClass>org.apache.commons.collections.*</ignoreClass>
<ignoreClass>org.apache.commons.io.*</ignoreClass>
<ignoreClass>org.apache.commons.lang.*</ignoreClass>
<ignoreClass>org.apache.commons.logging.*</ignoreClass>
<ignoreClass>org.apache.html.*</ignoreClass>
<ignoreClass>org.apache.http.*</ignoreClass>
<ignoreClass>org.apache.james.mime4j.*</ignoreClass>
<ignoreClass>org.apache.regexp.*</ignoreClass>
<ignoreClass>org.apache.wml.*</ignoreClass>
<ignoreClass>org.apache.xerces.*</ignoreClass>
<ignoreClass>org.apache.xml.*</ignoreClass>
<ignoreClass>org.apache.xmlcommons.Version</ignoreClass>
<ignoreClass>org.cyberneko.html.*</ignoreClass>
<ignoreClass>org.hibernate.validator.*</ignoreClass>
<ignoreClass>org.w3c.css.sac.*</ignoreClass>
<ignoreClass>org.w3c.dom.*</ignoreClass>
<ignoreClass>org.xml.sax.*</ignoreClass>

<!-- Caused by arquillian -->
<ignoreClass>org.osgi.util.*</ignoreClass>
<!-- Caused by differing IDs for JDK_HOME/tools.jar -->
<ignoreClass>com.sun.tools.*</ignoreClass>
<ignoreClass>sun.*</ignoreClass>
</ignoreClasses>
</banDuplicateClasses>
</rules>
<ignoredDependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
</dependency>
</ignoredDependencies>
<ignoredResources>
<!-- iText and JavaMelody -->
<ignoredResource>com/lowagie/text/pdf/fonts/cmap_info.txt</ignoredResource>
<!-- Seam -->
<ignoredResource>META-INF/components.xml</ignoredResource>
<!-- Seam and RichFaces -->
<ignoredResource>META-INF/faces-config.xml</ignoredResource>
<!-- any mail provider will need this -->
<ignoredResource>META-INF/javamail.providers</ignoredResource>
<!-- RichFaces 4.3 -->
<ignoredResource>META-INF/richfaces/resource-mappings.properties</ignoredResource>
<!-- Seam -->
<ignoredResource>META-INF/seam-deployment.properties</ignoredResource>
<!-- drools and quartz -->
<ignoredResource>build.properties</ignoredResource>
<!-- Seam -->
<ignoredResource>seam.properties</ignoredResource>
</ignoredResources>
</configuration>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
Expand Down Expand Up @@ -1154,12 +1138,6 @@
</dependency>

<!-- GWT Dependencies -->
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
Expand All @@ -1172,6 +1150,22 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.gwt.gwtmockito</groupId>
<artifactId>gwtmockito</artifactId>
<version>1.1.3</version>
<exclusions>
<exclusion>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
</exclusion>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
Expand Down Expand Up @@ -1223,6 +1217,10 @@
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</exclusion>
<exclusion>
<artifactId>jcip-annotations</artifactId>
<groupId>net.jcip</groupId>
Expand Down Expand Up @@ -1361,7 +1359,6 @@
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-components-ui</artifactId>
</dependency>

<dependency>
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-impl</artifactId>
Expand Down Expand Up @@ -1521,6 +1518,12 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-gwt</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand Down Expand Up @@ -1631,8 +1634,8 @@
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -1674,8 +1677,8 @@
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>jboss-annotations-api_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -2024,6 +2027,10 @@
<artifactId>classloader-leak-prevention</artifactId>
<version>1.9.3</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
Expand Down

0 comments on commit 1bc2358

Please sign in to comment.