eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-17 01:31:01 +00:00
Code Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Simon Pamies committed 2014-10-31 15:54:02 +02:00
2 parents ce47994cda 454c93bcfb
commit f937967555
5 files changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.autoload/META-INF/MANIFEST.MF
+2 -2
View File
@@ -9,12 +9,12 @@ Bundle-ActivationPolicy: lazy
Export-Package: com.sap.sailing.autoload
Import-Package: org.json.simple,
org.json.simple.parser,
org.osgi.framework;version="1.7.0"
org.osgi.framework;version="1.7.0",
org.osgi.util.tracker;version="1.5.1"
Require-Bundle: com.sap.sailing.gwt.ui;bundle-version="1.0.0",
com.sap.sse.common;bundle-version="1.0.0",
com.sap.sailing.domain.shared.android;bundle-version="1.0.0",
com.sap.sailing.domain.tractracadapter,
org.eclipse.osgi,
com.sap.sailing.server,
com.sap.sailing.domain;bundle-version="1.0.0",
com.sap.sailing.domain.common,
java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF
-2
View File
@@ -7,7 +7,6 @@ Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.mongodb.driver;bundle-version="2.6.2",
com.sap.sailing.mongodb,
org.eclipse.osgi,
org.json.simple;bundle-version="1.1.0",
org.hamcrest.core;bundle-version="1.1.0",
org.junit4;bundle-version="4.8.2",
@@ -15,4 +14,3 @@ Require-Bundle: com.mongodb.driver;bundle-version="2.6.2",
com.sap.sailing.gwt.ui;bundle-version="1.0.0",
com.sap.sailing.domain.common;bundle-version="1.0.0",
org.hamcrest;bundle-version="1.1.0"
java/com.sap.sse.security.ui/WEB-INF/.gitignore
+2
View File
@@ -0,0 +1,2 @@
deploy
classes
java/com.sap.sse.security/META-INF/MANIFEST.MF
+2 -2
View File
@@ -11,7 +11,8 @@ Import-Package: javax.mail;version="1.4.0",
javax.ws.rs;version="1.1.1",
javax.ws.rs.core;version="1.1.1",
javax.ws.rs.ext;version="1.1.1",
org.osgi.framework;version="1.3.0"
org.osgi.framework;version="1.3.0",
org.osgi.util.tracker;version="1.5.1"
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: lib/shiro-core-1.2.2.jar,
lib/shiro-web-1.2.2.jar,
@@ -24,7 +25,6 @@ Require-Bundle: javax.servlet;bundle-version="2.5.0",
slf4j.api;bundle-version="1.6.4",
org.json.simple,
com.sun.jersey,
org.eclipse.osgi,
org.apache.commons.logging;bundle-version="1.1.1",
org.apache.commons.beanutils;bundle-version="1.8.0"
Web-ContextPath: /security