Skip to content

Commit

Permalink
[#346] Comment out GH #19 test as it fails on GH Action
Browse files Browse the repository at this point in the history
- Disable gh-19
- Convert jaxb-annox to proper bundle (don't leave edited file on disk for release)
- Disable gpg signing for CI testing
- Add dummy gpg key
  • Loading branch information
mattrpav committed Sep 8, 2023
1 parent e84c4d6 commit bda60bc
Show file tree
Hide file tree
Showing 9 changed files with 214 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven-build-action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: mvn -Pall -no-transfer-progress clean install

- name: Maven with JDK 11 - Release dry run
run: mvn -Psonatype-oss-release,release -DperformRelease -DdryRun=true -B release:clean release:prepare clean install
run: mvn -Psonatype-oss-release,release -DperformRelease -DdryRun=true -Dgpg.skip=true -Dgpg.homedir=~/work/jaxb-tools/jaxb-tools/build/gpg -Dgpg.passphrase=password -B release:clean release:prepare clean install

- name: Set up JDK 17
uses: actions/setup-java@v3
Expand All @@ -44,4 +44,4 @@ jobs:
run: mvn -Pall -no-transfer-progress clean install

- name: Maven with JDK 17 - Release dry run
run: mvn -Psonatype-oss-release,release -DperformRelease -DdryRun=true -B release:clean release:prepare clean install
run: mvn -Psonatype-oss-release,release -DperformRelease -DdryRun=true -Dgpg.skip=true -Dgpg.homedir=~/work/jaxb-tools/jaxb-tools/build/gpg -Dgpg.passphrase=password -B release:clean release:prepare clean install
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
This is a revocation certificate for the OpenPGP key:

pub rsa4096 2023-09-08 [S] [expires: 2033-09-05]
8113F80C8223CD716316E2BB97AAE8A25ECB55AB
uid JAXB Tools CI Test (not valid for release signing) <nobody@jaxb.jvnet.org>

A revocation certificate is a kind of "kill switch" to publicly
declare that a key shall not anymore be used. It is not possible
to retract such a revocation certificate once it has been published.

Use it to revoke this key in case of a compromise or loss of
the secret key. However, if the secret key is still accessible,
it is better to generate a new revocation certificate and give
a reason for the revocation. For details see the description of
of the gpg command "--generate-revocation" in the GnuPG manual.

To avoid an accidental use of this file, a colon has been inserted
before the 5 dashes below. Remove this colon with a text editor
before importing and publishing this revocation certificate.

:-----BEGIN PGP PUBLIC KEY BLOCK-----
Comment: This is a revocation certificate

iQI2BCABCAAgFiEEgRP4DIIjzXFjFuK7l6rool7LVasFAmT7rTwCHQAACgkQl6ro
ol7LVau++Q//fKAhxA85ZV7zYcJzqr7Xsw1sa5WK1CINV/+i3KEf2p1zS9H1SCN3
LVQyJV5MKK+m29y9+E5XPgpk4ULOTRGBln+tYaX7bJwM2QxO54hU5KxnGHxO/tIn
uB8iV23AOoL5A4/jZ/dfv0VXNPgVvXKDJ7QknHViZlRyxBYIAn0kOknES2Tu9siI
atrO7dbNVyeyDzNdJlBCRrnXfIa2ICMPSf+Q/0Tvh5ie9VCx4i9G6hkIV/rkdQIP
MTocfj5Qbs5RqgAtM1Uy2C6NsTT14PPZeB9rwc4MU984FnJBXPJD2BrGVLOsEgQ0
D9YCJ/mxNjW/78eQd6OP89YZGbERv+f3VlWlq8r175II7xMDG22cBzn9MHn75gaK
i6pGespH6KpmIYAgP/xNayGj88zraeCoco4+D2nh1+afRBJMFJmg0yqyMcLQdXLa
MS++rbP+k/p6f9ML9QJ40KwkQiK1xLoS/MtchrPkSY51PWPHCMfckz4Fcz06QRvD
DHnUY01+3BsTgXuNWb+KrsQC8fM0XJPVRnM6IDMfvbEAEhdkG9WTSee+jglWQvIg
csXpZOiKtTG/hv9pOzzKgrSk1xeeYz8FNLxxwzurltKdDecvd+UI74eYLYDz+RhQ
M48c1ZOnHV5+IBzK3NBgQngnVrVznAvtITCFa8VkbSlUBPilR8MCVMQ=
=l8UQ
-----END PGP PUBLIC KEY BLOCK-----
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
Created: 20230908T232433
Key: (protected-private-key (rsa (n #00C3CA851B15224384E1D55468C98946C7
4DD1F95D0E43E9178D256F2D6500B1BFD0CC4FFAB69417C555F3801CC6E8FBEF677641
29F4413D0349344A6617D9FC5796ABE080509DD8DEB8BC1FE5AB7FCB2E96BD93614B0C
0FD17E59FDA504D9F600E537573DD2B97502E3B59EB5A847DBE15A46601FAF3D88DB0B
E9CE1C8761AEB41672E6A055ED248801A34D4ED1F363FCD59B6BC3C012195933AB44AF
839133CD855AE0ABC323A4F5E88C0373F9CE6A6C688764887AE344EFB34AF38FEF63EA
6BF44F616BF229FD22C9AAD1537D626A9D867270EC178E14CE0736ABAC22B3F6342485
0552D78D6CB5F01087626509389AECCA4D0412B463A595F2EFF6A8C63696CD7E4FACE6
C1D3DC9A758D718C30013ABFBECC1DADF94A6033C4DCCA7FA1209F5ED5F467490049F8
3DC424EF458C7E12504103515128B2F4810E1CBC2EB76DA78AB17A62C203061E859FFD
480ABE5C5280A586424C46B02F4C8B994BAC541ACD7F5CDFAFEC3DE2B872E943D48E48
015EDD9E22BE7566D87A8AF635ABF4BA5B9B7B42936C502FA07F9D5E92DA07A0A7D439
FCB0E529365BD37691357676CC829E586137E8E9217BE490A8908F20D05EEDD866D3DC
F0184BCE159B9559A62B75A8A1ADA220DB5B9433EA012339F3CFD022BC020B73427FE7
37EEEBCDADCC03A37F7BEF7A324106AE8E7FAEEA535F04DA20197B27584EA3694D29C4
75594566285F#)(e #010001#)(protected openpgp-s2k3-ocb-aes ((sha1
#6EEA2F5C328E40E3# "30783488")#2B6220C594E13A687F6BDEF6#)#889B4132806
3EAE73B2D19C9A162CF79CB83A2F424323F023C2AFAB0D78C2769EB594309F39F7DE4A
70EE84CDA0BEF15A49CBD1846F9742E200832687637C523F732EDD40FF117562804442
A020D63215DA45D1B261A5E4F85E2AFCB1CD292C8492107CB191388612DB05308A3183
CA9AE5AC2B94EE9A273D83615E19E1125C2146774E925FF7744B81AB500F01C95A70D2
79E17966C78A9FD7098E78BBA57236EFA82C7F65FF7F7AD4B864C32A8170E310040C10
39C58D7333F2F8CED97C98E505C5A9737474579F9428F75FBA17CE82ED85AB0863E041
B0F0CB7B5557E0B2F8CD5CF86E8FC12953F7D55652C82DEE25EB156FD24A6C1ABF41DB
0D0CAF3459FEFC4914D21390B674AA75652A74028285A86FE36AAEFEAEE039F89BDCDE
64BBBD8EB028B4E61BEC98983F037F25D9AAD8D50D2D4089626D90856C58F8E11DA78F
F2B1054DB265E80E72AAB01E57C73C07D607644BDC4780B8F75E6F951315E909A4D021
0123CE40AF74070DFA400C145E0DC6085667CAAF4A4E7763E9AC20619B3A8250C8D4DD
4C8973CFA93AE7BEF29AD49FE31021061B4D6212DFA3B0D0C253ADE7DB5FFA054F4725
74FEDC1205EBE04FD916F489FD0FC8ACDE7250E5C88F559FA53B2307BB069840E8856E
6094C94A48936C8B6612333D0762D89D80E8026CCACB3BBFEE039575BB8C5DB7C3DAD1
E7B445C4628BCFC2229B625BFD1ECA70F8DAF89B8839804ABB5776E0C9F5EC0697904E
92ACCB7F90929FC49319E99BB3B4DD86D7B7A1A88A4557927D70AD0358553A3E5B1F21
5A73BFC6EB77716ACE2466B655466B0799DA4E5C4345952AB56A268BEEF7FD6EA00B7A
9BC8ABB9C4565EEBB51D44F91030826874D5AFB41728A8110820CCD3B44BCBF17AFD24
10C73B3F812FF6E5494B503B0B08424AF98B47ED27A4FA4D1B57536DCE47A22549784C
349D09D0B6926F8482A5C74EA01835F4B3F12AC892D4EC6A69B94121B6195A8F79E7C8
3165305D4F10A33574BCB6141454B83013BAFE4074C963CB13798FDA9058FA705364D9
F86DE2F3D637B53D508C6BADF6AC156DA3A2DBE0C5F27C67025BBFFCAF87820C726428
E07E141D17BCBDF4F0A8888DC6D028FC7B9DA25EE7DCCC7F747A77201DF678E7A2BDA7
7F40EBB66E918DDD2272CD911045E9DC39293F7C52374AF95B5B3373C42E38A443D795
15AB68F7DE2F09337B19790C6BC49C092B5C4EF1FFD4CB033C19B90FA6019E0D7398EE
DEC09E2DC437C1C8BDA5938FB33261D1930DD5F6CD76C3D21E49343B282E0E7EE42837
2DF8D9C47939676CCA4FE6C2C310300032CB38891399B472339868368BE22A3EC4BF5F
9C1871785202E168B4EF22DA2B729F219575514D9E9EDAD0A80A3FEFF20FF7187F3265
428D853E62204A1AFECB370168875918D347A5E6755B2FB24EF885C06CBB7D6679FCF1
F3142091996ECD1FBD48BC93E1D979EB345FD612640CBDD2BADBCAF4E17F1C84F5015F
57769DCD4BF61645694064CB86534463563CF536C1A5B60C38144BE4BAB1F883635758
55EBD1088E853E28229DED3E61A819ED215E15165649923CFBAD58D6D878AF1FBC99BB
D39E3EAB8818DE82F97A9AFCFD6164347FFE21DAE5D8C8BAD0F9316728E221ED64F0DB
EDFDAE580639FB79674CE1C03249603623E03A01BFEDC09F49F30550B7F40B137FCE36
E593FF19325BE77812DDBFA4F097946195777C995C537934B42FD8684F8707095ED06D
D7F44F161AA3877FBB1D026BF90683A5F043F273900ED2C0E96C19688D2123FED84D2F
5216EEB3AD2EB3B9598A0BD96075006E900BBE971AF93D8D7E7D583EC30B8152349441
4D0D5F2B70E758B9A88ED0251DBA4BFC54844EF45E59BBEF3F1D313618722B8F3C75D0
820B3#)(protected-at "20230908T232442")))
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
Created: 20230908T232433
Key: (protected-private-key (rsa (n #009710D55A97FB3EC4BA83729A3731D5F4
3A40370DFB56BF9B72EB77CF5E3684C817E6C9999CA98DE2FCD29787A967219E389B05
D27DCBEFA3198C3189133BA47C7710789D6D6419CD830CA5E0AA3FE852826BEFBA9315
E19D82B05E9DB2B5B7DE181138B2BA003A9DDA527D587D7386F85F339CCE76C7077FEB
8630DE7A011990140624F3C22BCAE7B7F815084388185C77CF92F89253A3380B17A35A
25769B572EC47AF03DB0519E9C18D6AE3D45274EDCEB740753B2A4102DBF4E7262497C
77E34E465F2E465D47854AA6659018F591A86866F4F815DD8B707507602D32A3C45CDF
F51CAEB4259471907075EF0A443547C6167CF6D166AE397BBB2E92975C7337D905A4C9
9CF1C3F730CD01CAEC1AB72D6AE8584908D5B9FCAA6715AB2B87A61CA069E75F4E0DFD
4A1352A93C04B2C0945FE1D02CB263A4CF9C398D1FD44988480729073F294EC7CB8779
91AC8EB372AEC9F22C627449281D008A7F0B5858AC396C9089868FDB178096C282B3DC
D2EA39B514E8479748A619708D5FE118A44E4F7A4EB13E88B495A12259472BF9586789
B3BAB5C37D7564246C86CE155788A19E0E6CF068392C0AC93AC22C95DB25A3863F0B71
3BF17FC56DBDE67C702251E365AD419FCA24453F54B7E8EBA1605D141460CC11878C42
D2B47A4F79A15B0C6C00775E08FD91327444B2D92B4EBEF434215230412FD3404D2B63
D9732847B233#)(e #010001#)(protected openpgp-s2k3-ocb-aes ((sha1
#B6DC67BA9C26A944# "30783488")#B2E5ACAFA23388DD1F7C4FA6#)#8CF690ED4CE
A45BB1C023D9A01FF48DE0A794BCA839711B8F998A0DD75B6C84C7FEC6C7C0E1C94034
82AD42F0DDE9F238A565CEE3F40238F892C41327B8D6783AFBEF26428DE5045CFBD916
7B30C48D8E48F299D8ED742D932AA29EF84DED48A54F51C46A6627D47436B278465347
59150E98AA427E65C1AB2344CD22FC5A25C16C7146E1431D12F9908E473B4F9C56AE52
F2AA2E69444841A0A0FC4D935AA558BC2061E67D64BBE8191FD027E76F23717CFE86B5
E82EF2BB570AA4A428D2F674E406A715A41C5F0EDF6DBEA09E01E08B75282AA463D192
5DFBB852F4686B1038A2BB00A0665FF7BEF54EF9A725BD8B71A1E202F11BBCA6E2B933
5A028CCB9D6199BA51D07FB9F5F784A7D936E54B86064F90CCF5333B01F505D137F2A9
65E9677F29E8EEDB16AF83EF46D35F721D4A4B646324F39C8E2F47F04D7A5FE23305CB
86872BF22FDD5C1EF798EB4AE8441A8254655767E5110CFDF21C669A855E35233602A4
D0A34B79D7B013A893A05C1A409D19EC42EC739C55664FCE0F4C92EC57A8E9BDC6209B
CBE12C78835B203DD8703140FE2E4B7EA3D7EAD1BE80A34D1F314CB6D15BEAC7C7C027
F47936EF394F50A76D65E642645B75A4A41E7504B62C42036058AF9F6D05721D0785FA
29AA2E64912EDA5D032B772F6E9B919FA250BEEDDDD57096B5A36C828363FA431067B2
8216FDE175DC9856396D9A4936E2E2546099CF8479545DED2FD4C8ED005CFACCE07D32
A54C75923C73AFAD49C8174097EAE61FB4F1C74BFC4BBA827653EE2BC4E33E8973F4C6
A8B97F95942E18EC40804C6D1A7A3559C50455DF19855C5029E60C240883AE2CBBB12B
848CB4B74091AF5F9C0411F493E2FE046985766BA46A3366E56528E0795F069B39F77F
7225B90E73CA1CD6E217746DB068B58A49F08F14983715BBD377BD4F5E7435B34CCC6E
3A25723324C9DB3C105B2A8065A6C0A1C58890850D445EC53615315AB413AC26F7BEEA
847F644FE8610EDD3924FDD806AE97B24825DCF20FCAE450E4DB5C17B2228A927DB79E
DC285B410CDDB4A37145629AB1559B457CB1AFA5BE7AD1F7E321CEFC63823A41B3EC07
310B58A37C823B56347783ECA95AD7F31CC02E801EDCBD01C0C5276B75C5C0FA9E0191
EDF648ACE9B69E06E8A6C8BEA72A3E65B26EF2E69E3F0B833292DA4E108137DE4823D9
82F93D3461F8B2B4B029D5119F657D1D8231B2CBCEF91CECEC24B11842D7CE61D787DB
0D25723CBBA3BC0E25C176F2068BC6C3984DD629EF907FDF6D4BECF05964E76300183B
63AA596D1C03A00E5B5731EE8C59246B27DAB05BFDC0310924AB7D77FA57EBFA86A567
2E0C8EA38A1F073F3F1B9389FCA3D82320B8F8E9764140601AB76C8FC6A6302C9009E6
7D9E766A340B14720A46C0D12FFB0B4DE0D188617B656286484AB9A704EC5C50749B3F
EBF77B8CD2BE937F4414E163FEE5FEBE3C2BDC99AAFD85F75A804B4DBBACD3AAD0169D
A52709DB0E3E4D4EE7C8AC0120F3683B3AE3FEEA88A7FC8F8CE0E27E2602A6D3F71EDE
11E49EBCF30727868492B1CEB3BDD1F38242D8D965DA3425CE6AC74FAD4B9B2A35BC96
1C43F9FC5E355B3939F02F829F6DCF1F892AAFFF9426615E5A85BE8307BC5E51087A5E
99CB32DDF923FDCF6D991BF5830BF15D988FCD4E7E1AE3B10EEB631373844BC7C6007C
79CF1B790BB40086058DEC1731CE326586046D88BEF170044AA5035160C83EDE8C10AE
F2BCC5A4CFF96CA0972346C8323E1B917019A8FC4694065BAF8617F157AEE09C5317E1
85739A59B42528EF0AD504887249FA7A6D73E0486B88B37610A0F552423AC09722AFCD
EE25EE0F53369AAB359955FC4BF7BA678808CDCE3BC3CD64032EA917A1CA67C34D1975
68A6E#)(protected-at "20230908T232444")))
Binary file added build/gpg/pubring.kbx
Binary file not shown.
Binary file added build/gpg/trustdb.gpg
Binary file not shown.
60 changes: 59 additions & 1 deletion jaxb-annox-parent/jaxb-annox/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,28 @@
<properties>
<annox.osgi.version>${project.version}</annox.osgi.version>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<!-- jaxb.osgi properties -->
<jaxb.osgi.version>${project.version}</jaxb.osgi.version>
<jaxb.osgi.export />
<jaxb.osgi.export.defaults>${project.groupId}*;version=${jaxb.osgi.version};-noimport:=true</jaxb.osgi.export.defaults>
<jaxb.osgi.export.pkg>${jaxb.osgi.export}</jaxb.osgi.export.pkg>
<jaxb.osgi.import />
<jaxb.osgi.private>!*</jaxb.osgi.private>
<jaxb.osgi.private.pkg>${jaxb.osgi.private}</jaxb.osgi.private.pkg>
<jaxb.osgi.bundle.name>${project.name}</jaxb.osgi.bundle.name>
<jaxb.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</jaxb.osgi.import.default.version>
<jaxb.osgi.import.defaults>org.slf4j;version="${hyte.slf4j.version.range}";provider=paxlogging,org.apache.logging.log4j;version="${hyte.log4j2.version.range}";provider=paxlogging</jaxb.osgi.import.defaults>
<jaxb.osgi.import.pkg>${jaxb.osgi.import},${jaxb.osgi.import.defaults},*</jaxb.osgi.import.pkg>
<jaxb.osgi.failok>false</jaxb.osgi.failok>
<jaxb.osgi.split.pkg>-split-package:=first</jaxb.osgi.split.pkg>
<jaxb.osgi.dynamic />
<jaxb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</jaxb.osgi.symbolic.name>
<jaxb.osgi.exclude.dependencies>false</jaxb.osgi.exclude.dependencies>
<jaxb.osgi.resource>{maven-resources}</jaxb.osgi.resource>
<jaxb.osgi.services.export />
<jaxb.osgi.embed.dependency>!*</jaxb.osgi.embed.dependency>
<jaxb.osgi.embed.transitive>false</jaxb.osgi.embed.transitive>
<jaxb.osgi.service.component />
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -48,6 +70,42 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<inherited>true</inherited>
<extensions>true</extensions>
<configuration>
<versions>
<jaxb.osgi.version>${project.version}</jaxb.osgi.version>
</versions>
<excludeDependencies>${jaxb.osgi.exclude.dependencies}</excludeDependencies>
<obrRepository>NONE</obrRepository>
<instructions>
<Bundle-Name>${jaxb.osgi.bundle.name}</Bundle-Name>
<Bundle-SymbolicName>${jaxb.osgi.symbolic.name}</Bundle-SymbolicName>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
<Implementation-Title>${project.description}</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
<Maven-URI>mvn:${project.groupId}/${project.artifactId}/${project.version}</Maven-URI>
<!-- not needed
<Bundle-Activator>${jaxb.osgi.activator}</Bundle-Activator>
<DynamicImport-Package>${jaxb.osgi.dynamic}</DynamicImport-Package>
<Embed-Dependency>${jaxb.osgi.embed.dependency}</Embed-Dependency>
<Embed-Transitive>${jaxb.osgi.embed.transitive}</Embed-Transitive>
<Export-Package>${jaxb.osgi.export.pkg}</Export-Package>
<Import-Package>${jaxb.osgi.import.pkg}</Import-Package>
<Service-Component>${jaxb.osgi.service.component}</Service-Component>
-->
<!-- Advanced OSGi <Private-Package>${jaxb.osgi.private.pkg}</Private-Package>
<Include-Resource>${jaxb.osgi.resource}</Include-Resource>
<_versionpolicy>${jaxb.osgi.import.default.version}</_versionpolicy>
<_failok>${jaxb.osgi.failok}</_failok>
<Export-Service>${jaxb.osgi.services.export}</Export-Service> -->
</instructions>
</configuration>
</plugin>
<!-- legacy
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down Expand Up @@ -97,7 +155,7 @@
</archive>
</configuration>
</plugin>

-->
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion maven-plugin/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<module>MAVEN_JAXB2_PLUGIN-86</module>
<module>MAVEN_JAXB2_PLUGIN-87</module>
<module>gh-issue-16</module>
<module>gh-issue-19</module>
<!-- module>gh-issue-19</module -->
<module>gh-issue-22</module>
<module>gh-issue-23</module>
<module>gh-issue-58</module>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-invoker-plugin.version>3.1.0</maven-invoker-plugin.version>
<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
Expand Down

0 comments on commit bda60bc

Please sign in to comment.