Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add license file to meta-inf #64

Merged
merged 1 commit into from Jun 18, 2019

Conversation

Projects
None yet
3 participants
@ibauersachs
Copy link
Member

commented Jun 17, 2019

Closes #63

@vlsi

This comment has been minimized.

Copy link

commented Jun 18, 2019

The intention seems OK, however this PR seems to fail to include LICENSE file to the generated jar.

Here's what I have:

$ git log -1
commit 8fcf32fdbb84c6dfeb27e5b0b8ff4aa71a3764a3 (HEAD -> license, origin/license)
Author: Ingo Bauersachs <ingo@jitsi.org>
Date:   Mon Jun 17 23:54:53 2019 +0200

    Add license file to meta-inf
$ mvn package

License file is missing below:

$ unzip -l target/dnsjava-3.0.0-SNAPSHOT.jar
Archive:  target/dnsjava-3.0.0-SNAPSHOT.jar
  Length      Date    Time    Name
---------  ---------- -----   ----
        0  06-18-2019 06:47   META-INF/
     1956  06-18-2019 06:47   META-INF/MANIFEST.MF
        0  06-18-2019 06:47   META-INF/maven/
        0  06-18-2019 06:47   META-INF/maven/dnsjava/
        0  06-18-2019 06:47   META-INF/maven/dnsjava/dnsjava/
      132  06-18-2019 06:47   META-INF/maven/dnsjava/dnsjava/pom.properties
    11129  06-18-2019 06:45   META-INF/maven/dnsjava/dnsjava/pom.xml
        0  06-18-2019 06:47   META-INF/services/
       47  06-18-2019 06:44   META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
     5960  06-18-2019 06:46   dig.class
      643  06-18-2019 06:46   jnamed$1.class
      673  06-18-2019 06:46   jnamed$2.class
      673  06-18-2019 06:46   jnamed$3.class
    20080  06-18-2019 06:46   jnamed.class
     2149  06-18-2019 06:46   lookup.class
        0  06-18-2019 06:47   org/
        0  06-18-2019 06:47   org/xbill/
        0  06-18-2019 06:47   org/xbill/DNS/
     4089  06-18-2019 06:46   org/xbill/DNS/A6Record.class
     3049  06-18-2019 06:46   org/xbill/DNS/AAAARecord.class
     1061  06-18-2019 06:46   org/xbill/DNS/AFSDBRecord.class
      203  06-18-2019 06:46   org/xbill/DNS/APLRecord$1.class
     2303  06-18-2019 06:46   org/xbill/DNS/APLRecord$Element.class
     6977  06-18-2019 06:46   org/xbill/DNS/APLRecord.class
     2855  06-18-2019 06:46   org/xbill/DNS/ARecord.class
     7785  06-18-2019 06:46   org/xbill/DNS/Address.class
      418  06-18-2019 06:46   org/xbill/DNS/CAARecord$Flags.class
     3269  06-18-2019 06:46   org/xbill/DNS/CAARecord.class
     1249  06-18-2019 06:46   org/xbill/DNS/CDNSKEYRecord.class
     1223  06-18-2019 06:46   org/xbill/DNS/CDSRecord.class
     1469  06-18-2019 06:46   org/xbill/DNS/CERTRecord$CertificateType.class
     3812  06-18-2019 06:46   org/xbill/DNS/CERTRecord.class
      998  06-18-2019 06:46   org/xbill/DNS/CNAMERecord.class
      878  06-18-2019 06:46   org/xbill/DNS/Cache$CacheMap.class
     1702  06-18-2019 06:46   org/xbill/DNS/Cache$CacheRRset.class
      263  06-18-2019 06:46   org/xbill/DNS/Cache$Element.class
     1923  06-18-2019 06:46   org/xbill/DNS/Cache$NegativeElement.class
    15367  06-18-2019 06:46   org/xbill/DNS/Cache.class
     2698  06-18-2019 06:46   org/xbill/DNS/Client.class
     3980  06-18-2019 06:46   org/xbill/DNS/ClientSubnetOption.class
      209  06-18-2019 06:46   org/xbill/DNS/Compression$1.class
      628  06-18-2019 06:46   org/xbill/DNS/Compression$Entry.class
     1991  06-18-2019 06:46   org/xbill/DNS/Compression.class
      613  06-18-2019 06:46   org/xbill/DNS/Credibility.class
      602  06-18-2019 06:46   org/xbill/DNS/DClass$DClassMnemonic.class
     1337  06-18-2019 06:46   org/xbill/DNS/DClass.class
     1834  06-18-2019 06:46   org/xbill/DNS/DHCIDRecord.class
     3090  06-18-2019 06:46   org/xbill/DNS/DLVRecord.class
      989  06-18-2019 06:46   org/xbill/DNS/DNAMERecord.class
     3208  06-18-2019 06:46   org/xbill/DNS/DNSInput.class
      485  06-18-2019 06:46   org/xbill/DNS/DNSKEYRecord$Flags.class
      431  06-18-2019 06:46   org/xbill/DNS/DNSKEYRecord$Protocol.class
     3032  06-18-2019 06:46   org/xbill/DNS/DNSKEYRecord.class
     3247  06-18-2019 06:46   org/xbill/DNS/DNSOutput.class
     1729  06-18-2019 06:46   org/xbill/DNS/DNSSEC$Algorithm.class
      439  06-18-2019 06:46   org/xbill/DNS/DNSSEC$DNSSECException.class
     1623  06-18-2019 06:46   org/xbill/DNS/DNSSEC$ECKeyInfo.class
      476  06-18-2019 06:46   org/xbill/DNS/DNSSEC$IncompatibleKeyException.class
     1319  06-18-2019 06:46   org/xbill/DNS/DNSSEC$KeyMismatchException.class
      790  06-18-2019 06:46   org/xbill/DNS/DNSSEC$MalformedKeyException.class
      493  06-18-2019 06:46   org/xbill/DNS/DNSSEC$NoSignatureException.class
      820  06-18-2019 06:46   org/xbill/DNS/DNSSEC$SignatureExpiredException.class
      841  06-18-2019 06:46   org/xbill/DNS/DNSSEC$SignatureNotYetValidException.class
      534  06-18-2019 06:46   org/xbill/DNS/DNSSEC$SignatureVerificationException.class
      760  06-18-2019 06:46   org/xbill/DNS/DNSSEC$UnsupportedAlgorithmException.class
    23526  06-18-2019 06:46   org/xbill/DNS/DNSSEC.class
      499  06-18-2019 06:46   org/xbill/DNS/DSRecord$Digest.class
     3742  06-18-2019 06:46   org/xbill/DNS/DSRecord.class
     1148  06-18-2019 06:46   org/xbill/DNS/EDNSOption$Code.class
     3174  06-18-2019 06:46   org/xbill/DNS/EDNSOption.class
     1157  06-18-2019 06:46   org/xbill/DNS/EmptyRecord.class
     1028  06-18-2019 06:46   org/xbill/DNS/ExtendedFlags.class
     5040  06-18-2019 06:46   org/xbill/DNS/ExtendedResolver$Resolution.class
     6089  06-18-2019 06:46   org/xbill/DNS/ExtendedResolver.class
     1510  06-18-2019 06:46   org/xbill/DNS/Flags.class
     2432  06-18-2019 06:46   org/xbill/DNS/FormattedTime.class
     4298  06-18-2019 06:46   org/xbill/DNS/GPOSRecord.class
     5255  06-18-2019 06:46   org/xbill/DNS/Generator.class
     1372  06-18-2019 06:46   org/xbill/DNS/GenericEDNSOption.class
     2794  06-18-2019 06:46   org/xbill/DNS/HINFORecord.class
     5862  06-18-2019 06:46   org/xbill/DNS/Header.class
      466  06-18-2019 06:46   org/xbill/DNS/IPSECKEYRecord$Algorithm.class
      518  06-18-2019 06:46   org/xbill/DNS/IPSECKEYRecord$Gateway.class
     5156  06-18-2019 06:46   org/xbill/DNS/IPSECKEYRecord.class
     3227  06-18-2019 06:46   org/xbill/DNS/ISDNRecord.class
      630  06-18-2019 06:46   org/xbill/DNS/InvalidDClassException.class
      616  06-18-2019 06:46   org/xbill/DNS/InvalidTTLException.class
      621  06-18-2019 06:46   org/xbill/DNS/InvalidTypeException.class
     3812  06-18-2019 06:46   org/xbill/DNS/KEYBase.class
     2865  06-18-2019 06:46   org/xbill/DNS/KEYRecord$Flags.class
     1260  06-18-2019 06:46   org/xbill/DNS/KEYRecord$Protocol.class
     3447  06-18-2019 06:46   org/xbill/DNS/KEYRecord.class
     1143  06-18-2019 06:46   org/xbill/DNS/KXRecord.class
     7965  06-18-2019 06:46   org/xbill/DNS/LOCRecord.class
    12705  06-18-2019 06:46   org/xbill/DNS/Lookup.class
      992  06-18-2019 06:46   org/xbill/DNS/MBRecord.class
     1008  06-18-2019 06:46   org/xbill/DNS/MDRecord.class
     1008  06-18-2019 06:46   org/xbill/DNS/MFRecord.class
      911  06-18-2019 06:46   org/xbill/DNS/MGRecord.class
     2382  06-18-2019 06:46   org/xbill/DNS/MINFORecord.class
      922  06-18-2019 06:46   org/xbill/DNS/MRRecord.class
     1549  06-18-2019 06:46   org/xbill/DNS/MXRecord.class
     8848  06-18-2019 06:46   org/xbill/DNS/Master.class
    12423  06-18-2019 06:46   org/xbill/DNS/Message.class
     3590  06-18-2019 06:46   org/xbill/DNS/Mnemonic.class
     4146  06-18-2019 06:46   org/xbill/DNS/NAPTRRecord.class
     3261  06-18-2019 06:46   org/xbill/DNS/NSAPRecord.class
      927  06-18-2019 06:46   org/xbill/DNS/NSAP_PTRRecord.class
     3985  06-18-2019 06:46   org/xbill/DNS/NSEC3PARAMRecord.class
      419  06-18-2019 06:46   org/xbill/DNS/NSEC3Record$Digest.class
      419  06-18-2019 06:46   org/xbill/DNS/NSEC3Record$Flags.class
     5970  06-18-2019 06:46   org/xbill/DNS/NSEC3Record.class
     2889  06-18-2019 06:46   org/xbill/DNS/NSECRecord.class
      586  06-18-2019 06:46   org/xbill/DNS/NSIDOption.class
      999  06-18-2019 06:46   org/xbill/DNS/NSRecord.class
     2110  06-18-2019 06:46   org/xbill/DNS/NULLRecord.class
     3691  06-18-2019 06:46   org/xbill/DNS/NXTRecord.class
    15326  06-18-2019 06:46   org/xbill/DNS/Name.class
      468  06-18-2019 06:46   org/xbill/DNS/NameTooLongException.class
     2289  06-18-2019 06:46   org/xbill/DNS/OPENPGPKEYRecord.class
     4736  06-18-2019 06:46   org/xbill/DNS/OPTRecord.class
     1187  06-18-2019 06:46   org/xbill/DNS/Opcode.class
     2535  06-18-2019 06:46   org/xbill/DNS/Options.class
      922  06-18-2019 06:46   org/xbill/DNS/PTRRecord.class
     2756  06-18-2019 06:46   org/xbill/DNS/PXRecord.class
      207  06-18-2019 06:46   org/xbill/DNS/PacketLogger.class
     2347  06-18-2019 06:46   org/xbill/DNS/RPRecord.class
     1937  06-18-2019 06:46   org/xbill/DNS/RRSIGRecord.class
     5473  06-18-2019 06:46   org/xbill/DNS/RRset.class
     1082  06-18-2019 06:46   org/xbill/DNS/RTRecord.class
     2017  06-18-2019 06:46   org/xbill/DNS/Rcode.class
    13572  06-18-2019 06:46   org/xbill/DNS/Record.class
      799  06-18-2019 06:46   org/xbill/DNS/RelativeNameException.class
     1221  06-18-2019 06:46   org/xbill/DNS/ResolveThread.class
      610  06-18-2019 06:46   org/xbill/DNS/Resolver.class
    13362  06-18-2019 06:46   org/xbill/DNS/ResolverConfig.class
      301  06-18-2019 06:46   org/xbill/DNS/ResolverListener.class
     2775  06-18-2019 06:46   org/xbill/DNS/ReverseMap.class
     2369  06-18-2019 06:46   org/xbill/DNS/SIG0.class
     5594  06-18-2019 06:46   org/xbill/DNS/SIGBase.class
     1931  06-18-2019 06:46   org/xbill/DNS/SIGRecord.class
      611  06-18-2019 06:46   org/xbill/DNS/SMIMEARecord$CertificateUsage.class
      502  06-18-2019 06:46   org/xbill/DNS/SMIMEARecord$MatchingType.class
      488  06-18-2019 06:46   org/xbill/DNS/SMIMEARecord$Selector.class
     3139  06-18-2019 06:46   org/xbill/DNS/SMIMEARecord.class
     3906  06-18-2019 06:46   org/xbill/DNS/SOARecord.class
     1382  06-18-2019 06:46   org/xbill/DNS/SPFRecord.class
     2975  06-18-2019 06:46   org/xbill/DNS/SRVRecord.class
      454  06-18-2019 06:46   org/xbill/DNS/SSHFPRecord$Algorithm.class
      419  06-18-2019 06:46   org/xbill/DNS/SSHFPRecord$Digest.class
     2734  06-18-2019 06:46   org/xbill/DNS/SSHFPRecord.class
     1708  06-18-2019 06:46   org/xbill/DNS/Section.class
     1109  06-18-2019 06:46   org/xbill/DNS/Serial.class
     4005  06-18-2019 06:46   org/xbill/DNS/SetResponse.class
     9936  06-18-2019 06:46   org/xbill/DNS/SimpleResolver.class
     1024  06-18-2019 06:46   org/xbill/DNS/SingleCompressedNameBase.class
     1973  06-18-2019 06:46   org/xbill/DNS/SingleNameBase.class
     4002  06-18-2019 06:46   org/xbill/DNS/TCPClient.class
     4904  06-18-2019 06:46   org/xbill/DNS/TKEYRecord.class
      603  06-18-2019 06:46   org/xbill/DNS/TLSARecord$CertificateUsage.class
      494  06-18-2019 06:46   org/xbill/DNS/TLSARecord$MatchingType.class
      480  06-18-2019 06:46   org/xbill/DNS/TLSARecord$Selector.class
     3127  06-18-2019 06:46   org/xbill/DNS/TLSARecord.class
     3271  06-18-2019 06:46   org/xbill/DNS/TSIG$StreamVerifier.class
    11838  06-18-2019 06:46   org/xbill/DNS/TSIG.class
     4934  06-18-2019 06:46   org/xbill/DNS/TSIGRecord.class
     2282  06-18-2019 06:46   org/xbill/DNS/TTL.class
     4525  06-18-2019 06:46   org/xbill/DNS/TXTBase.class
     1382  06-18-2019 06:46   org/xbill/DNS/TXTRecord.class
      449  06-18-2019 06:46   org/xbill/DNS/TextParseException.class
      203  06-18-2019 06:46   org/xbill/DNS/Tokenizer$1.class
     1932  06-18-2019 06:46   org/xbill/DNS/Tokenizer$Token.class
    10618  06-18-2019 06:46   org/xbill/DNS/Tokenizer.class
     1390  06-18-2019 06:46   org/xbill/DNS/Type$TypeMnemonic.class
     7089  06-18-2019 06:46   org/xbill/DNS/Type.class
     4764  06-18-2019 06:46   org/xbill/DNS/TypeBitmap.class
     2652  06-18-2019 06:46   org/xbill/DNS/U16NameBase.class
      643  06-18-2019 06:46   org/xbill/DNS/UDPClient$1.class
     4707  06-18-2019 06:46   org/xbill/DNS/UDPClient.class
     1648  06-18-2019 06:46   org/xbill/DNS/UNKRecord.class
     3130  06-18-2019 06:46   org/xbill/DNS/URIRecord.class
     5380  06-18-2019 06:46   org/xbill/DNS/Update.class
     3277  06-18-2019 06:46   org/xbill/DNS/WKSRecord$Protocol.class
     5554  06-18-2019 06:46   org/xbill/DNS/WKSRecord$Service.class
     5353  06-18-2019 06:46   org/xbill/DNS/WKSRecord.class
      691  06-18-2019 06:46   org/xbill/DNS/WireParseException.class
     2765  06-18-2019 06:46   org/xbill/DNS/X25Record.class
     2668  06-18-2019 06:46   org/xbill/DNS/Zone$ZoneIterator.class
    12120  06-18-2019 06:46   org/xbill/DNS/Zone.class
      458  06-18-2019 06:46   org/xbill/DNS/ZoneTransferException.class
      218  06-18-2019 06:46   org/xbill/DNS/ZoneTransferIn$1.class
     2256  06-18-2019 06:46   org/xbill/DNS/ZoneTransferIn$BasicHandler.class
      819  06-18-2019 06:46   org/xbill/DNS/ZoneTransferIn$Delta.class
      482  06-18-2019 06:46   org/xbill/DNS/ZoneTransferIn$ZoneTransferHandler.class
    11521  06-18-2019 06:46   org/xbill/DNS/ZoneTransferIn.class
        0  06-18-2019 06:47   org/xbill/DNS/spi/
     5006  06-18-2019 06:46   org/xbill/DNS/spi/DNSJavaNameService.class
     1430  06-18-2019 06:46   org/xbill/DNS/spi/DNSJavaNameServiceDescriptor.class
        0  06-18-2019 06:47   org/xbill/DNS/utils/
     1762  06-18-2019 06:46   org/xbill/DNS/utils/base16.class
      543  06-18-2019 06:46   org/xbill/DNS/utils/base32$Alphabet.class
     3330  06-18-2019 06:46   org/xbill/DNS/utils/base32.class
     3015  06-18-2019 06:46   org/xbill/DNS/utils/base64.class
     1522  06-18-2019 06:46   org/xbill/DNS/utils/hexdump.class
        0  06-18-2019 06:47   org/xbill/DNS/windows/
      104  06-18-2019 06:44   org/xbill/DNS/windows/DNSServer.properties
      117  06-18-2019 06:44   org/xbill/DNS/windows/DNSServer_de.properties
      145  06-18-2019 06:44   org/xbill/DNS/windows/DNSServer_fr.properties
      219  06-18-2019 06:44   org/xbill/DNS/windows/DNSServer_ja.properties
      150  06-18-2019 06:44   org/xbill/DNS/windows/DNSServer_pl.properties
    18540  06-18-2019 06:46   update.class
---------                     -------
   611618                     211 files

@ibauersachs ibauersachs force-pushed the license branch from 8fcf32f to e783c00 Jun 18, 2019

@ibauersachs

This comment has been minimized.

Copy link
Member Author

commented Jun 18, 2019

Thanks! maven-bundle-plugin was playing tricks with me, should be fine now.

@kingle

kingle approved these changes Jun 18, 2019

@vlsi

This comment has been minimized.

Copy link

commented Jun 18, 2019

Nice. The build looks ok to me (I did not ran it through the tool, however the jar looks fine)

@ibauersachs ibauersachs merged commit f358f1a into master Jun 18, 2019

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage remained the same at 46.602%
Details

@ibauersachs ibauersachs deleted the license branch Jun 18, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.