diff --git a/themoviedbapi/.settings/org.eclipse.jdt.core.prefs b/themoviedbapi/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 483d704da..000000000 --- a/themoviedbapi/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Sat Jan 29 22:13:58 CET 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/themoviedbapi/.settings/org.maven.ide.eclipse.prefs b/themoviedbapi/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 341107664..000000000 --- a/themoviedbapi/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Sat Jan 29 22:13:55 CET 2011 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/themoviedbapi/pom.xml b/themoviedbapi/pom.xml index 12bb18451..2f0d1e77e 100644 --- a/themoviedbapi/pom.xml +++ b/themoviedbapi/pom.xml @@ -43,6 +43,8 @@ junit junit + 4.10 + test log4j @@ -52,12 +54,12 @@ org.codehaus.jackson jackson-core-lgpl - 1.9.7 + 1.9.8 org.codehaus.jackson jackson-mapper-lgpl - 1.9.7 + 1.9.8 commons-codec @@ -71,17 +73,6 @@ - - - - junit - junit - 4.10 - test - - - - release-sign-artifacts @@ -111,65 +102,11 @@ - - - - org.apache.maven.plugins - maven-clean-plugin - 2.5 - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.1 - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - org.apache.maven.plugins - maven-assembly-plugin - 2.3 - - - org.codehaus.mojo - versions-maven-plugin - 1.3.1 - - - - org.codehaus.mojo buildnumber-maven-plugin + 1.1 true 0000 @@ -188,18 +125,20 @@ org.apache.maven.plugins maven-compiler-plugin + 2.5.1 1.6 1.6 true true - + org.apache.maven.plugins maven-jar-plugin + 2.4 @@ -212,10 +151,11 @@ - + org.apache.maven.plugins maven-surefire-plugin + 2.12 ${skipTests} @@ -224,6 +164,7 @@ org.apache.maven.plugins maven-antrun-plugin + 1.7 create-version-txt @@ -251,6 +192,7 @@ org.apache.maven.plugins maven-assembly-plugin + 2.3 distro-assembly @@ -269,6 +211,7 @@ org.codehaus.mojo versions-maven-plugin + 1.3.1