This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "metainf-services packaging".
The branch, master has been updated
via f79c0c58df32af4da3cdae0721df6071144145e7 (commit)
via b94127f8d9f69c1030d19c2ff7dffa65210ee03d (commit)
via 9d28839f96d46a25bfd2ca04125b80c1eb009eec (commit)
via 6538d8c3e20496d9fd8587b405a6f10b52a0bc01 (commit)
via ae685ff50b3b6ff3fba47cc26490e21683a250df (commit)
via bba75190cecc175bb40cfe90b97e9e388ca0bd2d (commit)
via 1b8790b97c771e6acaf7de9252a0f57a19096753 (commit)
via a2130d10b62305d7eb93bd06c8f6d3cb5a17fcac (commit)
from edbb5bcb14c1c02128bea5b5b7d1b35c45379e18 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f79c0c58df32af4da3cdae0721df6071144145e7
Author: James Page <james.p...@canonical.com>
Date: Tue Jun 28 10:10:16 2011 +0100
Updated changelog for new release version
commit b94127f8d9f69c1030d19c2ff7dffa65210ee03d
Author: James Page <james.p...@canonical.com>
Date: Tue Jun 28 10:08:29 2011 +0100
Updates for new upstream release
commit 9d28839f96d46a25bfd2ca04125b80c1eb009eec
Merge: ae685ff 6538d8c
Author: James Page <james.p...@canonical.com>
Date: Tue Jun 28 10:06:24 2011 +0100
Merge commit 'upstream/1.2'
commit ae685ff50b3b6ff3fba47cc26490e21683a250df
Author: James Page <james.p...@canonical.com>
Date: Tue Jun 28 10:06:16 2011 +0100
Reverting changes
commit bba75190cecc175bb40cfe90b97e9e388ca0bd2d
Author: James Page <james.p...@canonical.com>
Date: Fri Jun 10 11:37:08 2011 +0100
Resolved lack of license information in upstream source code
commit a2130d10b62305d7eb93bd06c8f6d3cb5a17fcac
Merge: edbb5bc 1b8790b
Author: James Page <james.p...@canonical.com>
Date: Fri Jun 10 11:14:26 2011 +0100
Merge commit 'upstream/1.1+svn25'
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 +-
debian/control | 2 +-
debian/copyright | 14 +--
debian/maven.cleanIgnoreRules | 3 +
debian/maven.ignoreRules | 3 +
debian/orig-tar.sh | 16 ----
debian/watch | 5 +-
pom.xml | 85 +++++++++++++++++---
src/main/java/org/kohsuke/MetaInfServices.java | 23 +++++
.../metainf_services/AnnotationProcessorImpl.java | 23 +++++
src/site/site.xml | 13 ++--
11 files changed, 141 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b9ee29e..7d7ba43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-metainf-services (1.1-1) unstable; urgency=low
+metainf-services (1.2-1) unstable; urgency=low
* Initial release. (Closes: #628721)
- -- James Page <james.p...@canonical.com> Wed, 01 Jun 2011 11:45:35 +0100
+ -- James Page <james.p...@ubuntu.com> Tue, 28 Jun 2011 10:09:11 +0100
diff --git a/debian/control b/debian/control
index 53314ac..7563705 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Package: libmetainf-services-java-doc
Architecture: all
Section: doc
Depends: default-jdk-doc, ${maven:DocDepends}, ${misc:Depends}
-Recommends: ${maven:OptionalDocDepends}
+Recommends: ${maven:DocOptionalDepends}
Suggests: libmetainf-services-java
Description: Documentation for META-INF/services generator
This tiny library is an annotation processor that automatically generates
diff --git a/debian/copyright b/debian/copyright
index d3e50e4..e11fd2e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,15 @@
Format-Specification: http://dep.debian.net/deps/dep5/
Name: META-INF/services generator
Maintainer: Kohsuke Kawaguchi
-Source: https://metainf-services.dev.java.net/
+Source: http://java.net/projects/metainf-services
Files: *
-Copyright: 2010, Kohsuke Kawaguchi <k...@kohsuke.org>
+Copyright: 2009-, Kohsuke Kawaguchi
License: MIT
Files: debian/*
-Copyright: 2010, James Page <james.p...@canonical.com>
-License: GPL-3+
-
-License: GPL-3
- On Debian GNU/Linux system you can find the complete text of the
- GPL-3 license in '/usr/share/common-licenses/GPL-3'
+Copyright: 2011, Canonical Ltd (http://www.canonical.com)
+License: MIT
License: MIT
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,7 +21,7 @@ License: MIT
.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
- .
+ .
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
index 97af2ab..7eabc32 100644
--- a/debian/maven.cleanIgnoreRules
+++ b/debian/maven.cleanIgnoreRules
@@ -15,3 +15,6 @@
# junit junit jar s/3\\..*/3.x/
org.jvnet.wagon-svn wagon-svn * * * *
+org.apache.maven.scm maven-scm-manager-plexus * * * *
+org.kathrynhuxtable.maven.wagon wagon-gitsite * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 97af2ab..7eabc32 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -15,3 +15,6 @@
# junit junit jar s/3\\..*/3.x/
org.jvnet.wagon-svn wagon-svn * * * *
+org.apache.maven.scm maven-scm-manager-plexus * * * *
+org.kathrynhuxtable.maven.wagon wagon-gitsite * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 9195318..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../metainf-services_$VERSION.orig.tar.gz
-DIR=metainf-services-$VERSION
-TAG=$(echo "metainf-services-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export https://svn.java.net/svn/metainf-services~svn/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi
diff --git a/debian/watch b/debian/watch
index 3ab0b55..e85056e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
- http://java.net/projects/metainf-services/sources/svn/show/tags \
- /projects/.*/tags/metainf-services-(\d.*)\?.* debian debian/orig-tar.sh
+opts=dversionmangle=s/\.dfsg// \
+http://githubredir.debian.net/github/kohsuke/metainf-services/
metainf-services-(.+).tar.gz
diff --git a/pom.xml b/pom.xml
index c5b342a..9a715e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,24 +2,31 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.kohsuke.metainf-services</groupId>
<artifactId>metainf-services</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<name>META-INF/services generator</name>
+ <description>Annotation-driven META-INF/services
auto-generation</description>
+ <url>http://metainf-srvices.kohsuke.org/</url>
<scm>
-
<connection>scm:svn:https://svn.dev.java.net/svn/metainf-services/tags/metainf-services-1.1</connection>
-
<developerConnection>scm:svn:https://svn.dev.java.net/svn/metainf-services/tags/metainf-services-1.1</developerConnection>
-
<url>https://metainf-services.dev.java.net/source/browse/metainf-services/tags/metainf-services-1.1</url>
+
<connection>scm:git:g...@github.com/kohsuke/${project.artifactId}.git</connection>
+
<developerConnection>scm:git:ssh://g...@github.com/kohsuke/${project.artifactId}.git</developerConnection>
+ <url>http://${project.artifactId}.kohsuke.org/</url>
</scm>
<distributionManagement>
+ <snapshotRepository>
+ <id>sonatype-nexus-snapshots</id>
+ <name>Sonatype Nexus Snapshots</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ </snapshotRepository>
<repository>
- <id>java.net</id>
- <uniqueVersion>false</uniqueVersion>
- <url>java-net:/maven2-repository/trunk/repository/</url>
+ <id>sonatype-nexus-staging</id>
+ <name>Nexus Release Repository</name>
+ <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<site>
- <id>metainf-services-www</id>
- <url>java-net:/metainf-services/trunk/www/</url>
+ <id>github-pages</id>
+ <url>gitsite:g...@github.com/kohsuke/${project.artifactId}.git</url>
</site>
</distributionManagement>
@@ -41,13 +48,67 @@
<compilerArgument>-proc:none</compilerArgument>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <releaseProfiles>release</releaseProfiles>
+ </configuration>
+ </plugin>
</plugins>
+
<extensions>
<extension>
- <groupId>org.jvnet.wagon-svn</groupId>
- <artifactId>wagon-svn</artifactId>
- <version>1.9</version>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-gitexe</artifactId>
+ <version>1.3</version>
+ </extension>
+ <extension>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-manager-plexus</artifactId>
+ <version>1.3</version>
+ </extension>
+ <extension>
+ <groupId>org.kathrynhuxtable.maven.wagon</groupId>
+ <artifactId>wagon-gitsite</artifactId>
+ <version>0.3.1</version>
</extension>
</extensions>
</build>
+
+ <licenses>
+ <license>
+ <name>MIT license</name>
+ <url>http://www.opensource.org/licenses/mit-license.php</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <repositories>
+ <repository>
+ <id>m.g.o-public</id>
+ <url>http://maven.glassfish.org/content/groups/public/</url>
+ </repository>
+ </repositories>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/src/main/java/org/kohsuke/MetaInfServices.java
b/src/main/java/org/kohsuke/MetaInfServices.java
index 962a54c..5ef6bbb 100644
--- a/src/main/java/org/kohsuke/MetaInfServices.java
+++ b/src/main/java/org/kohsuke/MetaInfServices.java
@@ -1,3 +1,26 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2009-, Kohsuke Kawaguchi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
package org.kohsuke;
import java.lang.annotation.Documented;
diff --git
a/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java
b/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java
index ed1be00..e2a7464 100644
--- a/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java
+++ b/src/main/java/org/kohsuke/metainf_services/AnnotationProcessorImpl.java
@@ -1,3 +1,26 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2009-, Kohsuke Kawaguchi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
package org.kohsuke.metainf_services;
import org.kohsuke.MetaInfServices;
diff --git a/src/site/site.xml b/src/site/site.xml
index e318d78..d62d8ea 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="META-INF/services generator">
<skin>
- <groupId>org.jvnet.maven-javanet-skin</groupId>
- <artifactId>maven-javanet-skin</artifactId>
- <version>1.0</version>
+ <groupId>org.kohsuke</groupId>
+ <artifactId>maven-skin</artifactId>
+ <version>1.1</version>
</skin>
<body>
<menu name="META-INF/services generator">
<item name="Usage" href="index.html"/>
- <item name="Dwonload"
href="http://download.java.net/maven/2/org/kohsuke/metainf-services/metainf-services/"/>
- <item name="Mailing lists" href="servlets/ProjectMailingListList"/>
- <item name="Source code" href="source/browse/trunk/metainf-services/"/>
- <item name="Issues" href="servlets/ProjectIssues"/>
+ <!--item name="Dwonload"
href="http://download.java.net/maven/2/org/kohsuke/metainf-services/metainf-services/"/-->
+ <item name="Source code"
href="https://github.com/kohsuke/metainf-services"/>
+ <item name="Issues" href="http://java.net/jira/browse/METAINF_SERVICES"/>
</menu>
${reports}
</body>
hooks/post-receive
--
metainf-services packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
