Skip to content

Commit 1ec3911

Browse files
jrivardjrivard
committed
update manifest attributes
1 parent 75c8f2b commit 1ec3911

File tree

7 files changed

+57
-31
lines changed

7 files changed

+57
-31
lines changed

‎client/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,20 +130,23 @@
130130
<version>3.3.0</version>
131131
<configuration>
132132
<archive>
133+
<manifest>
134+
<addDefaultEntries>false</addDefaultEntries>
135+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
136+
</manifest>
133137
<manifestEntries>
134138
<Implementation-Title>${project.name}</Implementation-Title>
135139
<Implementation-Version>${project.version}</Implementation-Version>
136140
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
137141
<Implementation-URL>${project.organization.url}</Implementation-URL>
138-
<Implementation-Build>${build.number}</Implementation-Build>
139-
<Implementation-Revision>${build.revision}</Implementation-Revision>
140-
<Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
142+
<Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
141143
<SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
142144
<SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
143145
<SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
144146
<SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
145147
<SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
146148
<SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
149+
<SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
147150
</manifestEntries>
148151
</archive>
149152
</configuration>

‎data-service/pom.xml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,23 @@
5252
<archiveClasses>true</archiveClasses>
5353
<packagingExcludes>WEB-INF/classes</packagingExcludes>
5454
<archive>
55+
<manifest>
56+
<addDefaultEntries>false</addDefaultEntries>
57+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
58+
</manifest>
5559
<manifestEntries>
5660
<Implementation-Title>${project.name}</Implementation-Title>
5761
<Implementation-Version>${project.version}</Implementation-Version>
5862
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
5963
<Implementation-URL>${project.organization.url}</Implementation-URL>
60-
<Implementation-Build>${build.number}</Implementation-Build>
61-
<Implementation-Revision>${build.revision}</Implementation-Revision>
62-
<Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
64+
<Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
65+
<SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
66+
<SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
67+
<SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
68+
<SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
69+
<SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
70+
<SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
71+
<SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
6372
</manifestEntries>
6473
</archive>
6574
</configuration>

‎onejar/pom.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,25 @@
4848
<descriptor>onejar-assembly.xml</descriptor>
4949
</descriptors>
5050
<archive>
51+
<manifest>
52+
<addDefaultEntries>false</addDefaultEntries>
53+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
54+
</manifest>
5155
<manifestEntries>
5256
<Main-Class>password.pwm.onejar.OnejarMain</Main-Class>
5357
<Implementation-Archive-Name>pwm.onejar</Implementation-Archive-Name>
5458
<Implementation-Title>${project.name}</Implementation-Title>
5559
<Implementation-Version>${project.version}</Implementation-Version>
5660
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
5761
<Implementation-URL>${project.organization.url}</Implementation-URL>
58-
<Implementation-Build>${build.number}</Implementation-Build>
59-
<Implementation-Revision>${build.revision}</Implementation-Revision>
60-
<Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
61-
<Implementation-Build-Java-Spec-Version>${java.specification.version}</Implementation-Build-Java-Spec-Version>
62+
<Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
6263
<SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
6364
<SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
6465
<SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
6566
<SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
6667
<SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
6768
<SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
69+
<SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
6870
</manifestEntries>
6971
</archive>
7072
</configuration>

‎pom.xml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@
132132
<dateFormat>yyyy-MM-dd'T'HH:mm:ss'Z'</dateFormat>
133133
<dateFormatTimeZone>Zulu</dateFormatTimeZone>
134134
<failOnNoGitDirectory>false</failOnNoGitDirectory>
135-
<generateGitPropertiesFile>true</generateGitPropertiesFile>
136-
<generateGitPropertiesFilename>${project.build.outputDirectory}/classes/git.json</generateGitPropertiesFilename>
137-
<format>json</format>
135+
<generateGitPropertiesFile>false</generateGitPropertiesFile>
138136
<gitDescribe>
139137
<tags>true</tags>
140138
</gitDescribe>
@@ -156,19 +154,25 @@
156154
</goals>
157155
<configuration>
158156
<archive>
157+
<manifest>
158+
<addDefaultEntries>false</addDefaultEntries>
159+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
160+
</manifest>
159161
<manifestEntries>
160162
<Implementation-Archive-Name>pwm.javadoc</Implementation-Archive-Name>
161163
<Implementation-Title>${project.name}</Implementation-Title>
162164
<Implementation-Version>${project.version}</Implementation-Version>
163165
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
164166
<Implementation-URL>${project.organization.url}</Implementation-URL>
165-
<Implementation-Build-Java-Spec-Version>${java.specification.version}</Implementation-Build-Java-Spec-Version>
167+
<Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
166168
<SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
167169
<SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
168170
<SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
169171
<SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
170172
<SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
171-
<SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty> </manifestEntries>
173+
<SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
174+
<SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
175+
</manifestEntries>
172176
</archive>
173177
<source>${maven.compiler.release}</source>
174178
</configuration>
@@ -188,21 +192,24 @@
188192
<includePom>true</includePom>
189193
<attach>true</attach>
190194
<archive>
195+
<manifest>
196+
<addDefaultEntries>false</addDefaultEntries>
197+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
198+
</manifest>
191199
<manifestEntries>
192200
<Implementation-Archive-Name>pwm.source</Implementation-Archive-Name>
193201
<Implementation-Title>${project.name}</Implementation-Title>
194202
<Implementation-Version>${project.version}</Implementation-Version>
195203
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
196204
<Implementation-URL>${project.organization.url}</Implementation-URL>
197-
<Implementation-Build-Java-Spec-Version>${java.specification.version}</Implementation-Build-Java-Spec-Version>
198-
<Implementation-Revision>${build.revision}</Implementation-Revision>
199-
<Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
205+
<Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
200206
<SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
201207
<SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
202208
<SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
203209
<SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
204210
<SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
205211
<SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
212+
<SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
206213
</manifestEntries>
207214
</archive>
208215
</configuration>

