This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository json-simple.
commit cc4a6494a935ff8df744232dc8e4f1b7d18e48d6
Author: Gilles Filippini <p...@debian.org>
Date: Sun Nov 19 22:52:32 2017 +0100
Upload release 2.3.0-1~exp1 to experimental
---
debian/README.Debian | 15 -----
debian/changelog | 15 +++++
debian/control | 3 -
debian/copyright | 8 +--
debian/libjson-simple-java.poms | 2 +-
debian/patches/java8-compatibility.patch | 77 ----------------------
debian/patches/junit-scope-test.patch | 15 -----
.../missing-and-needless-maven-plugins.patch | 52 +++++++++++++++
debian/patches/series | 3 +-
debian/rules | 5 --
10 files changed, 73 insertions(+), 122 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index a7e798a..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,15 +0,0 @@
-Jar file name change starting with release 1.1.1
-------------------------------------------------
-
-Up to release 1.1, the jar filename was 'json_simple.jar'. Starting with
-release 1.1.1 it is 'json-simple.jar'.
-
-The symbolic link:
- /usr/share/java/json_simple.jar -> json-simple.jar
-is provided for convenience in this package, but will be removed in a next
-upload.
-
-Packages build depending on libjson-simple-java must be adapted to use the
-new name.
-
- -- Gilles Filippini <p...@debian.org> Sun, 22 Sep 2013 18:42:47 +0200
diff --git a/debian/changelog b/debian/changelog
index 0a3523b..f0d6dc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+json-simple (2.3.0-1~exp1) experimental; urgency=medium
+
+ * New upstream release
+ * New upstream (Clifton Labs)
+ * debian/libjson-simple-java.poms: use --relocate to stay backward
+ compatible with previous groupId com.googlecode.json-simple
+ * New patch: missing-and-needless-maven-plugins.patch: drop
+ dependency on Maven plugins maven-jflex-plugin and
+ nexus-staging-maven-plugin
+ * Drop patches java8-compatibility.patch and junit-scope-test.patch
+ (not needed anymore)
+ * Drop outdated debian/README.Debian
+
+ -- Gilles Filippini <p...@debian.org> Mon, 20 Nov 2017 20:48:54 +0100
+
json-simple (1.1.1-4) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 4bd882f..6fa0f39 100644
--- a/debian/control
+++ b/debian/control
@@ -29,9 +29,6 @@ Description: Simple, lightweight and efficient JSON toolkit
for Java
.
It has been run through profiling tools to ensure high performance
processing.
- .
- Targeted at JDK 6, JSON.simple is also compatible with JDK 1.2 and
- doesn't depend on any other Java library.
Package: libjson-simple-doc
Section: doc
diff --git a/debian/copyright b/debian/copyright
index 647e08e..432c9af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,16 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: json-simple
-Source: http://code.google.com/p/json-simple/
- JAR files removed from upstream ZIP archive.
+Source: https://github.com/cliftonlabs/json-simple
Files: *
-Copyright: 2006-2012, Yidong Fang <fangyid...@yahoo.com.cn>
+Copyright: 2006-2014, Yidong Fang <fangyid...@yahoo.com.cn>
2006-2012, Chris Nokleberg <chris.nokleb...@gmail.com>
2012, Dave Hughes <nossli...@gmail.com>
+ 2016-2017, Davin Loegering <davin.loeger...@cliftonlabs.com>
License: Apache-2.0
Files: debian/*
-Copyright: 2011 Gilles Filippini <p...@debian.org>
+Copyright: 2011-2017 Gilles Filippini <p...@debian.org>
License: GPL-3+
License: Apache-2.0
diff --git a/debian/libjson-simple-java.poms b/debian/libjson-simple-java.poms
index caee999..a55f687 100644
--- a/debian/libjson-simple-java.poms
+++ b/debian/libjson-simple-java.poms
@@ -25,4 +25,4 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to
be installed.
# Empty by default. [mh_install]
#
-pom.xml --usj-name=json-simple
+pom.xml --usj-name=json-simple
--relocate=com.googlecode.json-simple:json-simple
diff --git a/debian/patches/java8-compatibility.patch
b/debian/patches/java8-compatibility.patch
deleted file mode 100644
index fee5239..0000000
--- a/debian/patches/java8-compatibility.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Description: Fix a test failure with Java 8
-Origin: backport, https://code.google.com/p/json-simple/source/detail?r=220
---- a/src/test/java/org/json/simple/Test.java
-+++ b/src/test/java/org/json/simple/Test.java
-@@ -309,22 +309,18 @@
-
assertEquals("[\"abc\\u0010a\\/\",123,222.123,true]",array1.toString());
-
- JSONObject obj1=new JSONObject();
-- obj1.put("name","fang");
-- obj1.put("age",new Integer(27));
-- obj1.put("is_developer",new Boolean(true));
-- obj1.put("weight",new Double(60.21));
- obj1.put("array1",array1);
- System.out.println("======obj1 with array1===========");
- System.out.println(obj1);
- System.out.println();
--
assertEquals("{\"array1\":[\"abc\\u0010a\\/\",123,222.123,true],\"weight\":60.21,\"age\":27,\"name\":\"fang\",\"is_developer\":true}",obj1.toString());
-+
assertEquals("{\"array1\":[\"abc\\u0010a\\/\",123,222.123,true]}",obj1.toString());
-
- obj1.remove("array1");
- array1.add(obj1);
- System.out.println("======array1 with obj1========");
- System.out.println(array1);
- System.out.println();
--
assertEquals("[\"abc\\u0010a\\/\",123,222.123,true,{\"weight\":60.21,\"age\":27,\"name\":\"fang\",\"is_developer\":true}]",array1.toString());
-+
assertEquals("[\"abc\\u0010a\\/\",123,222.123,true,{}]",array1.toString());
-
- List list = new ArrayList();
- list.add("abc\u0010a/");
-@@ -336,20 +332,16 @@
- System.out.println(JSONArray.toJSONString(list));
- System.out.println();
-
assertEquals("[\"abc\\u0010a\\/\",123,222.123,true,null]",JSONArray.toJSONString(list));
--
-+
- Map map = new HashMap();
-- map.put("name","fang");
-- map.put("age",new Integer(27));
-- map.put("is_developer",new Boolean(true));
-- map.put("weight",new Double(60.21));
- map.put("array1",list);
- System.out.println("======map with list===========");
- System.out.println(map);
- System.out.println();
--
assertEquals("{\"array1\":[\"abc\\u0010a\\/\",123,222.123,true,null],\"weight\":60.21,\"age\":27,\"name\":\"fang\",\"is_developer\":true}",JSONObject.toJSONString(map));
-+
assertEquals("{\"array1\":[\"abc\\u0010a\\/\",123,222.123,true,null]}",JSONObject.toJSONString(map));
-
- Map m1 = new LinkedHashMap();
-- Map m2 = new HashMap();
-+ Map m2 = new LinkedHashMap();
- List l1 = new LinkedList();
-
- m1.put("k11","v11");
-@@ -362,13 +354,13 @@
- l1.add(m2);
- String jsonString = JSONValue.toJSONString(l1);
- System.out.println(jsonString);
--
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\"},{\"k22\":\"v22\",\"k21\":\"v21\",\"k23\":\"v23\"}]",
jsonString);
-+
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\"},{\"k21\":\"v21\",\"k22\":\"v22\",\"k23\":\"v23\"}]",
jsonString);
-
- StringWriter out = new StringWriter();
- JSONValue.writeJSONString(l1, out);
- jsonString = out.toString();
- System.out.println(jsonString);
--
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\"},{\"k22\":\"v22\",\"k21\":\"v21\",\"k23\":\"v23\"}]",
jsonString);
-+
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\"},{\"k21\":\"v21\",\"k22\":\"v22\",\"k23\":\"v23\"}]",
jsonString);
-
- List l2 = new LinkedList();
- Map m3 = new LinkedHashMap();
-@@ -386,6 +378,6 @@
- JSONValue.writeJSONString(l1, out);
- jsonString = out.toString();
- System.out.println(jsonString);
--
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\",\"k14\":{\"k31\":\"v3\",\"k32\":123.45,\"k33\":false,\"k34\":null,\"k35\":[\"vvv\",\"1.23456789123456789\",true,null]}},{\"k22\":\"v22\",\"k21\":\"v21\",\"k23\":\"v23\"}]",jsonString);
-+
assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\",\"k14\":{\"k31\":\"v3\",\"k32\":123.45,\"k33\":false,\"k34\":null,\"k35\":[\"vvv\",\"1.23456789123456789\",true,null]}},{\"k21\":\"v21\",\"k22\":\"v22\",\"k23\":\"v23\"}]",jsonString);
- }
- }
diff --git a/debian/patches/junit-scope-test.patch
b/debian/patches/junit-scope-test.patch
deleted file mode 100644
index fa68ef6..0000000
--- a/debian/patches/junit-scope-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Set scope 'test' for dependency junit so that it doesn't
- propagate into the installed pom file.
-Author: Gilles Filippini <p...@debian.org>
-Index: json-simple/pom.xml
-===================================================================
---- json-simple.orig/pom.xml 2014-05-09 17:44:32.950624516 +0200
-+++ json-simple/pom.xml 2014-05-09 19:13:08.456737489 +0200
-@@ -39,6 +39,7 @@
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
-+ <scope>test</scope>
- </dependency>
- </dependencies>
-
diff --git a/debian/patches/missing-and-needless-maven-plugins.patch
b/debian/patches/missing-and-needless-maven-plugins.patch
new file mode 100644
index 0000000..fae784e
--- /dev/null
+++ b/debian/patches/missing-and-needless-maven-plugins.patch
@@ -0,0 +1,52 @@
+Index: json-simple/pom.xml
+===================================================================
+--- json-simple.orig/pom.xml
++++ json-simple/pom.xml
+@@ -68,27 +68,6 @@
+ </configuration>
+ </plugin>
+ <plugin>
+- <!-- Produces the project's lexers. -->
+- <groupId>de.jflex</groupId>
+- <artifactId>maven-jflex-plugin</artifactId>
+- <version>1.4.3</version>
+- <executions>
+- <execution>
+- <id>jlex</id>
+- <goals>
+- <goal>generate</goal>
+- </goals>
+- <configuration>
+- <outputDirectory>src/main/java</outputDirectory>
+- <lexDefinitions>
+- <lexDefinition>src/main/lex</lexDefinition>
+- </lexDefinitions>
+- <jlex>true</jlex>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+- <plugin>
+ <!-- Can jar the project for local repository installs and
public repository releases. Will also put the pom defined version number into
the manifest. -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+@@ -147,19 +126,6 @@
+ </executions>
+ </plugin>
+ <plugin>
+- <!-- Pushes the signed artifacts to the public repository. -->
+- <groupId>org.sonatype.plugins</groupId>
+- <artifactId>nexus-staging-maven-plugin</artifactId>
+- <version>1.6.7</version>
+- <extensions>true</extensions>
+- <configuration>
+- <serverId>ossrh</serverId>
+- <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+- <autoReleaseAfterClose>true</autoReleaseAfterClose>
+- <goals>deploy</goals>
+- </configuration>
+- </plugin>
+- <plugin>
+ <!-- Helps guide the release process. -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index 44c936e..342b732 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-junit-scope-test.patch
-java8-compatibility.patch
+missing-and-needless-maven-plugins.patch
diff --git a/debian/rules b/debian/rules
index 232c771..ec38b7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,3 @@
%:
dh $@ --buildsystem=maven
-
-get-orig-source:
- destdir=$(CURDIR) && \
- cd $(shell dirname $(word $(words
$(MAKEFILE_LIST)),$(MAKEFILE_LIST)))/.. && \
- USCAN_DESTDIR=$$destdir uscan --noconf --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/json-simple.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
