Author: rotty3000 Date: Wed Apr 25 13:56:53 2018 New Revision: 1830076 URL: http://svn.apache.org/viewvc?rev=1830076&view=rev Log: [CDI] cleanup build and update to official OSGi releases
Signed-off-by: Raymond Auge <[email protected]> Modified: aries/trunk/cdi/cdi-extender/pom.xml aries/trunk/cdi/cdi-extension-http/pom.xml aries/trunk/cdi/cdi-extension-jndi/pom.xml aries/trunk/cdi/cdi-extra/pom.xml aries/trunk/cdi/cdi-itests/pom.xml aries/trunk/cdi/pom.xml Modified: aries/trunk/cdi/cdi-extender/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/pom.xml?rev=1830076&r1=1830075&r2=1830076&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/pom.xml (original) +++ aries/trunk/cdi/cdi-extender/pom.xml Wed Apr 25 13:56:53 2018 @@ -41,11 +41,6 @@ <dependencies> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>javax.ejb-api</artifactId> - <version>3.2</version> - </dependency> - <dependency> <groupId>org.apache.aries.spec</groupId> <artifactId>org.apache.aries.javax.annotation-api</artifactId> <version>${project.version}</version> @@ -113,13 +108,13 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.annotation.bundle</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.annotation.versioning</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <scope>provided</scope> </dependency> <dependency> @@ -142,48 +137,43 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.cm</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>1.6.0</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.log</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.converter</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.function</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.promise</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.core</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0</version> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>1.7.25</version> + <groupId>javax.ejb</groupId> + <artifactId>javax.ejb-api</artifactId> + <version>3.2</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.0</version> - <optional>true</optional> - </dependency> - <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <version>1.2.3</version> @@ -192,18 +182,31 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.12</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>2.13.0</version> + <groupId>org.apache.aries.cdi</groupId> + <artifactId>org.apache.aries.cdi.extra</artifactId> + <version>0.0.2-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.aries.cdi</groupId> - <artifactId>org.apache.aries.cdi.extra</artifactId> - <version>0.0.1-SNAPSHOT</version> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>1.7.25</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>2.13.0</version> <scope>test</scope> </dependency> </dependencies> Modified: aries/trunk/cdi/cdi-extension-http/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-http/pom.xml?rev=1830076&r1=1830075&r2=1830076&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extension-http/pom.xml (original) +++ aries/trunk/cdi/cdi-extension-http/pom.xml Wed Apr 25 13:56:53 2018 @@ -67,7 +67,8 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.annotation.bundle</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -85,6 +86,7 @@ <groupId>org.osgi</groupId> <artifactId>org.osgi.namespace.service</artifactId> <version>1.0.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> Modified: aries/trunk/cdi/cdi-extension-jndi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/pom.xml?rev=1830076&r1=1830075&r2=1830076&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extension-jndi/pom.xml (original) +++ aries/trunk/cdi/cdi-extension-jndi/pom.xml Wed Apr 25 13:56:53 2018 @@ -53,12 +53,14 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.annotation.bundle</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.namespace.service</artifactId> <version>1.0.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -68,12 +70,12 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.log</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.promise</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.osgi</groupId> Modified: aries/trunk/cdi/cdi-extra/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/pom.xml?rev=1830076&r1=1830075&r2=1830076&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extra/pom.xml (original) +++ aries/trunk/cdi/cdi-extra/pom.xml Wed Apr 25 13:56:53 2018 @@ -57,7 +57,7 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.annotation</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0</version> <scope>provided</scope> </dependency> <dependency> @@ -68,32 +68,32 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.namespace.service</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.event</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.http.whiteboard</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.jaxrs</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.core</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0</version> <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: aries/trunk/cdi/cdi-itests/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/pom.xml?rev=1830076&r1=1830075&r2=1830076&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/pom.xml (original) +++ aries/trunk/cdi/cdi-itests/pom.xml Wed Apr 25 13:56:53 2018 @@ -231,7 +231,7 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.annotation.bundle</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <scope>provided</scope> </dependency> <dependency> @@ -249,7 +249,7 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.cm</artifactId> - <version>1.6.0-SNAPSHOT</version> + <version>1.6.0</version> <scope>provided</scope> </dependency> <dependency> @@ -273,23 +273,17 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.function</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.util.promise</artifactId> - <version>1.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.util.pushstream</artifactId> - <version>1.0.0-SNAPSHOT</version> - <scope>runtime</scope> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.core</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.0</version> <scope>provided</scope> </dependency> <dependency> @@ -305,7 +299,7 @@ <id>my-local-repo</id> <url>file://${project.basedir}/local-repo/</url> <releases> - <enabled>false</enabled> + <enabled>true</enabled> <checksumPolicy>ignore</checksumPolicy> </releases> <snapshots> Modified: aries/trunk/cdi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1830076&r1=1830075&r2=1830076&view=diff ============================================================================== --- aries/trunk/cdi/pom.xml (original) +++ aries/trunk/cdi/pom.xml Wed Apr 25 13:56:53 2018 @@ -181,17 +181,6 @@ </plugins> </reporting> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - <repositories> <repository> <id>apache-snapshots</id>
