This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository cdi-api.
commit e18d9787737db6a23e174b66f8d3e816194d61fa Author: Markus Koschany <[email protected]> Date: Fri Oct 10 20:47:17 2014 +0200 Revert all changes on master until the release of 1.0-2. cdi-api 1.2 cannot be uploaded to unstable since this would break at least sisu-ioc and probably other packages. The newly packaged version is now accessible in the experimental branch. --- debian/changelog | 14 --- debian/control | 2 +- debian/copyright | 9 +- debian/javabuild | 2 +- debian/maven.ignoreRules | 19 +++ debian/maven.rules | 17 +++ debian/orig-tar.sh | 12 ++ debian/pom.xml | 294 +++++++---------------------------------------- debian/rules | 4 +- debian/watch | 3 +- 10 files changed, 100 insertions(+), 276 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3806a9f..a9e1a26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,3 @@ -cdi-api (1.2-1) unstable; urgency=medium - - * Team upload. - * Imported Upstream version 1.2. - * Fix watch file and detect the latest upstream releases. - * Use Files-Excluded directive instead of orig-tar.sh script. - * Replace TABS with spaces in debian/rules. - * Update debian/pom.xml for new release. - * Declare compliance with Debian Policy 3.9.6. - * Update debian/copyright for new release. - * Drop maven.ignoreRules and maven.rules because both files are unused. - - -- Markus Koschany <[email protected]> Fri, 10 Oct 2014 18:53:20 +0200 - cdi-api (1.0-2) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index ff77d40..db0194b 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), libatinject-jsr330-api-java, libgeronimo-interceptor-3.0-spec-java, libservlet3.1-java -Standards-Version: 3.9.6 +Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/pkg-java/cdi-api.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/cdi-api.git Homepage: http://jcp.org/en/jsr/detail?id=299 diff --git a/debian/copyright b/debian/copyright index 0200137..4f51dce 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: CDI (JSR 299) API -Source: http://repo1.maven.org/maven2/javax/enterprise/cdi-api/ -Files-Excluded: - *.jar - *.class +Source: http://jcp.org/en/jsr/detail?id=299 Files: * Copyright: Copyright: 2008, Red Hat Middleware LLC, and individual contributors @@ -11,10 +8,8 @@ License: Apache-2.0 Files: debian/* Copyright: 2011, Damien Raude-Morvan <[email protected]> - 2014, Emmanual Bourg <[email protected]> - 2014, Markus Koschany <[email protected]> License: Apache-2.0 License: Apache-2.0 - On Debian systems the complete text of the Apache License Version 2.0 + On Debian systems, the complete text of the Apache License Version 2.0, can be found in /usr/share/common-licenses/Apache-2.0. diff --git a/debian/javabuild b/debian/javabuild index 4801c40..ef01257 100644 --- a/debian/javabuild +++ b/debian/javabuild @@ -1 +1 @@ -cdi-api.jar javax +cdi-api.jar src diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..18e2ab2 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,19 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + +javax.annotation jsr250-api * * * * +org.jboss.ejb3 jboss-ejb3-api * * * * +org.jboss.interceptor jboss-interceptor-api * * * * diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..ce4a3fd --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,17 @@ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..7f285c8 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# called with '--upstream-version' <version> <file> +VERSION=$2 +TAR=../cdi-api_$VERSION.orig.tar.gz +DIR=cdi-api-$VERSION + +mkdir -p $DIR/src/ +(cd $DIR/src/ && echo `pwd` && jar xvf ../../$3) + +GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR +rm -rf $DIR $3 diff --git a/debian/pom.xml b/debian/pom.xml index 7c03552..79e317b 100644 --- a/debian/pom.xml +++ b/debian/pom.xml @@ -1,253 +1,47 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>26</version> - <relativePath /> - </parent> - - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <packaging>jar</packaging> - <version>1.2</version> - - <name>CDI APIs</name> - <description>APIs for CDI (Contexts and Dependency Injection for Java EE)</description> - - <url>http://cdi-spec.org</url> - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - </license> - </licenses> - - <ciManagement> - <system>Hudson</system> - <url>http://hudson.jboss.org</url> - </ciManagement> - - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/browse/CDI</url> - </issueManagement> - - <organization> - <name>JBoss by Red Hat, Inc.</name> - <url>http://jboss.org</url> - </organization> - - <inceptionYear>2008</inceptionYear> - - <developers> - <developer> - <name>Pete Muir</name> - <id>pmuir</id> - <timezone>GMT</timezone> - <organization>Red Hat Inc.</organization> - <roles> - <role>Specfication Lead</role> - </roles> - <email>pmuir[at]redhat[dot]com</email> - </developer> - - <developer> - <name>Antoine Sabot-Durand</name> - <id>asabotdu</id> - <timezone>CET</timezone> - <organization>Red Hat Inc.</organization> - <roles> - <role>Specfication co-lead</role> - </roles> - <email>asd[at]redhat[dot]com</email> - </developer> - - <developer> - <name>Mark Struberg</name> - <id>mstruberg</id> - <timezone>CET</timezone> - <roles> - <role>Implementation developer</role> - </roles> - <email>struberg[at]yahoo[dot]de</email> - </developer> - - <developer> - <name>Jozef Hartinger</name> - <id>jhartinger</id> - <timezone>CET</timezone> - <organization>Red Hat Inc.</organization> - <roles> - <role>RI tech lead</role> - </roles> - <email>jhartinger[at]redhat[dot]com</email> - </developer> - - <developer> - <name>Martin Kouba</name> - <id>mkouba</id> - <organization>Red Hat Inc.</organization> - <roles> - <role>TCK tech lead</role> - </roles> - <email>mkouba[at]redhat[dot]com</email> - </developer> - </developers> - - - <properties> - <atinject.api.version>1</atinject.api.version> - <uel.api.version>3.0.0</uel.api.version> - <interceptor.api.version>1.2</interceptor.api.version> - </properties> - - <!-- Configure all dependencies (e.g. testing) --> - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <classifier>jdk15</classifier> - </dependency> - - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>${atinject.api.version}</version> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>javax.el-api</artifactId> - <version>${uel.api.version}</version> - </dependency> - - <dependency> - <groupId>javax.interceptor</groupId> - <artifactId>javax.interceptor-api</artifactId> - <version>${interceptor.api.version}</version> - </dependency> - - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>javax.el</groupId> - <artifactId>javax.el-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.interceptor</groupId> - <artifactId>javax.interceptor-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - - </dependencies> - - <scm> - <connection>scm:git:[email protected]:cdi-spec/cdi.git</connection> - <url>scm:git:[email protected]:cdi-spec/cdi.git</url> - <developerConnection>scm:git:[email protected]:cdi-spec/cdi.git</developerConnection> - </scm> - - <profiles> - <profile> - <id>jboss-public-repository</id> - <activation> - <property> - <name>jboss-public-repository</name> - <value>!false</value> - </property> - </activation> - <repositories> - <repository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>http://repository.jboss.org/nexus/content/groups/public</url> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>http://repository.jboss.org/nexus/content/groups/public</url> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - <configuration> - <instructions> - <Export-Package> - javax.decorator;version=1.1, - javax.enterprise.*;version=1.1, - </Export-Package> - <Import-Package> - javax.el; version=2.2, - * - </Import-Package> - </instructions> - </configuration> - </plugin> - <!-- Add the OSGi Manifest to the main jar --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - </plugin> - </plugins> - </build> - + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-parent</artifactId> + <version>1.0</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <packaging>jar</packaging> + + <name>CDI APIs</name> + <description>APIs for JSR-299: Contexts and Dependency Injection for Java EE</description> + + <dependencies> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + </dependencies> </project> diff --git a/debian/rules b/debian/rules index 9958df1..295e239 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f -MAVEN_REPO := http://repo1.maven.org/maven2/javax/enterprise/cdi-api/ -VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//') +MAVEN_REPO := http://repo1.maven.org/maven2/javax/enterprise/cdi-api/ +VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//') export JAVA_HOME=/usr/lib/jvm/default-java export CLASSPATH=/usr/share/java/atinject-jsr330-api.jar:/usr/share/java/el-api-3.0.jar:/usr/share/java/geronimo-interceptor-3.0-spec.jar diff --git a/debian/watch b/debian/watch index 09b8777..21b5d4c 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -http://repo1.maven.org/maven2/javax/enterprise/cdi-api/(\d.*)/cdi-api-(\d.*)-sources.jar +http://repo1.maven.org/maven2/javax/enterprise/cdi-api/(?:\d.*)/cdi-api-(\d.*)-sources.jar \ +debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/cdi-api.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
