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

pull #135

Open
wants to merge 10,000 commits into
base: trunk
Choose a base branch
from
Open

pull #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
534a1e5
[Converter] Fix some of the generics.
bosschaert Nov 29, 2017
0fb8f15
Fix synchronization issue
cziegeler Nov 30, 2017
42bfa64
Fixed a sync problem related to the change count
cziegeler Nov 30, 2017
3836d20
[converter] update the source to follow OSGi formatting guidelines
bosschaert Dec 1, 2017
dc803b5
[Converter] Improved name mangling implementation committed on behalf…
bosschaert Dec 1, 2017
2be208a
Update change count handling
cziegeler Dec 1, 2017
5b558aa
Update change count handling
cziegeler Dec 1, 2017
2c99b70
Update change count handling
cziegeler Dec 1, 2017
bd0b3f3
[converter] fix compilation error on java 7
bosschaert Dec 1, 2017
e76ac33
Update to latest converter
cziegeler Dec 4, 2017
f335654
FELIX-5755 : Servlet API should be optional
cziegeler Dec 5, 2017
8e67e56
FELIX-5755 : Servlet API should be optional
cziegeler Dec 5, 2017
6be2cb2
[maven-release-plugin] prepare release org.apache.felix.inventory-1.0.6
karlpauls Dec 5, 2017
6b948d4
[maven-release-plugin] prepare for next development iteration
karlpauls Dec 5, 2017
ac1ce0c
[converter] update to the latest OSGi API.
bosschaert Dec 7, 2017
ab24474
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.4.8
karlpauls Dec 7, 2017
a21f695
[maven-release-plugin] prepare for next development iteration
karlpauls Dec 7, 2017
a84e25b
FELIX-5754: remove an unnessary continutation from the system package…
karlpauls Dec 7, 2017
fc81481
FELIX-5759: map protocol instead of URLHandler to URL for builtin han…
karlpauls Dec 7, 2017
6bfce26
FELIX-5712 set correct website url for bundle plugin documentation
stefanseifert Dec 8, 2017
cf5672e
FELIX-5760 Update to latest bnd 3.5.0
Dec 11, 2017
3791bca
FELIX-5592 Maven bundle plugin does not support Java 9 Multi-Release …
Dec 11, 2017
24236d7
FELIX-5592 Fix missing = in fixupmessages directive
Dec 12, 2017
ec86c46
FELIX-5592 Ensure user can override fixups:
Dec 12, 2017
69f1bad
FELIX-5760 Update to bnd version 3.4
Dec 12, 2017
f42b50d
Update changelog
karlpauls Dec 13, 2017
92203f8
[maven-release-plugin] prepare release org.apache.felix.scr-2.0.14
karlpauls Dec 13, 2017
78bbf74
[maven-release-plugin] prepare for next development iteration
karlpauls Dec 13, 2017
cfc0525
[maven-release-plugin] prepare release maven-bundle-plugin-3.4.0
karlpauls Dec 14, 2017
32f2199
[maven-release-plugin] prepare for next development iteration
karlpauls Dec 14, 2017
71ee26a
FELIX-5764 Update to bnd version 3.5
Dec 19, 2017
5f9e349
[FELIX-5766] Bring Converter sister projects up to date with recent c…
Dec 20, 2017
cb0882b
add missing goals
stefanseifert Dec 22, 2017
c5d2d3d
do not link to wiki pages which are supposedly even older than the fe…
stefanseifert Dec 22, 2017
83a98a0
update changelog
stefanseifert Jan 3, 2018
72be38d
[maven-release-plugin] prepare release maven-bundle-plugin-3.5.0
stefanseifert Jan 3, 2018
6eddc46
[maven-release-plugin] prepare for next development iteration
stefanseifert Jan 3, 2018
782e3ed
FELIX-5768: Added test for this issue.
Jan 7, 2018
94d6daa
FELIX-5768: DM Lambda stop callback not being called.
Jan 7, 2018
b740de5
Update changelog
cziegeler Jan 8, 2018
281133f
FELIX-5460 : DTO Updates - add service reference to ComponentConfigur…
cziegeler Jan 8, 2018
7b3cae5
FELIX-5769 : SCR should not bind prototype_required reference to bund…
cziegeler Jan 9, 2018
6e89927
FELIX-5769 : SCR should not bind prototype_required reference to bund…
cziegeler Jan 9, 2018
cdbb181
[converter] Avoid losing generics information in nested types
bosschaert Jan 9, 2018
ea17d18
[converter] Avoid losing generics information in nested types
bosschaert Jan 9, 2018
d024a84
Update the converter codebase to the latest version from OSGi.
bosschaert Jan 10, 2018
c251030
Felix Converter - support for converting to marker annotations.
bosschaert Jan 10, 2018
5c6ef9e
Felix Converter - Fix a number of coding style issues. No functionali…
bosschaert Jan 10, 2018
1577dc0
FELIX-5771 : Metatype generation via bnd plugin creates incorrect fil…
cziegeler Jan 11, 2018
8911a59
[maven-release-plugin] prepare release org.apache.felix.scr.generator…
cziegeler Jan 11, 2018
6ae1210
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 11, 2018
b450aef
Use generator 1.18.0
cziegeler Jan 11, 2018
eefd19f
[maven-release-plugin] prepare release maven-scr-plugin-1.26.0
cziegeler Jan 11, 2018
f960f98
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 11, 2018
c764a74
Switch to generator 1.18.1-SNAPSHOT
cziegeler Jan 11, 2018
e60669b
Use generator 1.18.0
cziegeler Jan 11, 2018
6a0bf53
[maven-release-plugin] prepare release org.apache.felix.scr.ant-1.18.0
cziegeler Jan 11, 2018
6288903
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 11, 2018
ad520db
Switch to generator 1.18.1-SNAPSHOT
cziegeler Jan 11, 2018
ee0e338
Use generator 1.18.0
cziegeler Jan 11, 2018
d555506
[maven-release-plugin] prepare release org.apache.felix.scr.bnd-1.9.0
cziegeler Jan 11, 2018
e5a043e
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 11, 2018
07b97a4
Switch to generator 1.18.1-SNAPSHOT
cziegeler Jan 11, 2018
d6232f9
New SCR component commands
Jan 11, 2018
0469113
SCR commands: cleanup minor output glitch
Jan 12, 2018
36c2710
FELIX-5733 : Update implementation to EventAdmin 1.4 (R7)
cziegeler Jan 16, 2018
6bbb41b
Fix NPE for initial configurations and ignore internal properties
cziegeler Jan 19, 2018
4ca423d
FELIX-5775 : Service properties not updated for lazy service when con…
cziegeler Jan 20, 2018
432efad
FELIX-5775 : Service properties not updated for lazy service when con…
cziegeler Jan 20, 2018
287590b
FELIX-5776 : Memory Leak by Config Admin. Adding basic test for facto…
cziegeler Jan 23, 2018
1b0aca8
FELIX-5776 : Memory Leak by Config Admin. Adding basic test for facto…
cziegeler Jan 23, 2018
7d3ee54
FELIX-5776 : Memory Leak by Config Admin. Adding basic test for facto…
cziegeler Jan 23, 2018
37ccf5e
FELIX-5778 : Refactor factory configuration handling
cziegeler Jan 24, 2018
84fd05f
FELIX-5778 : Refactor factory configuration handling
cziegeler Jan 24, 2018
b9ab61e
Require version and symbolic name for initial configurations (not in …
cziegeler Jan 24, 2018
fecba1d
Update permission handling
cziegeler Jan 26, 2018
51a5f20
[converter] Some fixes to pass the OSGi CT tests.
bosschaert Jan 26, 2018
8ded84f
FELIX-5778 : Refactor factory configuration handling. Remove unused b…
cziegeler Jan 26, 2018
3fdc405
FELIX-5457 : Logger Support. Delegate to parent logger if log is disa…
cziegeler Jan 28, 2018
39394e8
Update to latest R7 api
cziegeler Jan 31, 2018
c4ab01c
Update to latest R7 api
cziegeler Jan 31, 2018
1673d2c
FELIX-5781 : Http endpoint property must be set
cziegeler Feb 1, 2018
12041a6
Add unit test for Version conversion.
bosschaert Feb 8, 2018
6166183
Correct typo in comment
cziegeler Feb 10, 2018
c2899c4
FELIX-5787 : Wrong port 433 instread of 443 used as default port for …
cziegeler Feb 10, 2018
1cc1298
FELIX-5787 : Wrong port 433 instread of 443 used as default port for …
cziegeler Feb 10, 2018
8403de7
FELIX-5351 : Close tracker before setting configurationmanager to nul…
cziegeler Feb 15, 2018
7664ea1
FELIX-5290 : [R7] Locking Configuration Records
cziegeler Feb 16, 2018
eacfc3a
Remove unused imports
cziegeler Feb 16, 2018
94c9579
FELIX-5789: make dynamic imports optional to prevent deadlocks.
karlpauls Feb 21, 2018
584c085
Update svn:ignore
karlpauls Feb 22, 2018
f6827f5
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
karlpauls Feb 22, 2018
57e3ea2
[maven-release-plugin] prepare for next development iteration
karlpauls Feb 22, 2018
e14bf47
Merge FELIX-5601 into the r7 resolver, update to the latest OSGi sour…
karlpauls Feb 23, 2018
60eb6cd
Branch the framework for R7 work with updated osgi classes, removed p…
karlpauls Feb 23, 2018
42d0457
Update to parent pom version 4, add animal-sniffer, exclude transitiv…
karlpauls Feb 23, 2018
da63007
FELIX-5792: Add basic support for java.* exports and imports and remo…
karlpauls Feb 23, 2018
fea3857
FELIX-5793 : Update to Jetty 9.4.x
cziegeler Feb 26, 2018
dd9eebb
FELIX-5793 : Update to Jetty 9.4.x
cziegeler Feb 27, 2018
d1994b7
Remove unused imports
cziegeler Feb 27, 2018
a6c97ef
Add missing field for serialization
cziegeler Mar 2, 2018
db22db6
FELIX-5793 : Update to Jetty 9.4.x
cziegeler Mar 5, 2018
bd389e2
Initial contribution of Bundle Archive File Installer Extension
Mar 8, 2018
7bce10c
FELIX-5782 allow resolver errors to be introspected
rotty3000 Mar 8, 2018
b085fff
Update changelog for release
karlpauls Mar 9, 2018
05c5962
Update svn:ignore
karlpauls Mar 9, 2018
b05546d
[maven-release-plugin] prepare release org.apache.felix.resolver-1.16.0
karlpauls Mar 9, 2018
48586b5
[maven-release-plugin] prepare for next development iteration
karlpauls Mar 9, 2018
eb48bbf
FELIX-5803: Auto refresh uninstalled bundle graph if possible
karlpauls Mar 12, 2018
381f49f
FELIX-5798: Implement FrameworkWiringDTO
karlpauls Mar 12, 2018
52de272
FELIX-5804: Improve framework lookup for bundle protocol urls
karlpauls Mar 13, 2018
c047d3b
FELIX-5804: Improve framework lookup for bundle protocol urls
karlpauls Mar 13, 2018
6f2bbc5
Reformat some code
karlpauls Mar 13, 2018
4751ce6
[FELIX-5805][gogo][runtime] OOM caused by endless loop when parsing "]"
gnodet Mar 14, 2018
5ec08ea
[FELIX-5806] EventAdmin webconsole plugins displays wrong value for B…
gnodet Mar 14, 2018
f820b4c
[FELIX-5807] Do not hide the cause when a problem occurs in URLHandle…
gnodet Mar 14, 2018
21e98c6
FELIX-5807: Do not hide the cause when a problem occurs in URLHandler…
karlpauls Mar 14, 2018
f6003b5
FELIX-5808: Clean-up bundlecache manifest parsing and entry reading
karlpauls Mar 14, 2018
975a806
FELIX-5796: Implement multi-release jar support.
karlpauls Mar 14, 2018
525386e
FELIX-5809: Capture context for bundle: protocol urls if possible.
karlpauls Mar 14, 2018
c571a52
FELIX-5810: add sun.awt.www.content to the default search list for co…
karlpauls Mar 16, 2018
f76aaea
FELIX-5811: Prevent bundles from providing ee capabilities.
karlpauls Mar 16, 2018
8d6f7f2
FELIX-5797: Allow extension bundles to have imports and handle them l…
karlpauls Mar 16, 2018
1f911eb
FELIX-5797: Improve the check if we need to try to resolve pending ex…
karlpauls Mar 16, 2018
3aadaec
FELIX-5799: Catch Throwable instead of Exception when calling a servi…
karlpauls Mar 17, 2018
4dbe43e
FELIX-5808: Add a test case for the different kind of bundle revision…
karlpauls Mar 20, 2018
2f7bea9
Update to latest jetty snapshot
cziegeler Mar 20, 2018
6a3190a
FELIX-5812 : External session id differs from internal session id
cziegeler Mar 20, 2018
74275ae
FELIX-5812 : External session id differs from internal session id
cziegeler Mar 20, 2018
8f4d067
FELIX-5808: Add checks for proper manifest header handling and native…
karlpauls Mar 20, 2018
23c159c
FELIX-5813 : EventAdmin async threads should be named. Apply patch fr…
cziegeler Mar 21, 2018
447c6f5
FELIX-5814 : Unstable service id should not be used for session attri…
cziegeler Mar 22, 2018
7c0d4b8
FELIX-5814 : Unstable service id should not be used for session attri…
cziegeler Mar 22, 2018
2ac9171
FELIX-5815 : Duplicate events send to session listener for http context
cziegeler Mar 22, 2018
09bc050
FELIX-5815 : Duplicate events send to session listener for http context
cziegeler Mar 22, 2018
49fb461
FELIX-5819 : Container session should not be invalidated
cziegeler Mar 29, 2018
f86428f
FELIX-5819 : Container session should not be invalidated
cziegeler Mar 29, 2018
4354733
FELIX-5716: Applied the patch attached to the jira issue.
Mar 29, 2018
597c8ad
FELIX-5818: Only resolve fragments that are required on dynamic import.
karlpauls Apr 3, 2018
743f391
FELIX-5800: Clean-up default properties handling to make it easier to…
karlpauls Apr 3, 2018
885effb
FELIX-5816: make random configurable (SecureRandom v.s. normal) for u…
karlpauls Apr 3, 2018
d983d21
Set version to 5.9.0-SNAPSHOT, make tests work with java6, and remove…
karlpauls Apr 3, 2018
e38df75
FELIX-5819 : Add test case
cziegeler Apr 4, 2018
acb3b23
FELIX-5819 : Add test case
cziegeler Apr 4, 2018
9676863
FELIX-5820 : Update parent pom
cziegeler Apr 4, 2018
72890e1
Adjust to latest parent pom and remove dependency to easymock
cziegeler Apr 4, 2018
cc6d160
Adjust to latest parent pom and remove dependency to easymock
cziegeler Apr 4, 2018
398f864
Update to latest parent pom
cziegeler Apr 4, 2018
dd810ac
[FELIX-5821][gogo][runtime] Hitting Ctrl+C may kill the console outpu…
gnodet Apr 4, 2018
c24321c
Update to latest parent pom 5-SNAPSHOT.
karlpauls Apr 4, 2018
d58d091
FELIX-5793 : Update to Jetty 9.4.x
cziegeler Apr 4, 2018
ca7a330
[FELIX-5822][gogo][jline] Improve syntax of procedural functions
gnodet Apr 4, 2018
f54360d
FELIX-5823: Remove support for old multi-file bundle cache format.
karlpauls Apr 6, 2018
df2f114
[maven-release-plugin] prepare release org.apache.felix.gogo.runtime-…
gnodet Apr 9, 2018
30683d8
[maven-release-plugin] prepare for next development iteration
gnodet Apr 9, 2018
467dff5
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.…
gnodet Apr 9, 2018
770f3e9
[maven-release-plugin] prepare for next development iteration
gnodet Apr 9, 2018
a51c356
Fix a comment
karlpauls Apr 13, 2018
3b1e849
Add a method for getCanonicalPath and generic PrivilegedActivions to …
karlpauls Apr 13, 2018
3e970fc
FELIX-5800: calculate system package exports at runtime on jpms, opti…
karlpauls Apr 13, 2018
bfc541e
FELIX-5800: add some simple test to see that we have at least some sy…
karlpauls Apr 13, 2018
1d388e4
FELIX-5824: Use VersionRange from OSGi and remove our own.
karlpauls Apr 13, 2018
ed1d547
FELIX-5825: Use ReentrantLock inside WeakZipFileFactory/WeakZipFile a…
karlpauls Apr 13, 2018
659c640
FELIX-5826: Remove FelixBundleContext interface.
karlpauls Apr 13, 2018
8f6cdcd
FELIX-5800: Add animal sniffer annotations
karlpauls Apr 13, 2018
e220bc3
FELIX-5827: Use less synchronized in the BundleWiring and BundleClass…
karlpauls Apr 13, 2018
1efba85
Fix a parameter ordering mistake.
karlpauls Apr 13, 2018
51371a5
FELIX-5738 : EventAdmin IgnoreTopic config. property doesn't support …
cziegeler Apr 16, 2018
22c331e
FELIX-5831 : Async/sync Thread Pool Ratio is not changeable at runtim…
cziegeler Apr 17, 2018
500fd28
Change JSON classloading and fix permissions. Apply patch provided by…
cziegeler Apr 19, 2018
53443ba
Update changelog
cziegeler Apr 19, 2018
4fa272a
[maven-release-plugin] prepare release felix-parent-5
cziegeler Apr 19, 2018
1eb4721
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 19, 2018
cac1c37
[FELIX-5832] Only handle ConfigurationEvents for config objects manag…
gnodet Apr 19, 2018
1a8f0fc
[gogo] Switch version to 1.1.0
gnodet Apr 19, 2018
9b75801
[FELIX-5834][gogo][jline] Upgrade to a recent JLine version
gnodet Apr 19, 2018
a58e66f
[FELIX-5833][gogo][jline] Fix parser to support quotes and escape cha…
gnodet Apr 19, 2018
607f748
[FELIX-5837][gogo][jline] Improve styling support
gnodet Apr 19, 2018
448e312
[FELIX-5836][gogo] Upgrade to OSGi r6
gnodet Apr 19, 2018
dcc5612
[FELIX-5835][gogo] Upgrade requirement to JDK 8
gnodet Apr 19, 2018
ef757ed
[FELIX-5835][gogo] Code cleanup
gnodet Apr 19, 2018
5ef5df7
Bring OSGi Capability and Requirement implementation to utils bundle.
bosschaert Apr 19, 2018
0542244
Move OSGi Capability and Requirement to utils package.
bosschaert Apr 19, 2018
b2e4feb
Improvements to the OSGi Capability and Requirement implementations
bosschaert Apr 20, 2018
e6f2199
Use the latest shared Capabilities implementation from utils project.
bosschaert Apr 20, 2018
94a456b
FELIX-5838 Add OSGi Resource implementations to Felix Utils
bosschaert Apr 20, 2018
eeb35d4
Use latest capabilities from utils project.
bosschaert Apr 20, 2018
8cb2d55
Provide optimized resource / filter / capability / requirement / capa…
gnodet Apr 20, 2018
f49f098
[FELIX-5839] Add xml and json repositories implemenation
gnodet Apr 20, 2018
6cf6285
FELIX-5838 Add OSGi Resource implementations to Felix Utils
bosschaert Apr 20, 2018
89a7c15
Use released parent pom 5
cziegeler Apr 23, 2018
a5e16b6
Use release http.whiteboard api
cziegeler Apr 23, 2018
d450f68
Use release http.whiteboard api
cziegeler Apr 23, 2018
784a7e2
Use release http.whiteboard api
cziegeler Apr 23, 2018
adca54b
Use released OSGi R7 api
cziegeler Apr 23, 2018
59c9229
Use released R7 apis
cziegeler Apr 23, 2018
28292f7
Use released R7 apis
cziegeler Apr 23, 2018
f0af2e4
Use released R7 api
cziegeler Apr 23, 2018
c1359eb
Remove R6 implementation in favour of R7 one
cziegeler Apr 23, 2018
00cceef
Move http base R7 to master
cziegeler Apr 23, 2018
7d12c2b
Move http bridge R7 to master
cziegeler Apr 23, 2018
92ece6f
Move http jetty R7 to master
cziegeler Apr 23, 2018
b6ddfe7
Move http itest R7 to master
cziegeler Apr 23, 2018
a6d44ec
Adjust versions
cziegeler Apr 23, 2018
ea6f139
Remove obsolete http directory
cziegeler Apr 23, 2018
e99f1fc
[Felix Converter] Remove dependency on OSGi Maven repo
bosschaert Apr 23, 2018
a31854a
[Felix Converter] Prepare Javadoc for release
bosschaert Apr 23, 2018
865b001
[maven-release-plugin] prepare release org.apache.felix.converter-1.0.0
bosschaert Apr 23, 2018
cb521ba
[maven-release-plugin] prepare for next development iteration
bosschaert Apr 23, 2018
b597828
FELIX-5838 Add OSGi Resource implementations to Felix Utils
bosschaert Apr 23, 2018
0872513
FELIX-5829: delete ImmutableMap/List.
karlpauls Apr 23, 2018
f584b1a
[FELIX-5839] Make checkAndLoadCache available for override
gnodet Apr 24, 2018
37513ba
[FELIX-5838] Move capability/requirement toString to a new ResourceUt…
gnodet Apr 24, 2018
4bcb5b3
[FELIX-5838] Make the filter usage a bit more coherent
gnodet Apr 24, 2018
ead1643
Correct version
cziegeler Apr 24, 2018
3709bc2
Add missing ca version property
cziegeler Apr 25, 2018
a60cf08
Move R7 configadmin to trunk
cziegeler Apr 26, 2018
223426e
Move R7 configadmin to trunk
cziegeler Apr 26, 2018
451224d
Move R7 SCR to trunk
cziegeler Apr 26, 2018
e1b6709
Move R7 scr to trunk
cziegeler Apr 26, 2018
3020b46
Move R7 configurator to trunk
cziegeler Apr 26, 2018
8823a3f
Update changelog
cziegeler Apr 26, 2018
49f4b99
Update changelog
cziegeler Apr 26, 2018
ec90747
Correct svn location
cziegeler Apr 26, 2018
a30efa4
[maven-release-plugin] prepare release org.apache.felix.configadmin-1…
cziegeler Apr 26, 2018
f8f987f
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
6d951e5
Correct svn location
cziegeler Apr 26, 2018
d4e288c
Use configadmin 1.9.0
cziegeler Apr 26, 2018
b97dc51
[maven-release-plugin] prepare release org.apache.felix.scr-2.1.0
cziegeler Apr 26, 2018
342cd8a
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
7fae5ca
Correct svn location
cziegeler Apr 26, 2018
3d00649
Use latest converter
cziegeler Apr 26, 2018
009f52d
Prepare for release
cziegeler Apr 26, 2018
3a0b957
[maven-release-plugin] prepare release org.apache.felix.http.parent-10
cziegeler Apr 26, 2018
e81ba24
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
ea355bd
[maven-release-plugin] prepare release org.apache.felix.http.base-4.0.0
cziegeler Apr 26, 2018
408a576
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
c8a96f0
[maven-release-plugin] prepare release org.apache.felix.http.whiteboa…
cziegeler Apr 26, 2018
68bf975
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
cb65b93
[maven-release-plugin] prepare release org.apache.felix.http.bridge-4…
cziegeler Apr 26, 2018
bef3f97
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
b244c3d
[maven-release-plugin] prepare release org.apache.felix.http.jetty-4.0.0
cziegeler Apr 26, 2018
c5b90e7
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
7a82fda
Use released converter
cziegeler Apr 26, 2018
cf49215
[maven-release-plugin] prepare release org.apache.felix.configurator-…
cziegeler Apr 27, 2018
1eca303
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 27, 2018
fabd361
Use correct dependency for osgi promises
cziegeler Apr 27, 2018
502e622
FELIX-5841 : Update webconsole plugin to DS 1.4 (R7)
cziegeler Apr 27, 2018
41afdad
merge felix
Apr 29, 2018
6e50315
Merge branch 'apache-trunk' into trunk
Apr 29, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
19 changes: 19 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.checkstyle
.classpath
.pmd
.project
.ruleset
.settings/
target/
*.iml
*.iws
*.ipr
velocity.log
maven-eclipse.xml
.externalToolBuilders
.idea/
<<<<<<< HEAD
=======
*~
dependency-reduced-pom.xml
>>>>>>> 502e622adcc798bcbd433d6b42ca78673cfab368
96 changes: 96 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project default="all" basedir=".">
<target name="init">
<condition property="mvn" value="mvn.bat">
<os family="dos" />
</condition>
<condition property="mvn" value="mvn">
<not>
<isset property="mvn" />
</not>
</condition>
</target>
<target name="clean" depends="init">
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=obr clean" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=plugins clean" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=bundle clean" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=osgi-bundle clean" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=osgi-bundle-mosgi clean" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=karaf clean" />
</exec>
</target>
<target name="install" depends="init">
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=obr install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=plugins install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=bundle install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=osgi-bundle install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=ipojo-bundle install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=osgi-bundle-mosgi install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=karaf install" />
</exec>
</target>
<target name="all" depends="init">
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=obr clean install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=plugins clean install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=bundle clean install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=osgi-bundle clean install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=ipojo-bundle clean install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=osgi-bundle-mosgi clean install" />
</exec>
<exec executable="${mvn}" failonerror="true">
<arg line="-Dpackaging=karaf clean install" />
</exec>
</target>
</project>
6 changes: 0 additions & 6 deletions build_run.sh

This file was deleted.

28 changes: 28 additions & 0 deletions bundleplugin/DEPENDENCIES
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Apache Felix Bundle Maven Plugin
Copyright 2006-2013 The Apache Software Foundation

This software was developed at the Apache Software Foundation
(http://www.apache.org) and may have dependencies on other
Apache software licensed under Apache License 2.0.

I. Included Third-Party Software


II. Used Third-Party Software

This product uses software developed by Peter Kriens
(http://www.aqute.biz/Code/Bnd)
Copyright 2006-2013 aQute, All rights reserved
Licensed under the Apache License 2.0.

This product uses software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.

This product uses software developed at
The Codehaus (http://www.codehaus.org)
Licensed under the Apache License 2.0.


III. License Summary
- Apache License 2.0
6 changes: 6 additions & 0 deletions bundleplugin/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Apache Felix Bundle Maven Plugin
Copyright 2006-2013 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
Loading