You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/09/26 12:57:43 UTC
svn commit: r1390398 -
/openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Author: rmannibucau
Date: Wed Sep 26 10:57:43 2012
New Revision: 1390398
URL: http://svn.apache.org/viewvc?rev=1390398&view=rev
Log:
avoiding stupid error because mvn injected an unmodifiable list
Modified:
openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Modified: openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1390398&r1=1390397&r2=1390398&view=diff
==============================================================================
--- openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ openejb/branches/openejb-4.5.0/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Wed Sep 26 10:57:43 2012
@@ -630,21 +630,26 @@ public abstract class AbstractTomEEMojo
private File resolve() {
if (!settings.isOffline()) {
- if ("snapshots".equals(apacheRepos) || "true".equals(apacheRepos)) {
- remoteRepos.add(new DefaultArtifactRepository("apache", "https://repository.apache.org/content/repositories/snapshots/",
- new DefaultRepositoryLayout(),
- new ArtifactRepositoryPolicy(true, UPDATE_POLICY_DAILY, CHECKSUM_POLICY_WARN),
- new ArtifactRepositoryPolicy(false, UPDATE_POLICY_NEVER, CHECKSUM_POLICY_WARN)));
- } else {
- try {
- new URI(apacheRepos); // to check it is a uri
- remoteRepos.add(new DefaultArtifactRepository("additional-repo-tomee-mvn-plugin", apacheRepos,
+ try {
+ if ("snapshots".equals(apacheRepos) || "true".equals(apacheRepos)) {
+ remoteRepos.add(new DefaultArtifactRepository("apache", "https://repository.apache.org/content/repositories/snapshots/",
new DefaultRepositoryLayout(),
new ArtifactRepositoryPolicy(true, UPDATE_POLICY_DAILY, CHECKSUM_POLICY_WARN),
- new ArtifactRepositoryPolicy(true, UPDATE_POLICY_NEVER, CHECKSUM_POLICY_WARN)));
- } catch (URISyntaxException e) {
- // ignored, use classical repos
+ new ArtifactRepositoryPolicy(false, UPDATE_POLICY_NEVER, CHECKSUM_POLICY_WARN)));
+ } else {
+ try {
+ new URI(apacheRepos); // to check it is a uri
+ remoteRepos.add(new DefaultArtifactRepository("additional-repo-tomee-mvn-plugin", apacheRepos,
+ new DefaultRepositoryLayout(),
+ new ArtifactRepositoryPolicy(true, UPDATE_POLICY_DAILY, CHECKSUM_POLICY_WARN),
+ new ArtifactRepositoryPolicy(true, UPDATE_POLICY_NEVER, CHECKSUM_POLICY_WARN)));
+ } catch (URISyntaxException e) {
+ // ignored, use classical repos
+ }
}
+ } catch (UnsupportedOperationException uoe) {
+ // can happen if remoterepos is unmodifiable (possible in complex builds)
+ // no-op
}
} else if (remoteRepos != null && remoteRepos.isEmpty()) {
remoteRepos = new ArrayList<ArtifactRepository>();