[Git][java-team/objenesis][master] 3 commits: New upstream version 3.0.1
Markus Koschany
gitlab at salsa.debian.org
Sun Oct 21 14:42:46 BST 2018
Markus Koschany pushed to branch master at Debian Java Maintainers / objenesis
Commits:
90ab0d92 by Markus Koschany at 2018-10-21T13:36:05Z
New upstream version 3.0.1
- - - - -
1241c028 by Markus Koschany at 2018-10-21T13:36:10Z
Update upstream source from tag 'upstream/3.0.1'
Update to upstream version '3.0.1'
with Debian dir 8a500438478d374cea8e79f1cb5e7f69e0038523
- - - - -
954b07e9 by Markus Koschany at 2018-10-21T13:36:52Z
Update changelog
- - - - -
21 changed files:
- README.md
- benchmark/pom.xml
- benchmark/src/main/java/org/objenesis/benchmark/ConcurrentGetInstantiator.java
- benchmark/src/main/java/org/objenesis/benchmark/CreateObject.java
- debian/changelog
- deploy.sh
- gae/pom.xml
- gae/src/main/java/org/objenesis/gae/JspReporter.java
- main/pom.xml
- main/src/main/java/org/objenesis/instantiator/basic/NewInstanceInstantiator.java
- main/src/main/java/org/objenesis/instantiator/util/ClassDefinitionUtils.java
- main/src/main/java/org/objenesis/instantiator/util/ClassUtils.java
- main/src/test/java/org/objenesis/instantiator/util/ClassDefinitionUtilsTest.java
- pom.xml
- tck-android/pom.xml
- tck-android/src/main/java/org/objenesis/tck/android/ObjenesisTest.java
- tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java
- tck/pom.xml
- website/pom.xml
- website/site/content/notes.html
- website/site/resources/style.css
Changes:
=====================================
README.md
=====================================
@@ -100,11 +100,11 @@ http://www.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven
```bash
# Get the milestone matching the version
-milestone=$(curl -s -u "${github_user}:${github_password}" "https://api.github.com/repos/easymock/easymock/milestones" | jq ".[] | select(.title==\"$version\") | .number")
+milestone=$(curl -s "https://api.github.com/repos/easymock/objenesis/milestones" | jq ".[] | select(.title==\"$version\") | .number")
echo "<h1>Version $version ($(date '+%Y-%m-%d'))</h1>"
echo
echo "<ul>"
-curl -s -u "${github_user}:${github_password}" "https://api.github.com/repos/easymock/objenesis/issues?milestone=11&state=all" | jq -r '.[] | (" <li>" + .title + " ("# +(.number|tostring) + ")</li>")'
+curl -s "https://api.github.com/repos/easymock/objenesis/issues?milestone=${milestone}&state=all" | jq -r '.[] | " <li>" + .title + " (#" + (.number|tostring) + ")</li>"'
echo "</ul>"
```
=====================================
benchmark/pom.xml
=====================================
@@ -21,7 +21,7 @@
<parent>
<groupId>org.objenesis</groupId>
<artifactId>objenesis-parent</artifactId>
- <version>3.0</version>
+ <version>3.0.1</version>
</parent>
<artifactId>objenesis-benchmark</artifactId>
=====================================
benchmark/src/main/java/org/objenesis/benchmark/ConcurrentGetInstantiator.java
=====================================
@@ -48,7 +48,7 @@ public class ConcurrentGetInstantiator {
public static class SunInstantiatorStrategy extends BaseInstantiatorStrategy {
@Override
public <T> ObjectInstantiator<T> newInstantiatorOf(Class<T> type) {
- return new SunReflectionFactoryInstantiator<T>(type);
+ return new SunReflectionFactoryInstantiator<>(type);
}
}
=====================================
benchmark/src/main/java/org/objenesis/benchmark/CreateObject.java
=====================================
@@ -79,8 +79,8 @@ public class CreateObject {
@Setup
public void prepare() {
- sunInstantiator = new SunReflectionFactoryInstantiator<Object>(type);
- unsafeInstantiator = new UnsafeFactoryInstantiator<Object>(type);
+ sunInstantiator = new SunReflectionFactoryInstantiator<>(type);
+ unsafeInstantiator = new UnsafeFactoryInstantiator<>(type);
unsafe = getUnsafe();
constructor = getConstructor();
}
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+objenesis (3.0.1-1) unstable; urgency=medium
+
+ * New upstream version 3.0.1.
+
+ -- Markus Koschany <apo at debian.org> Sun, 21 Oct 2018 15:36:41 +0200
+
objenesis (3.0-1) unstable; urgency=medium
* New upstream version 3.0.
=====================================
deploy.sh
=====================================
@@ -22,7 +22,7 @@ fi
version=$1
-if [ "$(git branch | grep ${version)" == "${version}" ]; then
+if [ "$(git branch | grep ${version})" == "${version}" ]; then
echo "A branch named $version clashes with the version tag"
exit 1
fi
=====================================
gae/pom.xml
=====================================
@@ -23,7 +23,7 @@
<parent>
<artifactId>objenesis-parent</artifactId>
<groupId>org.objenesis</groupId>
- <version>3.0</version>
+ <version>3.0.1</version>
</parent>
<artifactId>gae</artifactId>
@@ -34,7 +34,7 @@
<properties>
<app.id>objenesis</app.id>
<app.version>2</app.version>
- <appengine.version>1.9.65</appengine.version>
+ <appengine.version>1.9.67</appengine.version>
<gcloud.plugin.version>2.0.9.133.v201611104</gcloud.plugin.version>
</properties>
=====================================
gae/src/main/java/org/objenesis/gae/JspReporter.java
=====================================
@@ -120,10 +120,7 @@ public class JspReporter implements Reporter {
if(!success) {
errorCount++;
}
- Map<Candidate.CandidateType, Result> result = results.get(currentCandidate);
- if(result == null) {
- results.put(currentCandidate, result = new HashMap<>());
- }
+ Map<Candidate.CandidateType, Result> result = results.computeIfAbsent(currentCandidate, k -> new HashMap<>());
result.put(type, new Result(currentCandidate, type, success, exception));
}
@@ -148,7 +145,7 @@ public class JspReporter implements Reporter {
summary.println(" Objenesis serializer: " + objenesisSerializer.getInstantiatorOf(String.class).getClass().getName() + "<br>");
summary.println("</p>");
- Collection<String> candidateNames = new ArrayList<String>();
+ Collection<String> candidateNames = new ArrayList<>();
for(Map.Entry<Candidate, Map<Candidate.CandidateType, Result>> entry : results.entrySet()) {
candidateNames.add(entry.getKey().getDescription());
}
@@ -159,7 +156,7 @@ public class JspReporter implements Reporter {
summary.print("<th>Objenesis serializer</th>");
summary.println("</tr>");
- List<Result> exceptions = new ArrayList<Result>();
+ List<Result> exceptions = new ArrayList<>();
// Candidates
for(Map.Entry<Candidate, Map<Candidate.CandidateType, Result>> entry : results.entrySet()) {
=====================================
main/pom.xml
=====================================
@@ -21,7 +21,7 @@
<parent>
<groupId>org.objenesis</groupId>
<artifactId>objenesis-parent</artifactId>
- <version>3.0</version>
+ <version>3.0.1</version>
</parent>
<artifactId>objenesis</artifactId>
@@ -36,6 +36,9 @@
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestEntries>
+ <Automatic-Module-Name>org.objenesis</Automatic-Module-Name>
+ </manifestEntries>
</archive>
</configuration>
</plugin>
=====================================
main/src/main/java/org/objenesis/instantiator/basic/NewInstanceInstantiator.java
=====================================
@@ -18,7 +18,6 @@ package org.objenesis.instantiator.basic;
import org.objenesis.instantiator.ObjectInstantiator;
import org.objenesis.instantiator.annotations.Instantiator;
import org.objenesis.instantiator.annotations.Typology;
-import org.objenesis.instantiator.util.ClassDefinitionUtils;
import org.objenesis.instantiator.util.ClassUtils;
/**
=====================================
main/src/main/java/org/objenesis/instantiator/util/ClassDefinitionUtils.java
=====================================
@@ -15,8 +15,6 @@
*/
package org.objenesis.instantiator.util;
-import org.objenesis.ObjenesisException;
-
import java.io.BufferedOutputStream;
import java.io.FileOutputStream;
import java.io.IOException;
=====================================
main/src/main/java/org/objenesis/instantiator/util/ClassUtils.java
=====================================
@@ -17,14 +17,6 @@ package org.objenesis.instantiator.util;
import org.objenesis.ObjenesisException;
-import java.io.BufferedOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
-
/**
* Helper class for to play with classes. It contains everything needed to play with a class
* except the dodgy (Java 8) code you will find in {@link ClassDefinitionUtils}.
=====================================
main/src/test/java/org/objenesis/instantiator/util/ClassDefinitionUtilsTest.java
=====================================
@@ -17,9 +17,6 @@ package org.objenesis.instantiator.util;
import org.junit.Test;
import org.objenesis.Objenesis;
-import org.objenesis.ObjenesisException;
-
-import java.util.ArrayList;
import static org.junit.Assert.*;
=====================================
pom.xml
=====================================
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.objenesis</groupId>
<artifactId>objenesis-parent</artifactId>
- <version>3.0</version>
+ <version>3.0.1</version>
<packaging>pom</packaging>
<name>Objenesis parent project</name>
@@ -54,7 +54,7 @@
<url>https://github.com/easymock/objenesis</url>
<developerConnection>scm:git:git at github.com:easymock/objenesis.git</developerConnection>
<connection>scm:git:https://github.com/easymock/objenesis.git</connection>
- <tag>3.0</tag>
+ <tag>3.0.1</tag>
</scm>
<developers>
=====================================
tck-android/pom.xml
=====================================
@@ -21,7 +21,7 @@
<parent>
<groupId>org.objenesis</groupId>
<artifactId>objenesis-parent</artifactId>
- <version>3.0</version>
+ <version>3.0.1</version>
</parent>
<artifactId>objenesis-tck-android</artifactId>
<name>Objenesis Android TCK</name>
=====================================
tck-android/src/main/java/org/objenesis/tck/android/ObjenesisTest.java
=====================================
@@ -51,15 +51,11 @@ public class ObjenesisTest extends AndroidTestCase {
@Override
public void exception(Candidate.CandidateType type, Exception exception) {
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- PrintStream out = new PrintStream(buffer);
- try {
+ try (PrintStream out = new PrintStream(buffer)) {
out.println("Exception when instantiating " + currentCandidate + " for " + type + ": ");
exception.printStackTrace(out);
fail(buffer.toString());
}
- finally {
- out.close();
- }
}
@Override
=====================================
tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java
=====================================
@@ -40,11 +40,7 @@ public class TckInstrumentation extends Instrumentation {
System.setOut(printStream);
System.setErr(printStream);
- try {
- launch();
- } catch (IOException e) {
- e.printStackTrace();
- }
+ launch();
Bundle bundle = new Bundle();
String fromStdout = outputStream.toString();
@@ -52,7 +48,7 @@ public class TckInstrumentation extends Instrumentation {
finish(Activity.RESULT_OK, bundle);
}
- private void launch() throws IOException {
+ private void launch() {
TextReporter reporter = new TextReporter(System.out, System.err);
Main.run(reporter);
}
=====================================
tck/pom.xml
=====================================
@@ -21,7 +21,7 @@
<parent>
<groupId>org.objenesis</groupId>
<artifactId>objenesis-parent</artifactId>
- <version>3.0</version>
+ <version>3.0.1</version>
</parent>
<artifactId>objenesis-tck</artifactId>
@@ -106,6 +106,9 @@
<manifest>
<mainClass>org.objenesis.tck.Main</mainClass>
</manifest>
+ <manifestEntries>
+ <Automatic-Module-Name>org.objenesis.tck</Automatic-Module-Name>
+ </manifestEntries>
</archive>
</configuration>
</plugin>
=====================================
website/pom.xml
=====================================
@@ -21,14 +21,14 @@
<parent>
<groupId>org.objenesis</groupId>
<artifactId>objenesis-parent</artifactId>
- <version>3.0</version>
+ <version>3.0.1</version>
</parent>
<artifactId>objenesis-website</artifactId>
<name>Objenesis website</name>
<packaging>pom</packaging>
<!-- CHANGE THIS VERSION TO WHAT YOU NEED -->
- <version>3.0</version>
+ <version>3.0.1</version>
<properties>
<javadoc>apidocs</javadoc>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
- <version>3.0</version>
+ <version>3.0.1</version>
</dependency>
</dependencies>
=====================================
website/site/content/notes.html
=====================================
@@ -21,6 +21,12 @@
</head>
<body>
+<h1>Version 3.0.1 (2018-10-18)</h1>
+
+<ul>
+ <li>No Automatic-Module-Name in objenesis (#66)</li>
+</ul>
+
<h1>Version 3.0 (2018-10-07)</h1>
<ul>
=====================================
website/site/resources/style.css
=====================================
@@ -113,7 +113,7 @@ img {
p {
border: 0;
padding: 0;
- margin: 0px 0px 10px;
+ margin: 0 0 10px;
}
blockquote {
@@ -196,9 +196,8 @@ ul, ol {
font-size: 18px;
background-color: #6e61ad;
color: white;
- padding: 2px;
- padding-left: 6px;
- margin-top: 24px;
+ padding: 2px 2px 2px 6px;
+ margin-top: 24px;
margin-bottom: 12px;
}
View it on GitLab: https://salsa.debian.org/java-team/objenesis/compare/e56090d765322f6981eabdbe02675db147b17e07...954b07e92c7d028a1719538b809f3f2f9d584d66
--
View it on GitLab: https://salsa.debian.org/java-team/objenesis/compare/e56090d765322f6981eabdbe02675db147b17e07...954b07e92c7d028a1719538b809f3f2f9d584d66
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/20181021/b65ce546/attachment.html>
More information about the pkg-java-commits
mailing list