[Git][java-team/geronimo-j2ee-connector-1.5-spec][master] 10 commits: Wrap and sort
Emmanuel Bourg
gitlab at salsa.debian.org
Sun Jan 31 23:51:39 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / geronimo-j2ee-connector-1.5-spec
Commits:
3f01344d by Emmanuel Bourg at 2021-02-01T00:04:41+01:00
Wrap and sort
- - - - -
e6846620 by Emmanuel Bourg at 2021-02-01T00:04:58+01:00
Use salsa.debian.org Vcs-* URLs
- - - - -
73faee1b by Emmanuel Bourg at 2021-02-01T00:06:52+01:00
Package adopted by the Java Team (Closes: #979058)
- - - - -
f41cc877 by Emmanuel Bourg at 2021-02-01T00:07:20+01:00
Standards-Version updated to 4.5.1
- - - - -
6cd85519 by Emmanuel Bourg at 2021-02-01T00:08:01+01:00
Switch to debhelper level 13
- - - - -
44283d2f by Emmanuel Bourg at 2021-02-01T00:10:36+01:00
Removed debian/orig-tar.sh
- - - - -
7031d7b0 by Emmanuel Bourg at 2021-02-01T00:11:25+01:00
Switch to source format 3.0 (quilt)
- - - - -
6a821e30 by Emmanuel Bourg at 2021-02-01T00:19:29+01:00
Build with the DH sequencer instead of CDBS
- - - - -
d449c76e by Emmanuel Bourg at 2021-02-01T00:40:56+01:00
Build with Maven instead of Ant
- - - - -
e2300011 by Emmanuel Bourg at 2021-02-01T00:41:49+01:00
Upload to unstable
- - - - -
14 changed files:
- − debian/build.xml
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/libgeronimo-j2ee-connector-1.5-spec-java.poms
- + debian/maven.ignoreRules
- + debian/maven.rules
- − debian/orig-tar.sh
- + debian/patches/01-junit-dependency.patch
- + debian/patches/series
- debian/rules
- + debian/source/format
- debian/watch
Changes:
=====================================
debian/build.xml deleted
=====================================
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="package" basedir="..">
-
- <property name="build.sourceDirectory" value="src/main/java"/>
- <property name="build.resourcesDirectory" value="src/main/resources"/>
- <property name="build.testDirectory" value="src/test/java"/>
- <property name="build.directory" value="build"/>
- <property name="build.outputDirectory" value="${build.directory}/classes"/>
-
- <target name="init">
- <available property="available.resources" file="${build.resourcesDirectory}"/>
- </target>
-
- <target name="clean">
- <delete dir="${build.directory}"/>
- <delete>
- <fileset dir="${build.testDirectory}" includes="**/*.class"/>
- </delete>
- </target>
-
- <target name="process-resources" depends="init" if="available.resources">
- <mkdir dir="${build.outputDirectory}"/>
- <copy todir="${build.outputDirectory}">
- <fileset dir="${build.resourcesDirectory}"/>
- </copy>
- </target>
-
- <target name="compile" depends="process-resources">
- <mkdir dir="${build.outputDirectory}"/>
- <javac
- destdir="${build.outputDirectory}"
- nowarn="true"
- source="${sourceVersion}" target="${targetVersion}"
- debug="on">
- <src path="${build.sourceDirectory}"/>
- </javac>
- </target>
-
- <target name="package" depends="compile">
- <jar jarfile="${build.directory}/${artifactId}-${artifactVersion}.jar"
- basedir="${build.outputDirectory}"/>
- </target>
-
- <target name="compile_test">
- <javac destdir="${build.testDirectory}" debug="true"
- source="${sourceVersion}" target="${targetVersion}">
- <src path="${build.testDirectory}"/>
- <classpath>
- <pathelement location="${build.directory}/${artifactId}-${artifactVersion}.jar"/>
- <pathelement location="${build.testDirectory}"/>
- </classpath>
- </javac>
- </target>
- <target name="test" depends="compile_test">
- <junit haltonfailure="yes">
- <classpath>
- <pathelement location="${build.directory}/${artifactId}-${artifactVersion}.jar"/>
- <pathelement location="${build.testDirectory}"/>
- </classpath>
- <formatter type="plain" usefile="false"/>
- <batchtest>
- <fileset dir="${build.testDirectory}">
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-</project>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+geronimo-j2ee-connector-1.5-spec (2.0.0-2) unstable; urgency=medium
+
+ * Package adopted by the Java Team (Closes: #979058)
+ * Build with the DH sequencer instead of CDBS
+ * Build with Maven instead of Ant
+ * Use salsa.debian.org Vcs-* URLs
+ * Standards-Version updated to 4.5.1
+ * Switch to debhelper level 13 (Closes: #965549)
+ * Removed debian/orig-tar.sh
+ * Switch to source format 3.0 (quilt)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 01 Feb 2021 00:41:36 +0100
+
geronimo-j2ee-connector-1.5-spec (2.0.0-1.1) unstable; urgency=medium
* Non-maintainer upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-5
=====================================
debian/control
=====================================
@@ -1,19 +1,22 @@
Source: geronimo-j2ee-connector-1.5-spec
Section: java
Priority: optional
-Maintainer: Chris Grzegorczyk <grze at eucalyptus.com>
-Uploaders: Graziano Obertelli <graziano at eucalyptus.com>, Kyo Lee <kyo.lee at eucalyptus.com>
-XSBC-Original-Maintainer: Thierry Carrez <thierry.carrez at ubuntu.com>
-Build-Depends-Indep: default-jdk, junit
-Build-Depends: ant-optional, debhelper (>= 5), cdbs (>= 0.4.5.3), maven-repo-helper
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/geronimo-j2ee-connector-1.5-spec.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/geronimo-j2ee-connector-1.5-spec.git
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Emmanuel Bourg <ebourg at apache.org>
+Build-Depends:
+ debhelper-compat (= 13),
+ default-jdk,
+ junit,
+ maven-debian-helper
+Standards-Version: 4.5.1
+Vcs-Git: https://salsa.debian.org/java-team/geronimo-j2ee-connector-1.5-spec.git
+Vcs-Browser: https://salsa.debian.org/java-team/geronimo-j2ee-connector-1.5-spec
Homepage: http://geronimo.apache.org
Package: libgeronimo-j2ee-connector-1.5-spec-java
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
+Suggests: ${maven:OptionalDepends}
Description: Geronimo API implementation of the J2EE connector 1.5 spec
The goal of the Geronimo project is to produce a server runtime framework
that pulls together the best Open Source alternatives to create runtimes
=====================================
debian/copyright
=====================================
@@ -68,9 +68,9 @@ License:
Licensed 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.
=====================================
debian/libgeronimo-j2ee-connector-1.5-spec-java.poms
=====================================
@@ -0,0 +1,2 @@
+
+pom.xml --no-parent --java-lib --has-package-version --usj-name=geronimo-j2ee-connector-1.5-spec
=====================================
debian/maven.ignoreRules
=====================================
@@ -0,0 +1,2 @@
+
+org.apache.geronimo.specs geronimo-jta_1.1_spec
=====================================
debian/maven.rules
=====================================
@@ -0,0 +1,2 @@
+
+junit junit * s/.*/3.x/ * *
=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-# $1 = version
-TAR=../geronimo-j2ee-connector-1.5-spec_$2.orig.tar.gz
-DIR=libgeronimo-j2ee-connector-1.5-spec-java-$2.orig
-
-# clean up the upstream tarball
-svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-connector_1.5_spec-$2/ $DIR
-GZIP=--best tar -c -z -f $TAR $DIR
-rm -rf $DIR
-rm ../geronimo-j2ee-connector_1.5_spec-$2
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
-fi
=====================================
debian/patches/01-junit-dependency.patch
=====================================
@@ -0,0 +1,18 @@
+Description: Adds the missing dependency on JUnit
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -48,6 +48,12 @@
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
++ <dependency>
++ <groupId>junit</groupId>
++ <artifactId>junit</artifactId>
++ <version>3.x</version>
++ <scope>test</scope>
++ </dependency>
+ </dependencies>
+
+ <scm>
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+01-junit-dependency.patch
=====================================
debian/rules
=====================================
@@ -1,31 +1,4 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-SVN := geronimo/specs/tags/geronimo-j2ee-connector_1.5_spec-$(DEB_UPSTREAM_VERSION)
-ASFREPO := http://svn.apache.org/repos/asf/$(SVN)
-REQUIRED_JVM_VERSION := 1.5
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := ./debian/build.xml
-DEB_ANT_CHECK_TARGET := test
-DEB_ANT_ARGS := -DartifactVersion=$(DEB_UPSTREAM_VERSION) \
- -DartifactId=$(DEB_SOURCE_PACKAGE) \
- -DsourceVersion=$(REQUIRED_JVM_VERSION) \
- -DtargetVersion=$(REQUIRED_JVM_VERSION)
-DEB_JARS := junit ant-junit
-
-get-orig-source:
- mkdir orig_tmp
- cd orig_tmp && \
- svn export -q $(ASFREPO) $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) && \
- tar czf ../../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
- rm -rf orig_tmp
-
-clean::
- mh_clean
-
-binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
- mh_installjar -plib$(DEB_SOURCE_PACKAGE)-java --java-lib --usj-name=geronimo-j2ee-connector-1.5-spec pom.xml build/geronimo-j2ee-connector-1.5-spec-$(DEB_UPSTREAM_VERSION).jar
- mh_installpom -plib$(DEB_SOURCE_PACKAGE)-java --has-package-version --no-parent pom.xml
+%:
+ dh $@
=====================================
debian/source/format
=====================================
@@ -0,0 +1 @@
+3.0 (quilt)
=====================================
debian/watch
=====================================
@@ -1,2 +1,3 @@
-version=3
-http://svn.apache.org/repos/asf/geronimo/specs/tags/ geronimo-j2ee-connector_1.5_spec-([0-9].*)/ debian debian/orig-tar.sh
+version=4
+opts="mode=svn,repack,compression=xz" \
+https://svn.apache.org/repos/asf/geronimo/specs/tags/ geronimo-j2ee-connector_1.5_spec-([\d\.]+)/
View it on GitLab: https://salsa.debian.org/java-team/geronimo-j2ee-connector-1.5-spec/-/compare/d27c2de827ed55b3865fde1eb1965f54757bb24b...e230001132f42006bdda09567d584b4dd5b21cdf
--
View it on GitLab: https://salsa.debian.org/java-team/geronimo-j2ee-connector-1.5-spec/-/compare/d27c2de827ed55b3865fde1eb1965f54757bb24b...e230001132f42006bdda09567d584b4dd5b21cdf
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210131/e2aa0de0/attachment.html>
More information about the pkg-java-commits
mailing list