Author: [email protected]
Date: Tue Feb 22 13:26:26 2011
New Revision: 816
Log:
AMDATU-157 removing buildsupport module. we now use amdatu.ext repo
Removed:
branches/0.2/amdatu-buildsupport/
branches/0.2/src/main/resources/lib/
Modified:
branches/0.2/pom.xml
branches/0.2/src/main/resources/conf/amdatu-minimal.properties
branches/0.2/src/main/resources/conf/amdatu-web.properties
branches/0.2/src/main/resources/conf/felix-config.properties
Modified: branches/0.2/pom.xml
==============================================================================
--- branches/0.2/pom.xml (original)
+++ branches/0.2/pom.xml Tue Feb 22 13:26:26 2011
@@ -96,10 +96,10 @@
<org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version>
<org.apache.felix.http.version>2.0.4</org.apache.felix.http.version>
<pax.swissbox.version>1.3.0</pax.swissbox.version>
- <pax.useradmin.version>0.0.1-SNAPSHOT</pax.useradmin.version>
+ <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
<org.apache.sling.commons.mime.version>2.1.4</org.apache.sling.commons.mime.version>
<org.apache.sling.commons.osgi.version>2.0.6</org.apache.sling.commons.osgi.version>
-
<org.apache.felix.dependencymanager.version>3.0.0-SNAPSHOT</org.apache.felix.dependencymanager.version>
+
<org.apache.felix.dependencymanager.version>3.0.0-r1062017</org.apache.felix.dependencymanager.version>
<org.apache.felix.metatype.version>1.0.4</org.apache.felix.metatype.version>
<org.apache.felix.webconsole.version>3.1.2</org.apache.felix.webconsole.version>
<org.apache.felix.shell.tui.version>1.4.1</org.apache.felix.shell.tui.version>
@@ -112,7 +112,6 @@
<jsr311-api.version>1.1.1</jsr311-api.version>
<jstl.version>1.1.2</jstl.version>
<taglibs.version>1.1.2</taglibs.version>
-
<net.kornr.osgi.commons-logging-osgi.version>20081215</net.kornr.osgi.commons-logging-osgi.version>
<junit.version>4.8.1</junit.version>
<jmock.version>2.5.1</jmock.version>
<rdf2go.version>4.7.3</rdf2go.version>
@@ -481,8 +480,6 @@
</dependencies>
<modules>
- <!-- AMDATU-157 buildsupport must be first in reactor -->
- <module>amdatu-buildsupport</module>
<module>amdatu-authentication</module>
<module>amdatu-authorization</module>
<module>amdatu-cassandra</module>
Modified: branches/0.2/src/main/resources/conf/amdatu-minimal.properties
==============================================================================
--- branches/0.2/src/main/resources/conf/amdatu-minimal.properties
(original)
+++ branches/0.2/src/main/resources/conf/amdatu-minimal.properties Tue Feb
22 13:26:26 2011
@@ -77,7 +77,7 @@
# component is the target start level. Any number of these properties
# may be specified for different start levels.
felix.auto.start.1=reference:file:amdatu-system/org.apache.felix.configadmin-1.2.4.jar
\
-
reference:file:amdatu-system/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
\
+
reference:file:amdatu-system/org.apache.felix.dependencymanager-${org.apache.felix.dependencymanager.version}.jar
\
reference:file:amdatu-system/org.apache.felix.eventadmin-1.2.2.jar \
reference:file:amdatu-system/org.apache.felix.fileinstall-${org.apache.felix.file.install.version}.jar
\
reference:file:amdatu-system/org.apache.felix.log-1.0.0.jar \
@@ -90,7 +90,7 @@
reference:file:amdatu-system/org.apache.sling.commons.osgi-2.0.6.jar \
reference:file:amdatu-system/org.osgi.compendium-${org.osgi.version}.jar \
reference:file:amdatu-system/org.osgi.core-${org.osgi.version}.jar \
-
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar \
+
reference:file:amdatu-system/pax-useradmin-service-${pax.useradmin.version}.jar
\
reference:file:amdatu-system/org.apache.felix.http.jetty-2.0.4.jar \
reference:file:amdatu-system/org.apache.felix.http.whiteboard-2.0.4.jar \
reference:file:amdatu-system/pax-swissbox-core-1.3.0.jar \
Modified: branches/0.2/src/main/resources/conf/amdatu-web.properties
==============================================================================
--- branches/0.2/src/main/resources/conf/amdatu-web.properties (original)
+++ branches/0.2/src/main/resources/conf/amdatu-web.properties Tue Feb 22
13:26:26 2011
@@ -77,7 +77,7 @@
# component is the target start level. Any number of these properties
# may be specified for different start levels.
felix.auto.start.1=reference:file:amdatu-system/org.apache.felix.configadmin-1.2.4.jar
\
-
reference:file:amdatu-system/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
\
+
reference:file:amdatu-system/org.apache.felix.dependencymanager-${org.apache.felix.dependencymanager.version}.jar
\
reference:file:amdatu-system/org.apache.felix.eventadmin-1.2.2.jar \
reference:file:amdatu-system/org.apache.felix.fileinstall-${org.apache.felix.file.install.version}.jar
\
reference:file:amdatu-system/org.apache.felix.log-1.0.0.jar \
@@ -90,7 +90,7 @@
reference:file:amdatu-system/org.apache.sling.commons.osgi-2.0.6.jar \
reference:file:amdatu-system/org.osgi.compendium-${org.osgi.version}.jar \
reference:file:amdatu-system/org.osgi.core-${org.osgi.version}.jar \
-
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar \
+
reference:file:amdatu-system/pax-useradmin-service-${pax.useradmin.version}.jar
\
reference:file:amdatu-system/org.apache.felix.http.jetty-2.0.4.jar \
reference:file:amdatu-system/pax-swissbox-core-1.3.0.jar \
reference:file:amdatu-system/ops4j-base-lang-1.2.2.jar \
Modified: branches/0.2/src/main/resources/conf/felix-config.properties
==============================================================================
--- branches/0.2/src/main/resources/conf/felix-config.properties
(original)
+++ branches/0.2/src/main/resources/conf/felix-config.properties Tue Feb
22 13:26:26 2011
@@ -77,7 +77,7 @@
# component is the target start level. Any number of these properties
# may be specified for different start levels.
felix.auto.start.1=reference:file:amdatu-system/org.apache.felix.configadmin-1.2.4.jar
\
-
reference:file:amdatu-system/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
\
+
reference:file:amdatu-system/org.apache.felix.dependencymanager-${org.apache.felix.dependencymanager.version}.jar
\
reference:file:amdatu-system/org.apache.felix.eventadmin-1.2.2.jar \
reference:file:amdatu-system/org.apache.felix.fileinstall-${org.apache.felix.file.install.version}.jar
\
reference:file:amdatu-system/org.apache.felix.log-1.0.0.jar \
@@ -90,7 +90,7 @@
reference:file:amdatu-system/org.apache.sling.commons.osgi-2.0.6.jar
\
reference:file:amdatu-system/org.osgi.compendium-${org.osgi.version}.jar \
reference:file:amdatu-system/org.osgi.core-${org.osgi.version}.jar \
-
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar \
+
reference:file:amdatu-system/pax-useradmin-service-${pax.useradmin.version}.jar
\
reference:file:amdatu-system/org.apache.felix.http.jetty-${org.apache.felix.http.version}.jar
\
reference:file:amdatu-system/pax-swissbox-core-${pax.swissbox.version}.jar \
reference:file:amdatu-system/ops4j-base-lang-1.2.2.jar \
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
