Skip to content

Commit 67af5f1

Browse files
KortanulKortanul
committed
Updates 1.5.2.0 for WrenSec repos & info
also cleans-up some down-right confuzing, sloppy, and useless package descriptions.
1 parent b433440 commit 67af5f1

File tree

18 files changed

+375
-180
lines changed

18 files changed

+375
-180
lines changed

‎.wren-deploy.rc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export MAVEN_PACKAGE="openicf-java-framework"
2+
export BINTRAY_PACKAGE="wrenicf-java-framework"
3+
export JFROG_PACKAGE="org/forgerock/openicf/framework"

‎bundles-parent/pom.xml‎

Lines changed: 60 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
44
55
Copyright (c) 2010-2015 ForgeRock AS. All rights reserved.
6+
Portions Copyright 2017 Wren Security.
67
78
The contents of this file are subject to the terms
89
of the Common Development and Distribution License
@@ -24,30 +25,23 @@
2425
-->
2526
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2627
<modelVersion>4.0.0</modelVersion>
28+
2729
<parent>
2830
<groupId>org.forgerock.openicf.framework</groupId>
2931
<artifactId>framework</artifactId>
3032
<version>1.5.2.0</version>
3133
</parent>
34+
3235
<groupId>org.forgerock.openicf.connectors</groupId>
3336
<artifactId>connectors-parent</artifactId>
3437
<packaging>pom</packaging>
35-
<name>OpenICF Connectors</name>
38+
39+
<name>Wren:ICF - Connector Bundles - Parent</name>
3640
<description>
37-
This pom module is the parent for all connector bundles. It defines the dependencies on framework, building the
38-
connector bundle and common reporting for connectors.
39-
This is not multi module project, it does not aggregate the connectors, it is just common parent.
41+
This is the parent POM for all connector bundles. It specifies the common framework
42+
dependencies, and defines the standard process that is used to build connector bundles.
4043
</description>
41-
<distributionManagement>
42-
<site>
43-
<id>forgerock.org</id>
44-
<url>${siteDistributionURL}/connectors/</url>
45-
</site>
46-
</distributionManagement>
47-
<!-- mvn help:effective-pom
48-
mvn archetype:create-from-project
49-
mvn help:active-profiles
50-
-->
44+
5145
<properties>
5246
<!--
5347
These are the properties needed in manifest file of the bundle,
@@ -72,6 +66,7 @@
7266
<openicf.osgi.import.framework.version>
7367
version="[$(version;==;${project.framework.version}),$(version;+;${project.framework.version}))"
7468
</openicf.osgi.import.framework.version>
69+
7570
<openicf.osgi.import.strict.version>
7671
version="[$(version;===;${project.framework.version}),$(version;=+;${project.framework.version}))"
7772
</openicf.osgi.import.strict.version>
@@ -87,6 +82,7 @@
8782
${openicf.osgi.import.additional},
8883
*
8984
</openicf.osgi.import.pkg>
85+
9086
<openicf.osgi.import>${openicf.osgi.import.pkg}</openicf.osgi.import>
9187

9288
<openicf.osgi.private />
@@ -107,22 +103,20 @@
107103
<openicf.osgi.activator />
108104
<openicf.osgi.dynamic.import />
109105
<openicf.osgi.include.resource>{maven-resources}</openicf.osgi.include.resource>
106+
110107
<openicf.osgi.import.default.version>
111108
[$(version;==;$(@)),$(version;=+;$(@)))
112109
</openicf.osgi.import.default.version>
110+
113111
<openicf.osgi.remove.headers>
114112
Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL,Embedded-Artifacts,Embed-Dependency,Built-By,
115113
Build-Jdk,Tool
116114
</openicf.osgi.remove.headers>
115+
117116
<openicf.osgi.failok>false</openicf.osgi.failok>
118117
<openicf.osgi.export.service />
119118
<openicf.osgi.import.service />
120119
<openicf.osgi.embed />
121-
<!-- If we release this project, we need to include the ForgeRock binary license -->
122-
<include.binary.license>
123-
${project.build.directory}/maven-shared-archive-resources/legal-notices
124-
</include.binary.license>
125-
126120
</properties>
127121

