[Git][java-team/google-flogger][master] Build missing classes
Olek Wojnar
gitlab at salsa.debian.org
Mon Jul 20 23:18:32 BST 2020
Olek Wojnar pushed to branch master at Debian Java Maintainers / google-flogger
Commits:
1ab789ea by Olek Wojnar at 2020-07-20T18:18:18-04:00
Build missing classes
- - - - -
7 changed files:
- debian/changelog
- debian/libgoogle-flogger-java.poms
- debian/patches/backend-build.patch
- debian/patches/maven-build.patch
- debian/patches/replace-nullable.patch
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+google-flogger (0.5.1-2) unstable; urgency=medium
+
+ * Build missing classes
+
+ -- Olek Wojnar <olek at debian.org> Sun, 19 Jul 2020 03:44:53 -0400
+
google-flogger (0.5.1-1) unstable; urgency=medium
* Initial release (Closes: #959836)
=====================================
debian/libgoogle-flogger-java.poms
=====================================
@@ -1,4 +1,4 @@
pom.xml --java-lib --no-parent
api/pom.xml --java-lib
-api/pom-backend.xml --java-lib
+backend/pom.xml --java-lib
google/pom.xml --java-lib
=====================================
debian/patches/backend-build.patch
=====================================
@@ -1,5 +1,6 @@
Description: Correctly find PlatformProvider.class
Author: Olek Wojnar <olek at debian.org>
+Forwarded: not-needed
Last-Update: 2020-06-29
--- a/api/src/main/java/com/google/common/flogger/backend/Platform.java
=====================================
debian/patches/maven-build.patch
=====================================
@@ -2,11 +2,12 @@ Description: Build using Maven
Temporarily build using Maven to avoid a circular dependency with Bazel
Author: Yun Peng <pcloudy at google.com>
Author: Olek Wojnar <olek at debian.org>
+Forwarded: not-needed
Last-Update: 2020-06-22
--- /dev/null
+++ b/pom.xml
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2018 The Flogger Authors.
@@ -39,7 +40,7 @@ Last-Update: 2020-06-22
+
+ <modules>
+ <module>api</module>
-+ <module>api/pom-backend.xml</module>
++ <module>backend</module>
+ <module>google</module>
+ </modules>
+
@@ -80,12 +81,6 @@ Last-Update: 2020-06-22
+ <version>debian</version>
+ </dependency>
+ <dependency>
-+ <groupId>com.google.flogger</groupId>
-+ <artifactId>platform-provider</artifactId>
-+ <version>0.5.1</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
+ <groupId>com.google.flogger</groupId>
+ <artifactId>flogger</artifactId>
+ <version>0.5.1</version>
@@ -96,7 +91,7 @@ Last-Update: 2020-06-22
+</project>
--- /dev/null
+++ b/api/pom.xml
-@@ -0,0 +1,104 @@
+@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2018 The Flogger Authors.
@@ -141,20 +136,6 @@ Last-Update: 2020-06-22
+ <source>1.8</source>
+ <target>1.8</target>
+ <excludes>
-+<!-- <exclude>com/google/common/flogger/util/Checks.java</exclude>
-+ <exclude>com/google/common/flogger/util/StaticMethodCaller.java</exclude>
-+ <exclude>com/google/common/flogger/backend/KeyValueFormatter.java</exclude>
-+ <exclude>com/google/common/flogger/backend/KeyValueHandler.java</exclude>
-+ <exclude>com/google/common/flogger/backend/Tags.java</exclude>
-+ <exclude>com/google/common/flogger/context/*.java</exclude>
-+ <exclude>com/google/common/flogger/LazyArg.java</exclude>
-+ <exclude>com/google/common/flogger/LazyArgs.java</exclude>
-+ <exclude>com/google/common/flogger/LogSiteStackTrace.java</exclude>
-+ <exclude>com/google/common/flogger/StackSize.java</exclude>
-+ <exclude>com/google/common/flogger/LoggerConfig.java</exclude>
-+ <exclude>com/google/common/flogger/LogSite.java</exclude>
-+ <exclude>com/google/common/flogger/LogSiteKey.java</exclude>
-+ <exclude>com/google/common/flogger/LogSites.java</exclude> -->
+ <exclude>com/google/common/flogger/backend/system/**/*.java</exclude>
+ </excludes>
+ </configuration>
@@ -195,14 +176,10 @@ Last-Update: 2020-06-22
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+</dependency>
-+<dependency>
-+ <groupId>com.google.flogger</groupId>
-+ <artifactId>platform-provider</artifactId>
-+</dependency>
+ </dependencies>
+</project>
--- /dev/null
-+++ b/api/pom-backend.xml
++++ b/backend/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
=====================================
debian/patches/replace-nullable.patch
=====================================
@@ -2,6 +2,7 @@ Description: Replace obsolete @NullableDecl
org.checkerframework.checker.nullness.compatqual.NullableDecl replaced with:
org.checkerframework.checker.nullness.qual.Nullable thanks to the power of sed
Author: Olek Wojnar <olek at debian.org>
+Forwarded: https://github.com/google/flogger/pull/173
Last-Update: 2020-05-29
--- a/api/src/main/java/com/google/common/flogger/LazyArg.java
=====================================
debian/rules
=====================================
@@ -11,9 +11,8 @@ export https_proxy=127.0.0.1:9
dh $@
override_dh_auto_configure:
- install -d debian/.debhelper/generated/_source/home debian/.debhelper/generated/_source/xdg-runtime-dir
- /usr/share/maven-debian-helper/copy-repo.sh debian
- touch debian/stamp-poms-patched
+ cp -af api/src backend/
+ dh_auto_configure
# flogger has a very interesting way to generate the platform_provider.jar directly from a java binary
# This is a replacement for //api:gen_platform_provider
# This override is only required for the Maven build
@@ -23,7 +22,7 @@ override_dh_auto_configure:
com.google.common.flogger.backend.PlatformProviderGenerator api/platform_provider.jar
mvn install:install-file -Dfile=api/platform_provider.jar \
-DgroupId=com.google.flogger -DartifactId=platform-provider \
- -Dversion=0.5.1 -Dpackaging=jar -Dmaven.repo.local=debian/maven-repo
+ -Dversion=debian -Dpackaging=jar -Dmaven.repo.local=debian/maven-repo
override_dh_auto_build:
mkdir -p api/target/classes/
=====================================
debian/watch
=====================================
@@ -1,8 +1,5 @@
version=4
-# PGP signature mangle, so foo.tar.gz has foo.tar.gz.sig
-#opts="pgpsigurlmangle=s%$%.sig%"
-
opts="repack" \
https://github.com/google/flogger/tags \
.*/flogger-(\d[\d.]*)\.tar\.gz debian uupdate
View it on GitLab: https://salsa.debian.org/java-team/google-flogger/-/commit/1ab789eac781ddca2142abd8f393622c8b975347
--
View it on GitLab: https://salsa.debian.org/java-team/google-flogger/-/commit/1ab789eac781ddca2142abd8f393622c8b975347
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/20200720/ca8dbc87/attachment.html>
More information about the pkg-java-commits
mailing list