Skip to content

Commit

Permalink
Merge pull request OpenLiberty#10 from gmarcy/sync-changes-between-repos
Browse files Browse the repository at this point in the history
synchronize open-liberty and WS-CD-Open
  • Loading branch information
gmarcy authored and GitHub Enterprise committed Apr 3, 2017
2 parents 98f5e93 + c586c0f commit c78e5ee
Show file tree
Hide file tree
Showing 506 changed files with 1,495 additions and 1,690 deletions.
2 changes: 2 additions & 0 deletions dev/build.image/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@

-nobundles=true

instrument.disabled: true

-dependson: com.ibm.ws.kernel.instrument.check
2 changes: 2 additions & 0 deletions dev/build.image/bnd.bnd.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@

-nobundles=true

instrument.disabled: true

-dependson: com.ibm.ws.kernel.instrument.check
1 change: 1 addition & 0 deletions dev/build.image/editions/full/runtime.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
<feature>requestInterrupt-1.0</feature>
<feature>socialLogin-1.0</feature>
<feature>servlet-4.0</feature>
<feature>jdbc-4.2</feature>
</featureManager>
</server>
2 changes: 2 additions & 0 deletions dev/cnf/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
-nobundles=true

instrument.disabled: true

-buildpath: \
${javac.bootclasspath.java6}
2 changes: 2 additions & 0 deletions dev/cnf/build.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ instrument.classesExcludes:
instrument.ffdc: true
instrument.taskInjection: false

-buildpath.instrument: ${if;${instrument.disabled};;com.ibm.ws.ras.instrument\\;version=latest}

javac.bootclasspath.java6: \
${workspace}/prereq.java.1.6/lib/rt.jar;version=file;boot=true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ restricted by GSA ADP Schedule Contract with IBM Corp.
<artifactId>com.ibm.websphere.appserver.spi.ssl</artifactId>
<version>${bFullVersion}</version>
<name>WebSphere SSL SPI</name>
<description>WebSphere SSL SPI, version 1.1</description>
<description>WebSphere SSL SPI, version 1.2</description>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ restricted by GSA ADP Schedule Contract with IBM Corp.
<modelVersion>4.0.0</modelVersion>
<groupId>com.ibm.websphere.appserver.spi</groupId>
<artifactId>com.ibm.websphere.appserver.spi.zosCommandProcessing</artifactId>
<version>1.0.16</version>
<version>${bFullVersion}</version>
<name>WebSphere ZOS Command Processing SPI</name>
<description>WebSphere ZOS Command Processing SPI, version 1.0</description>
</project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383813566
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEdition}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383840291
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEditionRestricted}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383842457
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383813656
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: javax.annotation; type=spec,
javax.annotation.security; type=spec,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383842533
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383842603
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1490282142366
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383842684
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383842755
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383813737
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383813809
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383813888
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: com.ibm.websphere.security; type=ibm-api,
com.ibm.websphere.security.auth; type=ibm-api,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383814089
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383837867
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: com.ibm.websphere.security.audit; type="ibm-api"
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383837936
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383838008
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEdition}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383838078
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383830853
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383830929
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383831005
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383831075
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEditionZOs}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383838151
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383817268
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEdition}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383817338
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383817412
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEditionZOs}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383814164
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383814242
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383838226
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383838308
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383817488
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383819186
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383819257
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: org.apache.webbeans.ee.beans; type="internal"
IBM-App-ForceRestart: install,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383819330
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: org.apache.webbeans.ee.common.beans; type="internal"
IBM-App-ForceRestart: install,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383819402
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383819481
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383819553
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: org.apache.webbeans.ee.common.beans; type=internal,
org.apache.webbeans.web.lifecycle; type=internal,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383819624
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: org.apache.webbeans.ee.common.beans; type=internal,
org.apache.webbeans.web.lifecycle; type=internal,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383819695
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: org.apache.webbeans.ee.beans; type="internal"
IBM-App-ForceRestart: install,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383819894
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383819966
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEdition}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383820035
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383828978
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383820107
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383820179
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383820257
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383820334
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383839711
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: com.ibm.websphere.endpoint; type="ibm-api"
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383814316
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383814392
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383814462
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: com.ibm.ws.clientcontainer.remote.common;type="internal"
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEdition}${mfProductVersion}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383814534
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEdition}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383820839
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEditionRestricted}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383831155
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383823011
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383831232
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: com.ibm.websphere.connectionpool.monitor; type="ibm-api"
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383814616
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383814690
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: com.ibm.ws.context.service.serializable; type="internal"
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383833062
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEdition}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383833139
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEdition}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383842825
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383814769
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383826001
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383826080
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: javax.ejb; type=spec,
javax.ejb.embeddable; type=spec,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383826154
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383826228
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383826303
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEdition}${mfProductVersion}
IBM-Feature-Version: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383826375
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-API-Package: com.ibm.ws.clientcontainer.remote.common;type="internal"
IBM-AppliesTo: com.ibm.websphere.appserver;${mfProductEdition}${mfProductVersion}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383826455
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Bnd-LastModified: 1486383826530
Created-By: 1.8.0_121 (Oracle Corporation)
IBM-App-ForceRestart: install,
uninstall
Expand Down
Loading

0 comments on commit c78e5ee

Please sign in to comment.