128122
<dependencyManagement>
@@ -140,12 +134,14 @@
140134
<version>${project.framework.version}</version>
141135
<scope>test</scope>
142136
</dependency>
137+
143138
<dependency>
144139
<groupId>org.forgerock.openicf.framework</groupId>
145140
<artifactId>connector-test-common</artifactId>
146141
<version>${project.framework.version}</version>
147142
<scope>test</scope>
148143
</dependency>
144+
149145
<dependency>
150146
<groupId>org.forgerock.openicf.framework</groupId>
151147
<artifactId>connector-framework</artifactId>
@@ -161,13 +157,16 @@
161157
<testResource>
162158
<directory>${project.basedir}/src/test/config</directory>
163159
</testResource>
160+
164161
<testResource>
165162
<directory>${privateConfigPath}</directory>
163+
166164
<excludes>
167165
<exclude>lib/**</exclude>
168166
<exclude>**/target/**</exclude>
169167
</excludes>
170168
</testResource>
169+
171170
<!--testResource>
172171
<directory>src/test/java</directory>
173172
<excludes>
@@ -184,6 +183,7 @@
184183
<plugin>
185184
<groupId>org.apache.maven.plugins</groupId>
186185
<artifactId>maven-javadoc-plugin</artifactId>
186+
187187
<configuration>
188188
<links>
189189
<link>http://download.oracle.com/javase/8/docs/api/</link>
@@ -192,14 +192,17 @@
192192
</links>
193193
</configuration>
194194
</plugin>
195+
195196
<plugin>
196197
<groupId>org.apache.maven.plugins</groupId>
197198
<artifactId>maven-site-plugin</artifactId>
199+
198200
<configuration>
199201
<stagingSiteURL>
200202
${siteDistributionURL}/connectors/${project.artifactId}-${project.version}
201203
</stagingSiteURL>
202204
</configuration>
205+
203206
<dependencies>
204207
<dependency>
205208
<groupId>org.forgerock.maven.plugins</groupId>
@@ -208,36 +211,38 @@
208211
</dependency>
209212
</dependencies>
210213
</plugin>
214+
211215
<plugin>
212216
<groupId>org.apache.maven.plugins</groupId>
213217
<artifactId>maven-scm-plugin</artifactId>
218+
214219
<configuration>
215220
<tag>${project.version}</tag>
216-
<message>[ForgeRock Connector Release] ${project.name}</message>
221+
<message>[Wren Security Connector Release] ${project.name}</message>
217222
</configuration>
218223
</plugin>
219224

220-
221225
<!--<plugins>-->
222226
<plugin>
223227
<groupId>org.apache.felix</groupId>
224228
<artifactId>maven-bundle-plugin</artifactId>
225229
<extensions>true</extensions>
230+
226231
<configuration>
227232
<excludeDependencies>${openicf.osgi.exclude.dependencies}</excludeDependencies>
233+
228234
<instructions>
229235
<!-- Required immutable instructions -->
230236
<Embed-Directory>lib</Embed-Directory>
231237
<Embed-Transitive>true</Embed-Transitive>
232238

233-
<!-- OpenICF Headers -->
239+
<!-- Wren:ICF Headers -->
234240
<ConnectorBundle-FrameworkVersion>
235241
${ConnectorBundle-FrameworkVersion}
236242
</ConnectorBundle-FrameworkVersion>
237243
<ConnectorBundle-Name>${ConnectorBundle-Name}</ConnectorBundle-Name>
238244
<ConnectorBundle-Version>${ConnectorBundle-Version}</ConnectorBundle-Version>
239245

240-
241246
<!-- OSGi Headers -->
242247
<Bundle-Name>${project.name}</Bundle-Name>
243248
<Bundle-SymbolicName>${openicf.osgi.symbolic.name}</Bundle-SymbolicName>
@@ -254,7 +259,6 @@
254259
<Import-Service>${openicf.osgi.import.service}</Import-Service>
255260
<Embed-Dependency>${openicf.osgi.embed}</Embed-Dependency>
256261

257-
258262
<!-- Implementation Entries -->
259263
<Implementation-Title>${project.name}</Implementation-Title>
260264
<Implementation-Version>${project.version}</Implementation-Version>
@@ -268,11 +272,13 @@
268272
<plugin>
269273
<groupId>org.apache.maven.plugins</groupId>
270274
<artifactId>maven-remote-resources-plugin</artifactId>
275+
271276
<executions>
272277
<execution>
273278
<goals>
274279
<goal>process</goal>
275280
</goals>
281+
276282
<configuration>
277283
<resourceBundles>
278284
<resourceBundle>${licenseResourceBundle}</resourceBundle>
@@ -281,38 +287,45 @@
281287
</execution>
282288
</executions>
283289
</plugin>
290+
284291
<plugin>
285292
<groupId>org.apache.maven.plugins</groupId>
286293
<artifactId>maven-jar-plugin</artifactId>
287-
<executions>
288294

295+
<executions>
289296
<!-- Attach also test-jar -->
290297
<execution>
291298
<id>package-test</id>
299+
<phase>package</phase>
300+
301+
<goals>
302+
<goal>test-jar</goal>
303+
</goals>
304+
292305
<configuration>
293306
<excludes>
294307
<exclude>${connectorName}/**</exclude>
295308
</excludes>
296309
</configuration>
297-
<phase>package</phase>
298-
<goals>
299-
<goal>test-jar</goal>
300-
</goals>
301310
</execution>
302311

303312
<!-- Attach public test config -->
304313
<execution>
305314
<id>package-publictestconfig</id>
306315
<phase>package</phase>
316+
307317
<goals>
308318
<goal>jar</goal>
309319
</goals>
320+
310321
<configuration>
311322
<classesDirectory>${project.build.testOutputDirectory}</classesDirectory>
312323
<classifier>publictestconfig</classifier>
324+
313325
<includes>
314326
<include>${connectorName}/**</include>
315327
</includes>
328+
316329
<excludes>
317330
<exclude>**/config-private/**</exclude>
318331
</excludes>
@@ -324,6 +337,7 @@
324337
<plugin>
325338
<groupId>org.apache.maven.plugins</groupId>
326339
<artifactId>maven-surefire-plugin</artifactId>
340+
327341
<configuration>
328342
<systemPropertyVariables>
329343
<bundleJar>${project.build.directory}/${project.build.finalName}.jar</bundleJar>
@@ -334,6 +348,7 @@
334348
</systemPropertyVariables>
335349
</configuration>
336350
</plugin>
351+
337352
<plugin>
338353
<groupId>org.forgerock.maven.plugins</groupId>
339354
<artifactId>openicf-maven-plugin</artifactId>
@@ -342,16 +357,19 @@
342357
</plugins>
343358
</pluginManagement>
344359
</build>
360+
345361
<reporting>
346362
<plugins>
347363
<plugin>
348364
<groupId>org.forgerock.maven.plugins</groupId>
349365
<artifactId>openicf-maven-plugin</artifactId>
350366
<version>${openicf.maven.plugin.version}</version>
351367
</plugin>
368+
352369
<plugin>
353370
<groupId>org.apache.maven.plugins</groupId>
354371
<artifactId>maven-javadoc-plugin</artifactId>
372+
355373
<configuration>
356374
<links>
357375
<link>http://download.oracle.com/javase/8/docs/api/</link>
@@ -364,15 +382,16 @@
364382
</reporting>
365383

366384
<!-- Profiles-->
367-
368385
<profiles>
369386
<profile>
370387
<id>generate-docbook</id>
388+
371389
<build>
372390
<plugins>
373391
<plugin>
374392
<groupId>org.forgerock.maven.plugins</groupId>
375393
<artifactId>openicf-maven-plugin</artifactId>
394+
376395
<executions>
377396
<execution>
378397
<goals>
@@ -381,43 +400,53 @@
381400
</execution>
382401
</executions>
383402
</plugin>
403+
384404
<plugin>
385405
<groupId>org.forgerock.commons</groupId>
386406
<artifactId>forgerock-doc-maven-plugin</artifactId>
387407
<inherited>true</inherited>
408+
388409
<configuration>
389-
<projectName>OpenICF</projectName>
410+
<projectName>Wren:ICF</projectName>
390411
<googleAnalyticsId>${googleAnalyticsAccountId}</googleAnalyticsId>
391412
<projectVersion>${docTargetVersion}</projectVersion>
392413
<releaseVersion>${docTargetVersion}</releaseVersion>
393414
<docbkxSourceDirectory>${project.build.directory}/openicf-docbkx</docbkxSourceDirectory>
394415
<projectVersion>${docTargetVersion}</projectVersion>
395416
</configuration>
417+
396418
<executions>
397419
<execution>
398420
<id>pre-process-doc</id>
399421
<phase>pre-site</phase>
422+
400423
<goals>
401424
<goal>process</goal>
402425
</goals>
403426
</execution>
427+
404428
<execution>
405429
<id>build-doc</id>
406430
<phase>pre-site</phase>
431+
407432
<goals>
408433
<goal>build</goal>
409434
</goals>
410435
</execution>
436+
411437
<execution>
412438
<id>layout-site</id>
413439
<phase>site</phase>
440+
414441
<goals>
415442
<goal>site</goal>
416443
</goals>
417444
</execution>
445+
418446
<execution>
419447
<id>layout-release</id>
420448
<phase>site</phase>
449+
421450
<goals>
422451
<goal>release</goal>
423452
</goals>

0 commit comments

Comments
 (0)