You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2018/01/07 18:21:49 UTC
[05/26] commons-release-plugin git commit: adding licenses to all
files
adding licenses to all files
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/75c92308
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/75c92308
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/75c92308
Branch: refs/heads/master
Commit: 75c923080dc16ace9866389a906188ae71b522c4
Parents: f0c5441
Author: Rob Tompkins <ch...@gmail.com>
Authored: Sun Dec 24 08:30:14 2017 -0500
Committer: Rob Tompkins <ch...@gmail.com>
Committed: Sun Dec 24 08:30:14 2017 -0500
----------------------------------------------------------------------
pom.xml | 10 +++
.../mojos/AbstractCommonsReleasePluginMojo.java | 28 ------
.../mojos/CommonsAssemblyStagingMojo.java | 91 ++++++++++++++++++++
.../plugin/mojos/CommonsReleasePluginMojo.java | 68 ---------------
4 files changed, 101 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/75c92308/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6e01876..86d22a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,16 @@
<artifactId>maven-project</artifactId>
<version>2.2.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>2.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-providers</artifactId>
+ <version>2.10</version>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/75c92308/src/main/java/org/apache/commons/release/plugin/mojos/AbstractCommonsReleasePluginMojo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/AbstractCommonsReleasePluginMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/AbstractCommonsReleasePluginMojo.java
deleted file mode 100644
index 7e78368..0000000
--- a/src/main/java/org/apache/commons/release/plugin/mojos/AbstractCommonsReleasePluginMojo.java
+++ /dev/null
@@ -1,28 +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.commons.release.plugin.mojos;
-
-import org.apache.maven.plugin.AbstractMojo;
-
-/**
- * Contains the logging mechanics for the commons-release-plugin.
- *
- * @author chtompki
- * @since 1.0
- */
-public abstract class AbstractCommonsReleasePluginMojo extends AbstractMojo {
-}
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/75c92308/src/main/java/org/apache/commons/release/plugin/mojos/CommonsAssemblyStagingMojo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsAssemblyStagingMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsAssemblyStagingMojo.java
new file mode 100644
index 0000000..4b9e3d6
--- /dev/null
+++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsAssemblyStagingMojo.java
@@ -0,0 +1,91 @@
+/*
+ * 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.commons.release.plugin.mojos;
+
+import edu.emory.mathcs.backport.java.util.Collections;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.artifact.AttachedArtifact;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * The purpose of this maven mojo is to detach the artifacts generated by the maven-assembly-plugin,
+ * which for the Apache Commons Project do not get uploaded to Nexus, and putting those artifacts
+ * in the dev distribution location for apache projects.
+ *
+ * @author chtompki
+ * @since 1.0
+ */
+@Mojo( name = "test", defaultPhase = LifecyclePhase.VERIFY, threadSafe = true)
+public class CommonsAssemblyStagingMojo extends AbstractMojo {
+
+ /**
+ * A list of "artifact types" in the maven vernacular, to
+ * be detatched from the deployment. For the time being we want
+ * all artifacts generated by the maven-assembly-plugin to be detatched
+ * from the deployment, namely *-src.zip, *-src.tar.gz, *-bin.zip,
+ * *-bin.tar.gz, and the corresponding .asc pgp signatures.
+ */
+ private static final Set<String> ARTIFACT_TYPES_TO_DETATCH;
+ static {
+ Set<String> hashSet = new HashSet<>();
+ hashSet.add("zip");
+ hashSet.add("tar.gz");
+ hashSet.add("zip.asc");
+ hashSet.add("tar.gz.asc");
+ ARTIFACT_TYPES_TO_DETATCH = Collections.unmodifiableSet(hashSet);
+ }
+
+ /**
+ * This list is supposed to hold the maven references to the aformentioned artifacts so that we
+ * can upload them to svn after they've been detatched from the maven deployment.
+ */
+ private List<AttachedArtifact> detatchedArtifacts = new ArrayList<>();
+
+ /**
+ * The maven project context injection so that we can get a hold of the variables at hand.
+ */
+ @Parameter( defaultValue = "${project}", required = true )
+ private MavenProject project;
+
+ @Parameter( defaultValue = "${project.build.directory}/commons-release-plugin", alias = "outputDirectory" )
+ private File workingDirectory;
+
+ @Parameter ( required = true )
+ private String pubScmStagingUrl;
+
+ public void execute() {
+ getLog().info("Detatching Assemblies");
+ for (Object attachedArtifact : project.getAttachedArtifacts()) {
+ if (ARTIFACT_TYPES_TO_DETATCH.contains(((AttachedArtifact) attachedArtifact).getType())) {
+ detatchedArtifacts.add((AttachedArtifact) attachedArtifact);
+ }
+ }
+ for(AttachedArtifact artifactToRemove : detatchedArtifacts) {
+ project.getAttachedArtifacts().remove(artifactToRemove);
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/75c92308/src/main/java/org/apache/commons/release/plugin/mojos/CommonsReleasePluginMojo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsReleasePluginMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsReleasePluginMojo.java
deleted file mode 100644
index bc45bc1..0000000
--- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsReleasePluginMojo.java
+++ /dev/null
@@ -1,68 +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.commons.release.plugin.mojos;
-
-import edu.emory.mathcs.backport.java.util.Collections;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.artifact.AttachedArtifact;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author chtompki
- * @since 1.0
- *
- * , defaultPhase = LifecyclePhase.
- */
-@Mojo( name = "test", defaultPhase = LifecyclePhase.VERIFY, threadSafe = true)
-public class CommonsReleasePluginMojo extends AbstractMojo {
-
- private static final Set<String> ARTIFACT_TYPES_TO_DETATCH;
- static {
- Set<String> hashSet = new HashSet<>();
- hashSet.add("zip");
- hashSet.add("tar.gz");
- hashSet.add("zip.asc");
- hashSet.add("tar.gz.asc");
- ARTIFACT_TYPES_TO_DETATCH = Collections.unmodifiableSet(hashSet);
- }
-
- private List<AttachedArtifact> detatchedArtifacts = new ArrayList<>();
-
- @Parameter( defaultValue = "${project}", required = true )
- private MavenProject project;
-
- public void execute() {
- getLog().info("Detatching Assemblies");
- for (Object attachedArtifact : project.getAttachedArtifacts()) {
- if (ARTIFACT_TYPES_TO_DETATCH.contains(((AttachedArtifact) attachedArtifact).getType())) {
- detatchedArtifacts.add((AttachedArtifact) attachedArtifact);
- }
- }
- for(AttachedArtifact artifactToRemove : detatchedArtifacts) {
- project.getAttachedArtifacts().remove(artifactToRemove);
- }
- getLog().info("");
- }
-}