[1/3] maven-resolver git commit: Ignoring checkstyle files

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/3] maven-resolver git commit: Ignoring checkstyle files

mmoser
Repository: maven-resolver
Updated Branches:
  refs/heads/master-all 2dbca04ce -> 20ad31658


Ignoring checkstyle files

Signed-off-by: Manfred Moser <[hidden email]>
Signed-off-by: Manfred Moser <[hidden email]>


Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/bef1c080
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/bef1c080
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/bef1c080

Branch: refs/heads/master-all
Commit: bef1c080d4f6e62a8e93e28a0386ef326d54946f
Parents: 2dbca04
Author: Manfred Moser <[hidden email]>
Authored: Wed Nov 8 20:15:35 2017 -0800
Committer: Manfred Moser <[hidden email]>
Committed: Wed Nov 8 20:15:35 2017 -0800

----------------------------------------------------------------------
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/bef1c080/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0e36d40..b588801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ target/
 *.iml
 *.ipr
 *.iws
+.checkstyle

Reply | Threaded
Open this post in threaded view
|

[2/3] maven-resolver git commit: Proper reactor setup

mmoser
Proper reactor setup

- switched parent of ant-tasks to resolver parent
- switched parent of demos to resolver parent
- consistent and correct version 1.1.1-SNAPSHOT across modules

Signed-off-by: Manfred Moser <[hidden email]>
Signed-off-by: Manfred Moser <[hidden email]>


Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/c19e69f2
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/c19e69f2
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/c19e69f2

Branch: refs/heads/master-all
Commit: c19e69f287043823e93a08cf3558d07c5d7a12d8
Parents: bef1c08
Author: Manfred Moser <[hidden email]>
Authored: Wed Nov 8 20:36:21 2017 -0800
Committer: Manfred Moser <[hidden email]>
Committed: Wed Nov 8 20:36:21 2017 -0800

----------------------------------------------------------------------
 maven-resolver-ant-tasks/pom.xml                            | 9 +++------
 .../maven-resolver-demo-maven-plugin/pom.xml                | 2 +-
 maven-resolver-demos/maven-resolver-demo-snippets/pom.xml   | 2 +-
 maven-resolver-demos/pom.xml                                | 9 +++------
 4 files changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c19e69f2/maven-resolver-ant-tasks/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-ant-tasks/pom.xml b/maven-resolver-ant-tasks/pom.xml
index 85edc0d..ebe4689 100644
--- a/maven-resolver-ant-tasks/pom.xml
+++ b/maven-resolver-ant-tasks/pom.xml
@@ -24,15 +24,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>30</version>
-    <relativePath>../pom/maven/pom.xml</relativePath>
+    <groupId>org.apache.maven.resolver</groupId>
+    <artifactId>maven-resolver</artifactId>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.maven.resolver</groupId>
   <artifactId>maven-resolver-ant-tasks</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
 
   <name>Maven Artifact Resolver Ant Tasks</name>
   <description>

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c19e69f2/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
index 24d4312..686d8d9 100644
--- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
+++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.resolver</groupId>
     <artifactId>maven-resolver-demos</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-resolver-demo-maven-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c19e69f2/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
index 9786b65..22b3c9a 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.resolver</groupId>
     <artifactId>maven-resolver-demos</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-resolver-demo-snippets</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c19e69f2/maven-resolver-demos/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-demos/pom.xml b/maven-resolver-demos/pom.xml
index 1b44b48..1428956 100644
--- a/maven-resolver-demos/pom.xml
+++ b/maven-resolver-demos/pom.xml
@@ -24,15 +24,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>30</version>
-    <relativePath>../pom/maven/pom.xml</relativePath>
+    <groupId>org.apache.maven.resolver</groupId>
+    <artifactId>maven-resolver</artifactId>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.maven.resolver</groupId>
   <artifactId>maven-resolver-demos</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Maven Artifact Resolver Demos</name>

Reply | Threaded
Open this post in threaded view
|

[3/3] maven-resolver git commit: Removed duplicated pom elements

mmoser
In reply to this post by mmoser
Removed duplicated pom elements

Signed-off-by: Manfred Moser <[hidden email]>
Signed-off-by: Manfred Moser <[hidden email]>


Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/20ad3165
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/20ad3165
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/20ad3165

Branch: refs/heads/master-all
Commit: 20ad316583e9c21a223f13a7d47c163697c5a3c7
Parents: c19e69f
Author: Manfred Moser <[hidden email]>
Authored: Wed Nov 8 20:53:01 2017 -0800
Committer: Manfred Moser <[hidden email]>
Committed: Wed Nov 8 20:53:01 2017 -0800

----------------------------------------------------------------------
 maven-resolver-ant-tasks/pom.xml                     | 15 ---------------
 .../maven-resolver-demo-maven-plugin/pom.xml         |  1 -
 maven-resolver-demos/pom.xml                         | 15 ---------------
 3 files changed, 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/20ad3165/maven-resolver-ant-tasks/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-ant-tasks/pom.xml b/maven-resolver-ant-tasks/pom.xml
index ebe4689..13eda3a 100644
--- a/maven-resolver-ant-tasks/pom.xml
+++ b/maven-resolver-ant-tasks/pom.xml
@@ -36,22 +36,7 @@
     Ant tasks handling Maven artifacts using Maven Artifact Resolver and Maven Artifact Resolver Provider.
   </description>
   <url>https://maven.apache.org/resolver-ant-tasks/</url>
-  <inceptionYear>2010</inceptionYear>
 
-  <scm>
-    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-resolver.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-resolver.git</developerConnection>
-    <url>https://github.com/apache/maven-resolver/tree/${project.scm.tag}</url>
-    <tag>ant-tasks</tag>
-  </scm>
-  <issueManagement>
-    <system>jira</system>
-    <url>https://issues.apache.org/jira/browse/MRESOLVER</url>
-  </issueManagement>
-  <ciManagement>
-    <system>Jenkins</system>
-    <url>https://builds.apache.org/job/maven-resolver-ant-tasks</url>
-  </ciManagement>
   <distributionManagement>
     <site>
       <id>apache.website</id>

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/20ad3165/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
index 686d8d9..0dccadc 100644
--- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
+++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
@@ -35,7 +35,6 @@
   <description>
     A simple Maven plugin using Maven Artifact Resolver with Maven repositories.
   </description>
-  <inceptionYear>2010</inceptionYear>
 
   <prerequisites>
     <maven>3.5.0</maven>

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/20ad3165/maven-resolver-demos/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-demos/pom.xml b/maven-resolver-demos/pom.xml
index 1428956..33809bc 100644
--- a/maven-resolver-demos/pom.xml
+++ b/maven-resolver-demos/pom.xml
@@ -37,22 +37,7 @@
     Maven Artifact Resolver demos, showing concrete code to use Maven Artifact Resolver with Maven repositories.
   </description>
   <url>https://maven.apache.org/resolver-demos/</url>
-  <inceptionYear>2010</inceptionYear>
 
-  <scm>
-    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-resolver.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-resolver.git</developerConnection>
-    <url>https://github.com/apache/maven-resolver/tree/${project.scm.tag}</url>
-    <tag>demos</tag>
-  </scm>
-  <issueManagement>
-    <system>jira</system>
-    <url>https://issues.apache.org/jira/browse/MRESOLVER</url>
-  </issueManagement>
-  <ciManagement>
-    <system>Jenkins</system>
-    <url>https://builds.apache.org/job/maven-resolver-demos</url>
-  </ciManagement>
   <distributionManagement>
     <site>
       <id>apache.website</id>