diff options
| author | Bonyong.lee <bonyong.lee@samsung.com> | 2013-07-30 13:32:23 +0900 |
|---|---|---|
| committer | Bonyong.lee <bonyong.lee@samsung.com> | 2013-07-30 13:32:23 +0900 |
| commit | b213d80c3a391f2c1dd7c7f83b978b492a8923da (patch) | |
| tree | 960e158d7f1c54808af52962a828798eb25a8b42 /org.tizen.common.verrari.realm | |
| parent | 8be00d9ae3f4abc5b787825a53eef424d39bbcc7 (diff) | |
| download | common-eplugin-b213d80c3a391f2c1dd7c7f83b978b492a8923da.tar.gz common-eplugin-b213d80c3a391f2c1dd7c7f83b978b492a8923da.tar.bz2 common-eplugin-b213d80c3a391f2c1dd7c7f83b978b492a8923da.zip | |
[Title] Resolve license conflict
[Desc.] Change lgpl to apache
[Issue]
Diffstat (limited to 'org.tizen.common.verrari.realm')
| -rwxr-xr-x | org.tizen.common.verrari.realm/.classpath | 4 | ||||
| -rwxr-xr-x | org.tizen.common.verrari.realm/META-INF/MANIFEST.MF | 6 | ||||
| -rwxr-xr-x | org.tizen.common.verrari.realm/build.properties | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | org.tizen.common.verrari.realm/lib/jackson-core-asl-1.9.13.jar (renamed from org.tizen.common.verrari.realm/lib/jackson-core-lgpl-1.9.7.jar) | bin | 233971 -> 232248 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | org.tizen.common.verrari.realm/lib/jackson-mapper-asl-1.9.13.jar (renamed from org.tizen.common.verrari.realm/lib/jackson-mapper-lgpl-1.9.7.jar) | bin | 785722 -> 780664 bytes |
5 files changed, 8 insertions, 6 deletions
diff --git a/org.tizen.common.verrari.realm/.classpath b/org.tizen.common.verrari.realm/.classpath index fa424aaa2..8273181ed 100755 --- a/org.tizen.common.verrari.realm/.classpath +++ b/org.tizen.common.verrari.realm/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/jackson-core-lgpl-1.9.7.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jackson-mapper-lgpl-1.9.7.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.9.13.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.9.13.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
diff --git a/org.tizen.common.verrari.realm/META-INF/MANIFEST.MF b/org.tizen.common.verrari.realm/META-INF/MANIFEST.MF index db594c28c..f04e01119 100755 --- a/org.tizen.common.verrari.realm/META-INF/MANIFEST.MF +++ b/org.tizen.common.verrari.realm/META-INF/MANIFEST.MF @@ -7,9 +7,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.tizen.common;bundle-version="1.0.0", org.tizen.common.verrari;bundle-version="1.0.0" -Bundle-ClassPath: lib/jackson-core-lgpl-1.9.7.jar, - lib/jackson-mapper-lgpl-1.9.7.jar, - . +Bundle-ClassPath: ., + lib/jackson-core-asl-1.9.13.jar, + lib/jackson-mapper-asl-1.9.13.jar Export-Package: org.tizen.common.verrari, org.tizen.common.verrari.realm, org.tizen.common.verrari.storage, diff --git a/org.tizen.common.verrari.realm/build.properties b/org.tizen.common.verrari.realm/build.properties index 53214e14e..bd39d4d8f 100755 --- a/org.tizen.common.verrari.realm/build.properties +++ b/org.tizen.common.verrari.realm/build.properties @@ -5,4 +5,6 @@ bin.includes = META-INF/,\ about.html,\
about_files/,\
OSGI-INF/,\
- lib/
+ lib/,\
+ lib/jackson-core-asl-1.9.13.jar,\
+ lib/jackson-mapper-asl-1.9.13.jar
diff --git a/org.tizen.common.verrari.realm/lib/jackson-core-lgpl-1.9.7.jar b/org.tizen.common.verrari.realm/lib/jackson-core-asl-1.9.13.jar Binary files differindex 018d32fbf..bb4fe1da1 100755..100644 --- a/org.tizen.common.verrari.realm/lib/jackson-core-lgpl-1.9.7.jar +++ b/org.tizen.common.verrari.realm/lib/jackson-core-asl-1.9.13.jar diff --git a/org.tizen.common.verrari.realm/lib/jackson-mapper-lgpl-1.9.7.jar b/org.tizen.common.verrari.realm/lib/jackson-mapper-asl-1.9.13.jar Binary files differindex dc3875276..0f2073fc7 100755..100644 --- a/org.tizen.common.verrari.realm/lib/jackson-mapper-lgpl-1.9.7.jar +++ b/org.tizen.common.verrari.realm/lib/jackson-mapper-asl-1.9.13.jar |