Pom cleanup & versions
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c6304d46 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c6304d46 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c6304d46 Branch: refs/heads/tomee-1.7.x Commit: c6304d469619e400917b50c0e5fe8d64b13b025b Parents: f422b23 Author: AndyGee <[email protected]> Authored: Fri Feb 19 16:24:37 2016 +0100 Committer: AndyGee <[email protected]> Committed: Fri Feb 19 16:24:37 2016 +0100 ---------------------------------------------------------------------- examples/testing-security-2/pom.xml | 2 +- examples/testing-security-3/pom.xml | 2 +- examples/testing-security-4/pom.xml | 2 +- examples/testing-security/pom.xml | 2 +- pom.xml | 42 ++++++++++++++++++++------------ server/openejb-bonecp/pom.xml | 3 +-- 6 files changed, 31 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/c6304d46/examples/testing-security-2/pom.xml ---------------------------------------------------------------------- diff --git a/examples/testing-security-2/pom.xml b/examples/testing-security-2/pom.xml index 9f5e1d1..75dfc8f 100644 --- a/examples/testing-security-2/pom.xml +++ b/examples/testing-security-2/pom.xml @@ -25,7 +25,7 @@ <artifactId>testing-security-2</artifactId> <packaging>jar</packaging> <version>1.1.1-SNAPSHOT</version> - <name>OpenEJB :: Examples :: Testing Security</name> + <name>OpenEJB :: Examples :: Testing Security 2 Roles</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> http://git-wip-us.apache.org/repos/asf/tomee/blob/c6304d46/examples/testing-security-3/pom.xml ---------------------------------------------------------------------- diff --git a/examples/testing-security-3/pom.xml b/examples/testing-security-3/pom.xml index 2584245..06eb25f 100644 --- a/examples/testing-security-3/pom.xml +++ b/examples/testing-security-3/pom.xml @@ -25,7 +25,7 @@ <artifactId>testing-security-3</artifactId> <packaging>jar</packaging> <version>1.1.1-SNAPSHOT</version> - <name>OpenEJB :: Examples :: Testing Security Service Provider</name> + <name>OpenEJB :: Examples :: Testing Security 3 Service Provider</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> http://git-wip-us.apache.org/repos/asf/tomee/blob/c6304d46/examples/testing-security-4/pom.xml ---------------------------------------------------------------------- diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml index 5c0a56d..d52e75c 100644 --- a/examples/testing-security-4/pom.xml +++ b/examples/testing-security-4/pom.xml @@ -25,7 +25,7 @@ <artifactId>testing-security-4</artifactId> <packaging>jar</packaging> <version>1.1.1-SNAPSHOT</version> - <name>OpenEJB :: Examples :: Testing Security Script Service Provider</name> + <name>OpenEJB :: Examples :: Testing Security 4 Script Service Provider</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> http://git-wip-us.apache.org/repos/asf/tomee/blob/c6304d46/examples/testing-security/pom.xml ---------------------------------------------------------------------- diff --git a/examples/testing-security/pom.xml b/examples/testing-security/pom.xml index ada67c4..46d118d 100644 --- a/examples/testing-security/pom.xml +++ b/examples/testing-security/pom.xml @@ -25,7 +25,7 @@ <artifactId>testing-security</artifactId> <packaging>jar</packaging> <version>1.1.1-SNAPSHOT</version> - <name>OpenEJB :: Examples :: Testing Security</name> + <name>OpenEJB :: Examples :: Testing Security Auth</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> http://git-wip-us.apache.org/repos/asf/tomee/blob/c6304d46/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d743b44..8229b05 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ <bval.version>0.5</bval.version> <org.apache.activemq.version>5.10.2</org.apache.activemq.version> <org.springframework.version>3.1.4.RELEASE</org.springframework.version> - <junit.version>4.11</junit.version> + <junit.version>4.12</junit.version> <org.apache.axis2.version>1.4.1</org.apache.axis2.version> <scannotation.version>1.0.2</scannotation.version> <geronimo.connector.version>3.1.1</geronimo.connector.version> @@ -174,7 +174,7 @@ <geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version> <myfaces.version>2.1.17</myfaces.version> <mojarra.version>2.1.29</mojarra.version> - <slf4j.version>1.7.7</slf4j.version> + <slf4j.version>1.7.14</slf4j.version> <log4j.version>1.2.17</log4j.version> <osgi.framework.version>4.2.0</osgi.framework.version> <version.hsqldb>2.3.2</version.hsqldb> @@ -212,8 +212,18 @@ <configuration> <nonFilteredFileExtensions> <nonFilteredFileExtension>exe</nonFilteredFileExtension> + <nonFilteredFileExtension>dll</nonFilteredFileExtension> + <nonFilteredFileExtension>so</nonFilteredFileExtension> + <nonFilteredFileExtension>png</nonFilteredFileExtension> </nonFilteredFileExtensions> </configuration> + <dependencies> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-filtering</artifactId> + <version>1.3</version> + </dependency> + </dependencies> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -223,27 +233,27 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> + <version>2.10</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> - <version>2.8</version> + <version>2.10.1</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.8</version> + <version>1.10</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> + <version>3.5</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.18.1</version> + <version>2.19.1</version> </plugin> <plugin> <!-- maven-dependency-plugin:properties doesn't work as well as this one for us --> <groupId>org.apache.geronimo.buildsupport</groupId> @@ -253,7 +263,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> + <version>2.6</version> </plugin> <plugin> <groupId>org.codehaus.swizzle</groupId> @@ -268,17 +278,17 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> - <version>2.3</version> + <version>2.5</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.1</version> + <version>3.6</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId> - <version>1.5</version> + <version>1.6</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -288,7 +298,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.3</version> + <version>2.6</version> </plugin> <plugin> <groupId>com.googlecode.jslint4java</groupId> @@ -298,12 +308,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.12.1</version> + <version>2.17</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.5.1</version> + <version>2.5.3</version> </plugin> <plugin> <groupId>org.codehaus.gmaven</groupId> @@ -323,7 +333,7 @@ <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-filtering</artifactId> - <version>1.2</version> + <version>1.3</version> </dependency> </dependencies> </plugin> @@ -2086,7 +2096,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> + <version>2.10.3</version> <configuration> <aggregate>true</aggregate> <additionalJOption>-J-Xmx1024m</additionalJOption> http://git-wip-us.apache.org/repos/asf/tomee/blob/c6304d46/server/openejb-bonecp/pom.xml ---------------------------------------------------------------------- diff --git a/server/openejb-bonecp/pom.xml b/server/openejb-bonecp/pom.xml index db4ce6b..4dac4f1 100644 --- a/server/openejb-bonecp/pom.xml +++ b/server/openejb-bonecp/pom.xml @@ -30,7 +30,7 @@ <dependencies> <dependency> - <groupId>org.apache.openejb</groupId> + <groupId>${project.groupId}</groupId> <artifactId>openejb-core</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -43,7 +43,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> <scope>provided</scope> </dependency> </dependencies>