‎rest-test-service/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@
3434
<archiveClasses>true</archiveClasses>
3535
<packagingExcludes>WEB-INF/classes</packagingExcludes>
3636
<archive>
37+
<manifest>
38+
<addDefaultEntries>false</addDefaultEntries>
39+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
40+
</manifest>
3741
<manifestEntries>
38-
<Implementation-Archive-Name>pwm.war</Implementation-Archive-Name>
3942
<Implementation-Title>${project.name}</Implementation-Title>
4043
<Implementation-Version>${project.version}</Implementation-Version>
4144
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
4245
<Implementation-URL>${project.organization.url}</Implementation-URL>
43-
<Implementation-Build-Java-Vendor>${java.vendor}</Implementation-Build-Java-Vendor>
44-
<Implementation-Build-Java-Version>${java.version}</Implementation-Build-Java-Version>
45-
<Implementation-Build>${build.number}</Implementation-Build>
46-
<Implementation-Revision>${build.revision}</Implementation-Revision>
47-
<Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
46+
<Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
4847
<SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
4948
<SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
5049
<SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
5150
<SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
5251
<SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
5352
<SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
53+
<SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
5454
</manifestEntries>
5555
</archive>
5656
</configuration>

‎server/pom.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,23 +107,25 @@
107107
<version>3.3.0</version>
108108
<configuration>
109109
<archive>
110+
<manifest>
111+
<addDefaultEntries>false</addDefaultEntries>
112+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
113+
</manifest>
110114
<manifestEntries>
111-
<Archive-Type>jar</Archive-Type>
112115
<Archive-UID>F84576985F0A176014F751736F7C79B6D9BED842FC48377404FE24A36BF6C2AA</Archive-UID>
113116
<Implementation-Archive-Name>pwm.server</Implementation-Archive-Name>
114117
<Implementation-Title>${project.name}</Implementation-Title>
115118
<Implementation-Version>${project.version}</Implementation-Version>
116119
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
117120
<Implementation-URL>${project.organization.url}</Implementation-URL>
118-
<Implementation-Build-Java-Spec-Version>${java.specification.version}</Implementation-Build-Java-Spec-Version>
119-
<Implementation-Revision>${build.revision}</Implementation-Revision>
120-
<Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
121+
<Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
121122
<SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
122123
<SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
123124
<SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
124125
<SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
125126
<SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
126127
<SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
128+
<SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
127129
</manifestEntries>
128130
</archive>
129131
</configuration>

‎webapp/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,24 @@
112112

113113
<webXml>${webXmlForJspPreCompiledInjection}</webXml>
114114
<archive>
115+
<manifest>
116+
<addDefaultEntries>false</addDefaultEntries>
117+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
118+
</manifest>
115119
<manifestEntries>
116120
<Implementation-Archive-Name>${warArtifactID}</Implementation-Archive-Name>
117121
<Implementation-Title>${project.name}</Implementation-Title>
118122
<Implementation-Version>${project.version}</Implementation-Version>
119123
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
120124
<Implementation-URL>${project.organization.url}</Implementation-URL>
121-
<Implementation-Build-Java-Spec-Version>${java.specification.version}</Implementation-Build-Java-Spec-Version>
122-
<Implementation-Revision>${build.revision}</Implementation-Revision>
123-
<Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
125+
<Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
124126
<SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
125127
<SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
126128
<SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
127129
<SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
128130
<SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
129131
<SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
132+
<SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
130133
</manifestEntries>
131134
</archive>
132135
</configuration>

0 commit comments

Comments
 (0)