Created
April 1, 2011 10:12
-
-
Save anpieber/897972 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-> % git diff | |
diff --git a/.gitmodules b/.gitmodules | |
index 8e127e7..7f94b73 100644 | |
--- a/.gitmodules | |
+++ b/.gitmodules | |
@@ -30,22 +30,22 @@ | |
url = git://github.com/openengsb/openengsb-wrapped-com.dolby.jira.net.git | |
[submodule "connector/email"] | |
path = connector/email | |
- url = git@github.com:openengsb/openengsb-connector-email.git | |
+ url = git://github.com:openengsb/openengsb-connector-email.git | |
[submodule "connector/git"] | |
path = connector/git | |
- url = git@github.com:openengsb/openengsb-connector-git.git | |
+ url = git://github.com:openengsb/openengsb-connector-git.git | |
[submodule "connector/maven"] | |
path = connector/maven | |
- url = git@github.com:openengsb/openengsb-connector-maven.git | |
+ url = git://github.com:openengsb/openengsb-connector-maven.git | |
[submodule "connector/jira"] | |
path = connector/jira | |
- url = git@github.com:openengsb/openengsb-connector-jira.git | |
+ url = git://github.com:openengsb/openengsb-connector-jira.git | |
[submodule "connector/memoryauditing"] | |
path = connector/memoryauditing | |
- url = git@github.com:openengsb/openengsb-connector-memoryauditing.git | |
+ url = git://github.com:openengsb/openengsb-connector-memoryauditing.git | |
[submodule "connector/plaintextreport"] | |
path = connector/plaintextreport | |
- url = git@github.com:openengsb/openengsb-connector-plaintextreport.git | |
+ url = git://github.com:openengsb/openengsb-connector-plaintextreport.git | |
[submodule "connector/trac"] | |
path = connector/trac | |
- url = git@github.com:openengsb/openengsb-connector-trac.git | |
+ url = git://github.com:openengsb/openengsb-connector-trac.git | |
diff --git a/itests/pom.xml b/itests/pom.xml | |
index ed5bbdb..d6e1ccb 100644 | |
--- a/itests/pom.xml | |
+++ b/itests/pom.xml | |
@@ -127,6 +127,13 @@ | |
<type>xml</type> | |
<classifier>features</classifier> | |
</dependency> | |
+ <dependency> | |
+ <groupId>org.openengsb.connector</groupId> | |
+ <artifactId>openengsb-connector-memoryauditing</artifactId> | |
+ <type>xml</type> | |
+ <classifier>features</classifier> | |
+ <version>${connector.memoryauditing.version}</version> | |
+ </dependency> | |
<!-- Internal Dependencies --> | |
<dependency> | |
@@ -169,11 +176,6 @@ | |
<artifactId>openengsb-domain-auditing</artifactId> | |
<scope>test</scope> | |
</dependency> | |
- <dependency> | |
- <groupId>org.openengsb.connector</groupId> | |
- <artifactId>openengsb-connector-memoryauditing</artifactId> | |
- <scope>test</scope> | |
- </dependency> | |
<dependency> | |
<groupId>org.neodatis.odb</groupId> | |
diff --git a/itests/src/test/java/org/openengsb/itests/util/AbstractExamTestHelper.java b/itests/src/test/java/org/openengsb/itests/util/AbstractExamTestHelper.java | |
index eba25d8..d3bf134 100644 | |
--- a/itests/src/test/java/org/openengsb/itests/util/AbstractExamTestHelper.java | |
+++ b/itests/src/test/java/org/openengsb/itests/util/AbstractExamTestHelper.java | |
@@ -199,7 +199,9 @@ public abstract class AbstractExamTestHelper extends AbstractIntegrationTest { | |
mavenBundle(maven().groupId("org.apache.aries.blueprint").artifactId("org.apache.aries.blueprint") | |
.versionAsInProject()), | |
scanFeatures(maven().groupId("org.openengsb").artifactId("openengsb").type("xml").classifier("features") | |
- .versionAsInProject(), "openengsb-connector-memoryauditing", "openengsb-ui-admin"), | |
+ .versionAsInProject(), "openengsb-ui-admin"), | |
+ scanFeatures(maven().groupId("org.openengsb.connector").artifactId("openengsb-connector-memoryauditing") | |
+ .type("xml").classifier("features").versionAsInProject(), "openengsb-connector-memoryauditing"), | |
workingDirectory(getWorkingDirectory()), | |
vmOption("-Dorg.osgi.framework.system.packages.extra=sun.reflect"), | |
vmOption("-Dorg.osgi.service.http.port=" + WEBUI_PORT), waitForFrameworkStartup(), | |
diff --git a/pom.xml b/pom.xml | |
index 0bb9a5b..e799972 100644 | |
--- a/pom.xml | |
+++ b/pom.xml | |
@@ -312,12 +312,6 @@ | |
<scope>test</scope> | |
</dependency> | |
<dependency> | |
- <groupId>org.openengsb.connector</groupId> | |
- <artifactId>openengsb-connector-memoryauditing</artifactId> | |
- <version>${project.version}</version> | |
- <scope>test</scope> | |
- </dependency> | |
- <dependency> | |
<groupId>org.openengsb.core</groupId> | |
<artifactId>openengsb-core-api</artifactId> | |
<version>${project.version}</version> | |
diff --git a/ui/admin/pom.xml b/ui/admin/pom.xml | |
index 41e7a3c..18b5786 100644 | |
--- a/ui/admin/pom.xml | |
+++ b/ui/admin/pom.xml | |
@@ -138,11 +138,11 @@ | |
<artifactId>openengsb-domain-auditing</artifactId> | |
<scope>provided</scope> | |
</dependency> | |
- <dependency> | |
+ <!--<dependency> | |
<groupId>org.openengsb.connector</groupId> | |
<artifactId>openengsb-connector-memoryauditing</artifactId> | |
<scope>provided</scope> | |
- </dependency> | |
+ </dependency>--> | |
<dependency> | |
<groupId>org.openengsb.core</groupId> | |
<artifactId>openengsb-core-security</artifactId> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment