Author: csierra Date: Wed Mar 1 17:37:54 2017 New Revision: 1785011 URL: http://svn.apache.org/viewvc?rev=1785011&view=rev Log: [ARIES-CDI] update to proper deps, merge executable, add parent pom, exclude itests from install,deploy
Signed-off-by: Raymond Augé <[email protected]> Added: aries/trunk/cdi/cdi-itests/cdi-executable.bndrun - copied, changed from r1784992, aries/trunk/cdi/cdi-executable/cdi-executable.bndrun Removed: aries/trunk/cdi/cdi-executable/LICENSE aries/trunk/cdi/cdi-executable/NOTICE aries/trunk/cdi/cdi-executable/cdi-executable.bndrun aries/trunk/cdi/cdi-executable/log4j.properties aries/trunk/cdi/cdi-executable/pom.xml Modified: aries/trunk/cdi/README.md aries/trunk/cdi/cdi-extender/pom.xml aries/trunk/cdi/cdi-itests/itest.bndrun aries/trunk/cdi/cdi-itests/pom.xml aries/trunk/cdi/pom.xml Modified: aries/trunk/cdi/README.md URL: http://svn.apache.org/viewvc/aries/trunk/cdi/README.md?rev=1785011&r1=1785010&r2=1785011&view=diff ============================================================================== --- aries/trunk/cdi/README.md (original) +++ aries/trunk/cdi/README.md Wed Mar 1 17:37:54 2017 @@ -18,6 +18,6 @@ This repository contains an [OSGi enRout Once you've completed a successfull build, you should be able to execute the command: -`java -jar cdi-extender-executable/cdi-executable.jar` +`java -jar cdi-itests/target/cdi-executable.jar` and be presented with a gogo shell prompt ready for you to install a CDI bundle. Modified: aries/trunk/cdi/cdi-extender/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/pom.xml?rev=1785011&r1=1785010&r2=1785011&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/pom.xml (original) +++ aries/trunk/cdi/cdi-extender/pom.xml Wed Mar 1 17:37:54 2017 @@ -64,27 +64,27 @@ <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-osgi-bundle</artifactId> - <version>2.4.0.Final</version> + <version>2.4.2.Final</version> <exclusions> <exclusion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> </exclusion> <exclusion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-impl</artifactId> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </exclusion> <exclusion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-jsf</artifactId> + <groupId>org.jboss.spec.javax.annotation</groupId> + <artifactId>jboss-annotations-api_1.2_spec</artifactId> </exclusion> <exclusion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_3.0_spec</artifactId> </exclusion> <exclusion> - <groupId>org.jboss.weld.probe</groupId> - <artifactId>weld-probe-core</artifactId> + <groupId>org.jboss.spec.javax.interceptor</groupId> + <artifactId>jboss-interceptors-api_1.2_spec</artifactId> </exclusion> </exclusions> </dependency> Copied: aries/trunk/cdi/cdi-itests/cdi-executable.bndrun (from r1784992, aries/trunk/cdi/cdi-executable/cdi-executable.bndrun) URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/cdi-executable.bndrun?p2=aries/trunk/cdi/cdi-itests/cdi-executable.bndrun&p1=aries/trunk/cdi/cdi-executable/cdi-executable.bndrun&r1=1784992&r2=1785011&rev=1785011&view=diff ============================================================================== --- aries/trunk/cdi/cdi-executable/cdi-executable.bndrun (original) +++ aries/trunk/cdi/cdi-itests/cdi-executable.bndrun Wed Mar 1 17:37:54 2017 @@ -12,7 +12,7 @@ osgi.identity;filter:='(osgi.identity=slf4j.log4j12)' -runbundles: \ - jboss-classfilewriter;version='[1.2.1,1.2.2)',\ + jboss-classfilewriter;version='[1.1.2,1.1.3)',\ log4j;version='[1.2.17,1.2.18)',\ org.apache.aries.cdi.extender;version='[0.0.1,0.0.2)',\ org.apache.aries.javax.cdi-api;version='[0.0.1,0.0.2)',\ @@ -24,8 +24,9 @@ org.apache.felix.gogo.jline;version='[1.0.2,1.0.3)',\ org.apache.felix.gogo.runtime;version='[1.0.2,1.0.3)',\ org.apache.geronimo.specs.geronimo-annotation_1.2_spec;version='[1.0.0,1.0.1)',\ - org.jboss.logging.jboss-logging;version='[3.3.0,3.3.1)',\ - org.jboss.weld.osgi-bundle;version='[2.4.0,2.4.1)',\ + org.apache.logging.log4j.api;version='[2.7.0,2.7.1)',\ + org.jboss.logging.jboss-logging;version='[3.2.1,3.2.2)',\ + org.jboss.weld.osgi-bundle;version='[2.4.2,2.4.3)',\ org.jline;version='[3.0.0,3.0.1)',\ org.osgi.service.cdi;version='[1.0.0,1.0.1)',\ slf4j.api;version='[1.7.21,1.7.22)',\ Modified: aries/trunk/cdi/cdi-itests/itest.bndrun URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/itest.bndrun?rev=1785011&r1=1785010&r2=1785011&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/itest.bndrun (original) +++ aries/trunk/cdi/cdi-itests/itest.bndrun Wed Mar 1 17:37:54 2017 @@ -15,7 +15,7 @@ osgi.identity;filter:='(osgi.identity=slf4j.log4j12)' -runbundles: \ - jboss-classfilewriter;version='[1.2.1,1.2.2)',\ + jboss-classfilewriter;version='[1.1.2,1.1.3)',\ log4j;version='[1.2.17,1.2.18)',\ org.apache.aries.cdi.extender;version='[0.0.1,0.0.2)',\ org.apache.aries.cdi.extension.jndi;version='[0.0.1,0.0.2)',\ @@ -31,10 +31,11 @@ org.apache.felix.gogo.command;version='[1.0.2,1.0.3)',\ org.apache.felix.gogo.runtime;version='[1.0.2,1.0.3)',\ org.apache.felix.gogo.shell;version='[1.0.0,1.0.1)',\ - org.apache.felix.scr;version='[2.0.6,2.0.7)',\ + org.apache.felix.scr;version='[2.0.8,2.0.9)',\ org.apache.geronimo.specs.geronimo-annotation_1.2_spec;version='[1.0.0,1.0.1)',\ - org.jboss.logging.jboss-logging;version='[3.3.0,3.3.1)',\ - org.jboss.weld.osgi-bundle;version='[2.4.0,2.4.1)',\ + org.apache.logging.log4j.api;version='[2.7.0,2.7.1)',\ + org.jboss.logging.jboss-logging;version='[3.2.1,3.2.2)',\ + org.jboss.weld.osgi-bundle;version='[2.4.2,2.4.3)',\ org.osgi.service.cdi;version='[1.0.0,1.0.1)',\ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ Modified: aries/trunk/cdi/cdi-itests/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/pom.xml?rev=1785011&r1=1785010&r2=1785011&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/pom.xml (original) +++ aries/trunk/cdi/cdi-itests/pom.xml Wed Mar 1 17:37:54 2017 @@ -17,11 +17,16 @@ <properties> <maven.deploy.skip>true</maven.deploy.skip> + <maven.install.skip>true</maven.install.skip> </properties> <build> <plugins> <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> @@ -36,10 +41,6 @@ </plugin> <plugin> <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> <artifactId>bnd-indexer-maven-plugin</artifactId> <configuration> <includeJar>true</includeJar> @@ -53,6 +54,7 @@ <failOnChanges>false</failOnChanges> <bndruns> <bndrun>itest.bndrun</bndrun> + <bndrun>cdi-executable.bndrun</bndrun> </bndruns> </configuration> </plugin> @@ -67,6 +69,17 @@ </bndruns> </configuration> </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-export-maven-plugin</artifactId> + <configuration> + <failOnChanges>false</failOnChanges> + <resolve>false</resolve> + <bndruns> + <bndrun>cdi-executable.bndrun</bndrun> + </bndruns> + </configuration> + </plugin> </plugins> </build> @@ -113,6 +126,11 @@ </dependency> <dependency> <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.jline</artifactId> + <version>1.0.2</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.gogo.runtime</artifactId> <version>1.0.2</version> </dependency> @@ -124,7 +142,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.scr</artifactId> - <version>2.0.6</version> + <version>2.0.8</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> @@ -137,16 +155,6 @@ <version>2.7</version> </dependency> <dependency> - <groupId>org.jboss.classfilewriter</groupId> - <artifactId>jboss-classfilewriter</artifactId> - <version>1.2.1.Final</version> - </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - <version>3.3.0.Final</version> - </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>org.eclipse.equinox.metatype</artifactId> <version>1.4.100.v20150408-1437</version> Modified: aries/trunk/cdi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1785011&r1=1785010&r2=1785011&view=diff ============================================================================== --- aries/trunk/cdi/pom.xml (original) +++ aries/trunk/cdi/pom.xml Wed Mar 1 17:37:54 2017 @@ -39,7 +39,6 @@ <module>cdi-extender</module> <module>cdi-extension-jndi</module> <module>cdi-itests</module> - <module>cdi-executable</module> </modules> <build> @@ -100,6 +99,19 @@ </goals> </execution> </executions> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-resolver-maven-plugin</artifactId> + <version>${bnd.version}</version> + <executions> + <execution> + <id>resolve</id> + <goals> + <goal>resolve</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>biz.aQute.bnd</groupId>
