You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/09/14 09:12:02 UTC

[40/43] incubator-joshua git commit: Merge branch 'master' into 7

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/ff9af37e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 9863027,feb676e..c80584d
--- a/pom.xml
+++ b/pom.xml
@@@ -134,33 -119,170 +134,51 @@@
      <pluginManagement>
        <plugins>
          <plugin>
 -          <groupId>org.codehaus.mojo</groupId>
 -          <artifactId>findbugs-maven-plugin</artifactId>
 -          <version>${findbugs.version}</version>
 +          <artifactId>maven-compiler-plugin</artifactId>
            <configuration>
 -            <xmlOutput>true</xmlOutput>
 -            <effort>Max</effort>
 -            <failOnError>true</failOnError>
 -            <includeTests>true</includeTests>
 -            <maxRank>16</maxRank>
 +            <source>1.8</source>
 +            <target>1.8</target>
            </configuration>
          </plugin>
 +        <plugin>
 +          <groupId>org.apache.rat</groupId>
 +          <artifactId>apache-rat-plugin</artifactId>
 +          <executions>
 +            <execution>
 +              <phase>test</phase>
 +              <goals>
 +                <goal>check</goal>
 +              </goals>
 +              <configuration>
 +                <includes>
 +                  <include>src/main/java</include>
 +                  <include>src/main/resources</include>
 +                  <include>src/test/java</include>
 +                  <include>pom.xml</include>
 +                </includes>
 +              </configuration>
 +            </execution>
 +          </executions>
 +        </plugin>
        </plugins>
      </pluginManagement>
 -
+     <plugins>
+       <plugin>
+         <artifactId>maven-compiler-plugin</artifactId>
+         <configuration>
+           <source>1.8</source>
+           <target>1.8</target>
+         </configuration>
+       </plugin>
+       <plugin>
 -        <artifactId>maven-assembly-plugin</artifactId>
 -        <configuration>
 -          <archive>
 -            <manifest>
 -              <mainClass>org.apache.joshua.decoder.JoshuaDecoder</mainClass>
 -            </manifest>
 -          </archive>
 -          <descriptorRefs>
 -            <descriptorRef>jar-with-dependencies</descriptorRef>
 -          </descriptorRefs>
 -        </configuration>
 -      </plugin>
 -      <plugin>
 -        <artifactId>maven-surefire-plugin</artifactId>
 -        <version>2.19.1</version>
 -        <configuration>
 -          <forkMode>once</forkMode>
 -          <argLine>-Djava.library.path=${project.basedir}/lib</argLine>
 -        </configuration>
 -      </plugin>
 -      <plugin>
 -        <groupId>org.apache.rat</groupId>
 -        <artifactId>apache-rat-plugin</artifactId>
 -        <executions>
 -          <execution>
 -            <phase>test</phase>
 -            <goals>
 -              <goal>check</goal>
 -            </goals>
 -            <configuration>
 -              <includes>
 -                <include>src/main/java</include>
 -                <include>src/main/resources</include>
 -                <include>src/test/java</include>
 -                <include>pom.xml</include>
 -              </includes>
 -            </configuration>
 -          </execution>
 -        </executions>
 -      </plugin>
 -      <plugin>
 -        <groupId>org.codehaus.mojo</groupId>
 -        <artifactId>findbugs-maven-plugin</artifactId>
 -        <version>${findbugs.version}</version>
 -      </plugin>
 -      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+ 	      <artifactId>maven-eclipse-plugin</artifactId>
+ 	      <version>2.10</version>
+ 	      <configuration>
+           <workspace>${basedir}</workspace>
+           <workspaceCodeStylesURL>${basedir}/eclipse-codeformat.xml</workspaceCodeStylesURL>
+         </configuration>
+       </plugin>
+     </plugins>
    </build>
 -  <dependencies>
 -    <dependency>
 -      <groupId>edu.berkeley.nlp</groupId>
 -      <artifactId>berkeleylm</artifactId>
 -      <version>1.1.2</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>commons-cli</groupId>
 -      <artifactId>commons-cli</artifactId>
 -      <version>1.2</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>net.sf.jung</groupId>
 -      <artifactId>jung-algorithms</artifactId>
 -      <version>2.0</version>
 -      <optional>true</optional>
 -    </dependency>
 -    <dependency>
 -      <groupId>net.sf.jung</groupId>
 -      <artifactId>jung-api</artifactId>
 -      <version>2.0</version>
 -      <optional>true</optional>
 -    </dependency>
 -    <dependency>
 -      <groupId>net.sf.jung</groupId>
 -      <artifactId>jung-graph-impl</artifactId>
 -      <version>2.0</version>
 -      <optional>true</optional>
 -    </dependency>
 -    <dependency>
 -      <groupId>net.sf.jung</groupId>
 -      <artifactId>jung-visualization</artifactId>
 -      <version>2.0</version>
 -      <optional>true</optional>
 -    </dependency>
 -    <dependency>
 -      <groupId>com.google.guava</groupId>
 -      <artifactId>guava</artifactId>
 -      <version>19.0</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>com.google.code.gson</groupId>
 -      <artifactId>gson</artifactId>
 -      <version>2.5</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>args4j</groupId>
 -      <artifactId>args4j</artifactId>
 -      <version>2.0.29</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>org.slf4j</groupId>
 -      <artifactId>slf4j-api</artifactId>
 -      <version>${slf4j.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>org.slf4j</groupId>
 -      <artifactId>slf4j-log4j12</artifactId>
 -      <version>${slf4j.version}</version>
 -    </dependency>
 -
 -    <!-- Test Dependencies -->
 -    <dependency>
 -      <groupId>org.testng</groupId>
 -      <artifactId>testng</artifactId>
 -      <version>6.9.10</version>
 -      <scope>test</scope>
 -    </dependency>
 -    <dependency>
 -      <groupId>org.hamcrest</groupId>
 -      <artifactId>hamcrest-all</artifactId>
 -      <version>1.3</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>org.mockito</groupId>
 -      <artifactId>mockito-core</artifactId>
 -      <version>2.0.52-beta</version>
 -      <scope>test</scope>
 -    </dependency>
 -  </dependencies>
  </project>