JAMES-1852 JDKIM should not be a child of james-project
Project: http://git-wip-us.apache.org/repos/asf/james-jdkim/repo Commit: http://git-wip-us.apache.org/repos/asf/james-jdkim/commit/3d8a6181 Tree: http://git-wip-us.apache.org/repos/asf/james-jdkim/tree/3d8a6181 Diff: http://git-wip-us.apache.org/repos/asf/james-jdkim/diff/3d8a6181 Branch: refs/heads/master Commit: 3d8a6181f8a0b83258bb2095ba008581917aeee1 Parents: 82a37d5 Author: benwa <btell...@linagora.com> Authored: Thu Oct 27 13:03:13 2016 +0200 Committer: benwa <btell...@linagora.com> Committed: Wed May 3 15:17:54 2017 +0700 ---------------------------------------------------------------------- mailets/pom.xml | 1 - main/pom.xml | 24 ----------------------- pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 52 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-jdkim/blob/3d8a6181/mailets/pom.xml ---------------------------------------------------------------------- diff --git a/mailets/pom.xml b/mailets/pom.xml index 7481030..afa6cc7 100644 --- a/mailets/pom.xml +++ b/mailets/pom.xml @@ -28,7 +28,6 @@ <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.apache.james.jdkim</groupId> <artifactId>apache-jdkim-mailets</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/james-jdkim/blob/3d8a6181/main/pom.xml ---------------------------------------------------------------------- diff --git a/main/pom.xml b/main/pom.xml index fe54be7..850e0c1 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -103,30 +103,6 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <excludes> - <!-- test resources created by JAMES committers / we can't include ALv2 headers there --> - <exclude>src/test/resources/org/apache/james/jdkim/corpus/*</exclude> - <exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/FAKE_DNS.dat</exclude> - <!-- 3rd party resources described in NOTICE: see the maven-remote-resources-plugin - configuration, in this file --> - <exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/corpus/*</exclude> - <!-- maven / IDE artifacts created during build --> - <exclude>release.properties</exclude> - <exclude>dependency-reduced-pom.xml</exclude> - <exclude>nbactions.xml</exclude> - <exclude>**/.*/**/*</exclude> - </excludes> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> </plugin> <!-- Add NOTICE and LICENSE to generated JAR --> <plugin> http://git-wip-us.apache.org/repos/asf/james-jdkim/blob/3d8a6181/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 49cc1f8..c66ce2a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,9 +22,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.james</groupId> - <artifactId>james-project</artifactId> - <version>3.0.0-beta5-SNAPSHOT</version> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>18</version> + <relativePath/> </parent> <groupId>org.apache.james.jdkim</groupId> @@ -71,6 +72,7 @@ <not-yet-commons-ssl.version>0.3.11</not-yet-commons-ssl.version> <apache-mime4j.version>0.8.0-SNAPSHOT</apache-mime4j.version> <log4j.version>1.2.16</log4j.version> + <target.jdk>1.6</target.jdk> </properties> <dependencyManagement> @@ -237,6 +239,53 @@ <extensions>true</extensions> <version>2.3.7</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.0</version> + <configuration> + <optimize>true</optimize> + <source>${target.jdk}</source> + <target>${target.jdk}</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>0.8</version> + <configuration> + <excludes> + <exclude>BUILDING.*</exclude> + <exclude>HOWTO.*</exclude> + <exclude>HOWTO_*</exclude> + <exclude>LICENSE.*</exclude> + <exclude>NOTICE.*</exclude> + <!-- site resources --> + <exclude>src/site/resources/download*.cgi</exclude> + <exclude>src/site/resources/downloads/formatting.xml</exclude> + <exclude>src/site/resources/js/galleria/**</exclude> + <exclude>src/site/resources/model-eclipse-modeler/*</exclude> + <exclude>src/site/resources/robots.txt</exclude> + <!-- Generated by Maven --> + <exclude>release.properties</exclude> + <exclude>dist/**/*</exclude> + <exclude>**/derby.log</exclude> + <!-- Eclipse --> + <exclude>**/.*</exclude> + <exclude>.*/**/*</exclude> + <!-- Schemas for offline use --> + <exclude>**/META-INF/XSD/activemq-core-*.xsd</exclude> + <exclude>**/META-INF/XSD/camel-spring-*.xsd</exclude> + <exclude>**/META-INF/XSD/spring-beans-*.xsd</exclude> + <!-- test resources created by JAMES committers / we can't include ALv2 headers there --> + <exclude>src/test/resources/org/apache/james/jdkim/corpus/*</exclude> + <exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/FAKE_DNS.dat</exclude> + <!-- 3rd party resources described in NOTICE: see the maven-remote-resources-plugin + configuration, in this file --> + <exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/corpus/*</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
