[Git][java-team/jcodings][debian/sid] 27 commits: Switch to YAML for pom.
Hideki Yamane
gitlab at salsa.debian.org
Mon Sep 17 10:57:08 BST 2018
Hideki Yamane pushed to branch debian/sid at Debian Java Maintainers / jcodings
Commits:
cde0bd63 by Charles Oliver Nutter at 2018-09-06T03:58:52Z
Switch to YAML for pom.
- - - - -
9ee52a22 by Charles Oliver Nutter at 2018-09-06T04:00:54Z
Add module-info at root to support Java 9 modules.
- - - - -
1c780645 by Charles Oliver Nutter at 2018-09-06T04:18:01Z
Remove inline maps for readability.
- - - - -
ce26aafc by Charles Oliver Nutter at 2018-09-06T05:35:19Z
Use openjdk9 only for now.
- - - - -
0e62a3f9 by Charles Oliver Nutter at 2018-09-06T05:40:11Z
Formatting.
- - - - -
0025b6df by Charles Oliver Nutter at 2018-09-06T05:43:04Z
build.xml is no longer needed.
- - - - -
f66c1d34 by Charles Oliver Nutter at 2018-09-06T05:45:54Z
Remove multi-release config that snuck in.
- - - - -
92c740e5 by Charles Oliver Nutter at 2018-09-06T05:52:57Z
Ah. Travis does not detect pom.yml.
- - - - -
ad049c01 by Charles Oliver Nutter at 2018-09-06T06:23:04Z
Restore multi-release jar config and add manifest line.
This line is apparently needed for the JDK tools to detect that
you are using a multi-release jar.
See discussion at https://twitter.com/rfscholte/status/1037578869681926144
- - - - -
f7317382 by Charles Oliver Nutter at 2018-09-06T06:33:28Z
Cleanup some unnecessary noise.
- - - - -
bfc5daa5 by Thomas E. Enebo at 2018-09-06T16:14:15Z
[maven-release-plugin] prepare for next development iteration
- - - - -
8eeacc7a by Charles Oliver Nutter at 2018-09-07T05:47:05Z
Give up on multi-release jar for module-info for now.
See https://twitter.com/headius/status/1037931427000725504
- - - - -
022968e7 by Charles Oliver Nutter at 2018-09-07T06:29:58Z
Bump dev version since 1.0.32 was released on master.
- - - - -
2aa60820 by Charles Oliver Nutter at 2018-09-10T16:15:53Z
Merge branch 'java9'
- - - - -
fe1f1f23 by Charles Oliver Nutter at 2018-09-12T08:46:19Z
Unnecessary.
- - - - -
fd4d569c by Charles Oliver Nutter at 2018-09-12T08:46:42Z
Isolate module-info to JDK9+ builds.
- - - - -
933c03f6 by Charles Oliver Nutter at 2018-09-12T08:47:09Z
Add back Java 8.
- - - - -
da5a62f2 by Charles Oliver Nutter at 2018-09-12T08:47:43Z
Add IDEA files to ignore.
- - - - -
3adef241 by Charles Oliver Nutter at 2018-09-12T09:01:58Z
Tidy up and add some whitespace for readability.
- - - - -
c14e6dc7 by Charles Oliver Nutter at 2018-09-12T09:58:26Z
Move release-related targets into jdk9-specific profile.
- - - - -
c51cede3 by Charles Oliver Nutter at 2018-09-13T20:11:08Z
Switch back to XML so we can use release plugin.
- - - - -
49a7bd7c by Charles Oliver Nutter at 2018-09-14T18:41:40Z
Go back to Sonatype parent pom for now.
- - - - -
f80d2fc1 by Charles Oliver Nutter at 2018-09-14T18:49:38Z
[maven-release-plugin] prepare release jcodings-1.0.34
- - - - -
85d23567 by Hideki Yamane at 2018-09-17T09:33:12Z
Merge tag 'jcodings-1.0.34' into debian/sid
[maven-release-plugin] copy for tag jcodings-1.0.34
- - - - -
4682a6fc by Hideki Yamane at 2018-09-17T09:44:12Z
New upstream release
- - - - -
1ebd2b54 by Hideki Yamane at 2018-09-17T09:54:11Z
refresh patch with updated pom.xml
- - - - -
df1b5cd4 by Hideki Yamane at 2018-09-17T09:54:26Z
upload to unstable
- - - - -
8 changed files:
- .gitignore
- + .mvn/extensions.xml
- .travis.yml
- − build.xml
- debian/changelog
- debian/patches/remove_unnecessary_dependency.patch
- pom.xml
- + src/module-info.java
Changes:
=====================================
.gitignore
=====================================
@@ -1 +1,4 @@
target
+jcodings.iml
+.idea/
+
=====================================
.mvn/extensions.xml
=====================================
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+ <extension>
+ <groupId>io.takari.polyglot</groupId>
+ <artifactId>polyglot-yaml</artifactId>
+ <version>0.3.0</version>
+ </extension>
+</extensions>
=====================================
.travis.yml
=====================================
@@ -1 +1,8 @@
language: java
+
+jdk:
+- openjdk8
+- openjdk9
+
+script: mvn test
+
=====================================
build.xml deleted
=====================================
@@ -1,39 +0,0 @@
-<?xml version="1.0" ?>
-<project name="JCodings" default="build">
-
- <property name="src.dir" value="src" />
- <property name="bin.dir" value="target/classes" />
- <property name="dist.dir" value="target" />
- <property name="jar.name" value="jcodings.jar" />
-
- <target name="clean">
- <delete dir="${bin.dir}" />
- <delete dir="${dist.dir}" />
-
- </target>
-
- <target name="compile">
- <mkdir dir="${bin.dir}" />
- <javac srcdir="${src.dir}" destdir="${bin.dir}"/>
- </target>
-
- <target name="build" depends="compile">
- <mkdir dir="${dist.dir}" />
-
- <tstamp>
- <format property="buildDate" pattern="yyyy-MM-dd" />
- <format property="buildTime" pattern="HH:mm:ss" />
- </tstamp>
-
- <jar destfile="${dist.dir}/${jar.name}" manifest="MANIFEST.MF">
- <fileset dir="${bin.dir}" />
-
- <manifest>
- <attribute name="Built-By" value="${user.name}" />
- <attribute name="Built-Date" value="${buildDate}" />
- <attribute name="Built-Time" value="${buildTime}" />
- </manifest>
- </jar>
-
- </target>
-</project>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jcodings (1.0.34-1) unstable; urgency=medium
+
+ * New upstream release
+ * debian/patches
+ - refresh patch
+
+ -- Hideki Yamane <henrich at debian.org> Mon, 17 Sep 2018 18:54:20 +0900
+
jcodings (1.0.32-1) unstable; urgency=medium
* New upstream release
=====================================
debian/patches/remove_unnecessary_dependency.patch
=====================================
@@ -1,20 +1,19 @@
Description: avoid unnecessary dependency to deal with FTBFS
Author: Hideki Yamane <henrich at debian.org>
Forwarded: not-needed
-Last-Update: 2014-01-15
+Last-Update: 2018-09-17
---- jcodings-1.0.11.orig/pom.xml
-+++ jcodings-1.0.11/pom.xml
-@@ -9,12 +9,6 @@
- Byte based encoding support library for java
- </description>
-
+--- a/pom.xml
++++ b/pom.xml
+@@ -6,11 +6,6 @@
+ <version>1.0.34</version>
+ <name>JCodings</name>
+ <description>Byte based encoding support library for java</description>
- <parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>7</version>
- </parent>
--
- <issueManagement>
- <system>Github</system>
- <url>https://github.com/jruby/jcodings/issues</url>
+ <licenses>
+ <license>
+ <name>MIT License</name>
=====================================
pom.xml
=====================================
@@ -1,31 +1,16 @@
-<?xml version="1.0" ?>
-<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">
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId>
- <version>1.0.32</version>
+ <version>1.0.34</version>
<name>JCodings</name>
- <description>
- Byte based encoding support library for java
- </description>
-
+ <description>Byte based encoding support library for java</description>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
-
- <issueManagement>
- <system>Github</system>
- <url>https://github.com/jruby/jcodings/issues</url>
- </issueManagement>
-
- <scm>
- <connection>scm:git:git://github.com/jruby/jcodings.git</connection>
- <developerConnection>scm:git:git at github.com:jruby/jcodings.git</developerConnection>
- <url>https://github.com/jruby/jcodings</url>
- </scm>
-
<licenses>
<license>
<name>MIT License</name>
@@ -33,15 +18,28 @@
<distribution>repo</distribution>
</license>
</licenses>
-
<developers>
<developer>
<id>lopex</id>
<name>Marcin Mielzynski</name>
<email>lopx at gazeta.pl</email>
</developer>
+ <developer>
+ <id>headius</id>
+ <name>Charles Oliver Nutter</name>
+ <email>headius at headius.com</email>
+ </developer>
</developers>
-
+ <scm>
+ <connection>scm:git:git://github.com/jruby/jcodings.git</connection>
+ <developerConnection>scm:git:git at github.com:jruby/jcodings.git</developerConnection>
+ <url>https://github.com/jruby/jcodings</url>
+ <tag>HEAD</tag>
+ </scm>
+ <issueManagement>
+ <system>Github</system>
+ <url>https://github.com/jruby/jcodings/issues</url>
+ </issueManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -50,12 +48,10 @@
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<sourceDirectory>src</sourceDirectory>
<scriptSourceDirectory>scripts</scriptSourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
- <finalName>jcodings</finalName>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
@@ -63,41 +59,30 @@
<version>2.1</version>
</extension>
</extensions>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>resources</directory>
+ </resource>
+ </resources>
+ <finalName>jcodings</finalName>
<plugins>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
<executions>
<execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
+ <id>default-compile</id>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ <excludes>
+ <exclude>module-info.java</exclude>
+ </excludes>
+ </configuration>
</execution>
</executions>
<configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- <quiet>true</quiet>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
@@ -111,22 +96,73 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
- <configuration>
- <argLine>-Dfile.encoding=UTF-8</argLine>
- </configuration>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.20.1</version>
+ <configuration>
+ <argLine>-Dfile.encoding=UTF-8</argLine>
+ </configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>resources</directory>
- </resource>
- </resources>
</build>
+ <profiles>
+ <profile>
+ <id>release-on-9</id>
+ <activation>
+ <jdk>9</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile9</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <release>9</release>
+ <includes>
+ <include>module-info.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ <quiet>true</quiet>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
=====================================
src/module-info.java
=====================================
@@ -0,0 +1,12 @@
+open module org.jruby.jcodings {
+ exports org.jcodings;
+ exports org.jcodings.ascii;
+ exports org.jcodings.constants;
+ exports org.jcodings.exception;
+ exports org.jcodings.specific;
+ exports org.jcodings.spi;
+ exports org.jcodings.transcode;
+ exports org.jcodings.transcode.specific;
+ exports org.jcodings.unicode;
+ exports org.jcodings.util;
+}
\ No newline at end of file
View it on GitLab: https://salsa.debian.org/java-team/jcodings/compare/e7f33ac81e5d98470df0c0a3c40000b5d8e7d4f0...df1b5cd483e42f2f16d0717bba9050016a34a095
--
View it on GitLab: https://salsa.debian.org/java-team/jcodings/compare/e7f33ac81e5d98470df0c0a3c40000b5d8e7d4f0...df1b5cd483e42f2f16d0717bba9050016a34a095
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/20180917/d76c0e97/attachment.html>
More information about the pkg-java-commits
mailing list