You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:16:31 UTC

[sling-maven-launchpad-plugin] 19/29: SLING-2263 - no longer need to validate bundle lists as SLING-2273 handles that now.

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag maven-launchpad-plugin-2.1.2
in repository https://gitbox.apache.org/repos/asf/sling-maven-launchpad-plugin.git

commit 92b1ba9649e69e7657a7ec8e035363d4fd50f410
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Tue Jan 17 23:17:17 2012 +0000

    SLING-2263 - no longer need to validate bundle lists as SLING-2273 handles that now.
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin@1232640 13f79535-47bb-0310-9956-ffa450edef68
---
 .../projectsupport/ValidateBundleListMojo.java     | 63 ----------------------
 src/main/resources/META-INF/plexus/components.xml  |  1 -
 2 files changed, 64 deletions(-)

diff --git a/src/main/java/org/apache/sling/maven/projectsupport/ValidateBundleListMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/ValidateBundleListMojo.java
deleted file mode 100644
index df890cf..0000000
--- a/src/main/java/org/apache/sling/maven/projectsupport/ValidateBundleListMojo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.sling.maven.projectsupport;
-
-import static org.apache.sling.maven.projectsupport.BundleListUtils.interpolateProperties;
-import static org.apache.sling.maven.projectsupport.BundleListUtils.readBundleList;
-
-import java.io.IOException;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.sling.maven.projectsupport.bundlelist.v1_0_0.Bundle;
-import org.apache.sling.maven.projectsupport.bundlelist.v1_0_0.BundleList;
-import org.apache.sling.maven.projectsupport.bundlelist.v1_0_0.StartLevel;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-/**
- * Validate that the artifacts listed in a bundle list are valid
- *
- * @goal validate-bundle-list
- * @phase validate
- * @requiresDependencyResolution test
- * @description validate that the artifacts listed in a bundle list are valid
- */
-public class ValidateBundleListMojo extends AbstractBundleListMojo {
-
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        final BundleList initializedBundleList;
-        if (bundleListFile.exists()) {
-            try {
-                initializedBundleList = readBundleList(bundleListFile);
-            } catch (IOException e) {
-                throw new MojoExecutionException("Unable to read bundle list file", e);
-            } catch (XmlPullParserException e) {
-                throw new MojoExecutionException("Unable to read bundle list file", e);
-            }
-        } else {
-            initializedBundleList = new BundleList();
-        }
-
-        interpolateProperties(initializedBundleList, project, mavenSession);
-
-        for (StartLevel sl : initializedBundleList.getStartLevels()) {
-            for (Bundle bundle : sl.getBundles()) {
-                getArtifact(new ArtifactDefinition(bundle, -1));
-            }
-        }
-    }
-}
diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
index 572d1ef..d6fd19c 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -28,7 +28,6 @@
             <id>default</id>
             <!-- START SNIPPET: bundle-lifecycle -->
             <phases>
-              <validate>org.apache.sling:maven-launchpad-plugin:validate-bundle-list</validate>
               <package>org.apache.sling:maven-launchpad-plugin:attach-partial-bundle-list</package>
               <install>org.apache.maven.plugins:maven-install-plugin:install</install>
               <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.