[Git][java-team/libsequence-library-java][upstream] New upstream version 1.0.4+dfsg
Andreas Tille (@tille)
gitlab at salsa.debian.org
Fri Jan 24 21:23:58 GMT 2025
Andreas Tille pushed to branch upstream at Debian Java Maintainers / libsequence-library-java
Commits:
63794ecc by Andreas Tille at 2025-01-24T22:17:50+01:00
New upstream version 1.0.4+dfsg
- - - - -
7 changed files:
- + .dockerignore
- + Dockerfile
- − build.defaults.gradle
- build.gradle
- − build.pom.gradle
- + run.sh
- src/main/java/de/regnis/q/sequence/media/QSequenceCachingMediaSymbolMap.java
Changes:
=====================================
.dockerignore
=====================================
@@ -0,0 +1 @@
+*
=====================================
Dockerfile
=====================================
@@ -0,0 +1,42 @@
+FROM debian:jessie
+
+ARG USER_NAME=docker
+ARG GROUP_NAME=$USER_NAME
+ARG USER_HOME=/home/$USER_NAME
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+ARG JAVA_VERSION=8
+
+RUN \
+ echo "deb http://httpredir.debian.org/debian jessie main contrib" > /etc/apt/sources.list && \
+ echo "deb http://httpredir.debian.org/debian jessie-updates main contrib" >> /etc/apt/sources.list && \
+ echo "deb http://security.debian.org jessie/updates main contrib" >> /etc/apt/sources.list
+
+RUN \
+ apt-get update
+
+RUN \
+ echo "===> add webupd8 repository..." && \
+ echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list && \
+ echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list && \
+ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886 && \
+ apt-get update && \
+ \
+ \
+ echo "===> install Java" && \
+ echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
+ echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes oracle-java$JAVA_VERSION-installer oracle-java$JAVA_VERSION-set-default && \
+ \
+ \
+ echo "===> clean up..." && \
+ rm -rf /var/cache/oracle-jdk$JAVA_VERSION-installer
+
+
+RUN groupadd -g $USER_GID $GROUP_NAME
+RUN useradd -u $USER_UID -g $USER_GID -m -d $USER_HOME -s /bin/bash $USER_NAME
+USER $USER_NAME
+
+ENV JAVA_HOME /usr/lib/jvm/java-$JAVA_VERSION-oracle
+
+WORKDIR $USER_HOME/project
=====================================
build.defaults.gradle deleted
=====================================
@@ -1,12 +0,0 @@
-project.ext.setProperty('buildPluginRepositoryURL', 'http://maven.tmatesoft.com:8080/content/repositories/releases/')
-
-if (!project.hasProperty('mavenProxyRepository.url')) {
- setPropertyDefaultValue('mavenCentralRepository.url', 'http://repo1.maven.org/maven2/')
- setPropertyDefaultValue('mavenTMateSoftRepository.url', 'http://maven.tmatesoft.com/content/repositories/snapshots')
-}
-
-def setPropertyDefaultValue(String name, String value) {
- if (!project.hasProperty(name)) {
- project.ext.setProperty(name, value)
- }
-}
\ No newline at end of file
=====================================
build.gradle
=====================================
@@ -1,49 +1,107 @@
group = 'de.regnis.q.sequence'
-version = '1.0.3'
+version = '1.0.4'
-project.ext {
- target = '1.4'
- release = true
+task wrapper(type: Wrapper) {
+ gradleVersion = '2.14'
}
-apply from: 'build.pom.gradle'
-buildscript {
- apply from: 'build.defaults.gradle'
- configurations.all {
- resolutionStrategy {
- cacheChangingModulesFor 0, 'seconds'
- cacheDynamicVersionsFor 0, 'seconds'
+ext {
+ release = true
+ target = '1.5'
+
+ versionMajor = '1'
+ versionMinor = '0'
+ versionMicro = '4'
+ versionQualifier = !release ? 'SNAPSHOT' : ''
+
+ if (!release) {
+ rootProject.version = rootProject.version + '-SNAPSHOT'
+ }
+ buildNumber = project.hasProperty('revision') ? ('r' + project.revision) : null
+ if (buildNumber == null) {
+ if (release) {
+ throw new GradleException('release or interim targets requires build number to be specified via revision project property (-Prevision=REV)')
}
- }
+ def buildTime = new java.text.SimpleDateFormat("yyyyMMddHHmmss", java.util.Locale.US).format(new Date())
+ buildNumber = 't' + buildTime
+ }
+ println "Version: ${rootProject.version}"
+ println "Build Number: ${rootProject.buildNumber}"
+ buildVersion = rootProject.version
+}
+
+allprojects {
repositories {
+ mavenCentral()
+ maven {
+ url 'https://maven.tmatesoft.com/content/repositories/releases'
+ }
maven {
- url project.ext.buildPluginRepositoryURL
+ url 'https://maven.tmatesoft.com/content/repositories/snapshots'
}
}
- dependencies { classpath 'org.tmatesoft.build:build:0.9.9' }
-}
-task wrapper(type: Wrapper) {}
+ apply plugin : 'base'
+ apply plugin : 'maven'
+ apply plugin : 'signing'
+ apply plugin : 'java'
-configure(rootProject) {
- apply plugin: 'java'
- apply plugin: 'eclipse'
- apply plugin: 'idea'
- apply plugin: 'signing'
- apply plugin: 'build'
+ version = rootProject.version
- targetCompatibility = target
- sourceCompatibility = target
+ ext {
+ release = rootProject.release
+ target = rootProject.target
+
+ buildVersion = [
+ baseVersion : '1.0.4',
+ buildNumber : buildNumber,
+ major: '1',
+ minor: '0',
+ micro: '4'
+ ]
+ buildNumber = rootProject.buildNumber
+ }
+
+ signing {
+ required { project.hasProperty('signing.keyId') }
+ sign configurations.archives
+ }
- dependencies {
- testCompile 'junit:junit:3.8.2'
+ uploadArchives {
+ dependsOn signArchives
+ enabled = false
+ repositories.mavenDeployer {
+ beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+ if (project.hasProperty('mavenReleasesRepository')) {
+ repository( url : "${mavenReleasesRepository}") {
+ if (project.hasProperty('mavenUser')) {
+ authentication(userName: "${mavenUser}", password: "${mavenPassword}")
+ }
+ }
+ }
+
+ if (project.hasProperty('mavenSnapshotsRepository')) {
+ snapshotRepository( url : "${mavenSnapshotsRepository}") {
+ if (project.hasProperty('mavenUser')) {
+ authentication(userName: "${mavenUser}", password: "${mavenPassword}")
+ }
+ }
+ }
+ }
}
+}
+
+
+configure(rootProject) {
+ sourceCompatibility = target
+ targetCompatibility = target
- task javadocJar(type: Jar, dependsOn: javadoc) {
- description="Builds Javadoc Jar"
- from "$docsDir/javadoc"
- classifier = 'javadoc'
+ configurations {
+ sources
+ javadocs
+ jar_archive
}
task sourcesJar(type: Jar) {
@@ -53,12 +111,56 @@ configure(rootProject) {
}
jar {
- metaInf {
- from rootProject.file('LICENSE.txt')
- }
+ metaInf {
+ from rootProject.file('LICENSE.txt')
+ }
}
- artifacts {
- maven jar, sourcesJar, javadocJar
+ artifacts { sources sourcesJar }
+}
+
+dependencies {
+ testCompile 'junit:junit:3.8.2'
+}
+
+uploadArchives {
+ enabled = true
+ repositories.mavenDeployer {
+ pom.artifactId = 'sequence-library'
+ pom.groupId = 'de.regnis.q.sequence'
+ pom.project {
+ name "Sequence Library"
+ description "Textual Diff and Merge Library"
+ url "https://svn.tmatesoft.com/repos/3rdparty/de.regnigs.q.sequence"
+
+ scm {
+ url "https://svn.tmatesoft.com/repos/3rdparty/de.regnigs.q.sequence"
+ connection "scm:svn:https://svn.tmatesoft.com/repos/3rdparty/de.regnis.q.sequence"
+ developerConnection "scm:svn:https://svn.tmatesoft.com/repos/3rdparty/de.regnis.q.sequence"
+ }
+ organization {
+ name "TMate Software"
+ url "https://tmatesoft.com/"
+ }
+ developers {
+ developer {
+ id "alexander.kitaev"
+ email "support at tmatesoft.com"
+ name "Alexander Kitaev"
+ roles {
+ role "developer"
+ }
+ }
+ }
+ licenses {
+ license {
+ name "Sequence Library License (BSD-like)"
+ url "https://svn.tmatesoft.com/repos/3rdparty/de.regnis.q.sequnce/trunk/LICENSE.txt"
+ distribution "repos"
+ comments "Sequence Library License (BSD-like)"
+ }
+ }
+
+ }
}
}
=====================================
build.pom.gradle deleted
=====================================
@@ -1,9 +0,0 @@
-project.ext {
- packaging = 'jar'
- pomName = 'Sequence Library'
- pomUrl = 'http://svn.svnkit.com/repos/3rdparty/de.regnigs.q.sequence'
- pomDescription = 'Textual Diff and Merge Library'
- licenses = [['name': 'Sequence Library License', 'url' : 'http://www.svnkit.com/SEQUENCE-LICENSE.txt']]
- scm = ['url': 'http://svn.svnkit.com/repos/3rdparty/de.regnigs.q.sequence', 'connection': 'scm:svn:http://svn.svnkit.com/repos/3rdparty/de.regnigs.q.sequence']
- developers = [['id': 'syntevo', 'name' : 'SyntEvo GmbH']]
-}
\ No newline at end of file
=====================================
run.sh
=====================================
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+IMAGE_NAME=`basename $PWD`
+
+docker build -t "$IMAGE_NAME" .
+docker run --rm -v $PWD:/home/docker/project -v ~/.m2:/home/docker/.m2 -v ~/.gradle:/home/docker/.gradle -it "$IMAGE_NAME" ./gradlew $*
=====================================
src/main/java/de/regnis/q/sequence/media/QSequenceCachingMediaSymbolMap.java
=====================================
@@ -53,11 +53,11 @@ public class QSequenceCachingMediaSymbolMap {
private int getSymbol(Object obj) {
Integer symbol = (Integer)map.get(obj);
if (symbol == null) {
- symbol = new Integer(symbolCount);
+ symbol = symbolCount;
symbolCount++;
map.put(obj, symbol);
}
return symbol.intValue();
}
-}
\ No newline at end of file
+}
View it on GitLab: https://salsa.debian.org/java-team/libsequence-library-java/-/commit/63794eccc15f3f50cf8e164faefef8b840ef8791
--
View it on GitLab: https://salsa.debian.org/java-team/libsequence-library-java/-/commit/63794eccc15f3f50cf8e164faefef8b840ef8791
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/20250124/3a30d52a/attachment.htm>
More information about the pkg-java-commits
mailing list