Skip to content

Commit d6df596

Browse files
alien11689alien11689
committed
ARIES-2177: Update dependencies in left application modules
1 parent c67f75c commit d6df596

File tree

6 files changed

+19
-38
lines changed

6 files changed

+19
-38
lines changed

‎application/application-api/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
27-
<version>2.0.0</version>
27+
<version>3.0.1-SNAPSHOT</version>
2828
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

@@ -55,8 +55,9 @@
5555
</aries.osgi.export.pkg>
5656
<aries.osgi.private.pkg/>
5757
<lastReleaseVersion>1.0.0</lastReleaseVersion>
58+
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
5859

59-
<org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
60+
<org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
6061
<osgi.core.version>4.3.1</osgi.core.version>
6162
</properties>
6263

‎application/application-modeller-common-test/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
27-
<version>2.0.0</version>
27+
<version>3.0.1-SNAPSHOT</version>
2828
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

@@ -44,8 +44,8 @@
4444
</scm>
4545

4646
<properties>
47-
<application-modeller-standalone.version>1.0.0</application-modeller-standalone.version>
48-
<org.apache.aries.blueprint.core.version>1.0.0</org.apache.aries.blueprint.core.version>
47+
<org.apache.aries.application.modeller.version>1.0.1-SNAPSHOT</org.apache.aries.application.modeller.version>
48+
<org.apache.aries.blueprint.core.version>1.2.0</org.apache.aries.blueprint.core.version>
4949
<org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
5050
<osgi.cmpn.version>5.0.0</osgi.cmpn.version>
5151
<osgi.core.version>6.0.0</osgi.core.version>
@@ -54,8 +54,8 @@
5454
<dependencies>
5555
<dependency>
5656
<groupId>org.apache.aries.application</groupId>
57-
<artifactId>application-modeller-standalone</artifactId>
58-
<version>${application-modeller-standalone.version}</version>
57+
<artifactId>org.apache.aries.application.modeller</artifactId>
58+
<version>${org.apache.aries.application.modeller.version}</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>junit</groupId>

‎application/application-modeller-common-test/src/test/java/org/apache/aries/application/modelling/ModellerTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.apache.aries.application.modelling.impl.ModelledResourceManagerImpl;
3838
import org.apache.aries.application.modelling.impl.ModellingManagerImpl;
3939
import org.apache.aries.application.modelling.impl.ParserProxyTest;
40-
import org.apache.aries.application.modelling.standalone.OfflineModellingFactory;
4140
import org.apache.aries.mocks.BundleContextMock;
4241
import org.apache.aries.util.filesystem.FileSystem;
4342
import org.apache.aries.util.io.IOUtils;
@@ -60,7 +59,6 @@ public static List<Object[]> getDifferentModelledResourceManagers() {
6059
manager.setModellingPlugins(Collections.<ServiceModeller>emptyList());
6160

6261
return Arrays.asList(new Object[][] {
63-
{OfflineModellingFactory.getModelledResourceManager()},
6462
{manager}
6563
});
6664
}

‎application/application-modeller-common-test/src/test/java/org/apache/aries/application/modelling/impl/ParserProxyTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.apache.aries.application.modelling.ParserProxy;
4343
import org.apache.aries.application.modelling.WrappedReferenceMetadata;
4444
import org.apache.aries.application.modelling.WrappedServiceMetadata;
45-
import org.apache.aries.application.modelling.standalone.OfflineModellingFactory;
4645
import org.apache.aries.blueprint.container.NamespaceHandlerRegistry;
4746
import org.apache.aries.blueprint.container.ParserServiceImpl;
4847
import org.apache.aries.blueprint.namespace.NamespaceHandlerRegistryImpl;
@@ -62,8 +61,8 @@ public class ParserProxyTest {
6261
@Parameters
6362
public static List<Object[]> parserProxies() {
6463
return Arrays.asList(new Object[][] {
65-
{getMockParserServiceProxy()},
66-
{OfflineModellingFactory.getOfflineParserProxy()}});
64+
{getMockParserServiceProxy()}
65+
});
6766
}
6867

6968
public static ParserProxy getMockParserServiceProxy() {

‎application/application-modeller/pom.xml

+5-16
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
27-
<version>2.0.0</version>
27+
<version>3.0.1-SNAPSHOT</version>
2828
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

@@ -56,13 +56,13 @@
5656
*
5757
</aries.osgi.import.pkg>
5858
<lastReleaseVersion>1.0.0</lastReleaseVersion>
59+
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
5960

60-
<org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
61-
<org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
61+
<org.apache.aries.application.api.version>1.0.1-SNAPSHOT</org.apache.aries.application.api.version>
62+
<org.apache.aries.application.utils.version>1.0.1-SNAPSHOT</org.apache.aries.application.utils.version>
6263
<org.apache.aries.blueprint.core.version>1.2.0</org.apache.aries.blueprint.core.version>
6364
<org.apache.aries.jndi.api.version>1.0.0</org.apache.aries.jndi.api.version>
64-
<org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
65-
<org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
65+
<org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
6666
<osgi.cmpn.version>4.3.1</osgi.cmpn.version>
6767
<osgi.core.version>4.3.1</osgi.core.version>
6868
</properties>
@@ -78,17 +78,6 @@
7878
<artifactId>org.apache.aries.application.api</artifactId>
7979
<version>${org.apache.aries.application.api.version}</version>
8080
</dependency>
81-
<dependency>
82-
<groupId>org.apache.aries</groupId>
83-
<artifactId>org.apache.aries.util</artifactId>
84-
<version>${org.apache.aries.util.version}</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.apache.aries.testsupport</groupId>
88-
<artifactId>org.apache.aries.testsupport.unit</artifactId>
89-
<scope>test</scope>
90-
<version>${org.apache.aries.testsupport.unit.version}</version>
91-
</dependency>
9281
<dependency>
9382
<groupId>org.apache.aries.jndi</groupId>
9483
<artifactId>org.apache.aries.jndi.api</artifactId>

‎application/application-utils/pom.xml

+4-10
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
27-
<version>2.0.0</version>
27+
<version>3.0.1-SNAPSHOT</version>
2828
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

@@ -64,10 +64,10 @@
6464
org.apache.aries.application.utils.filesystem.impl
6565
</aries.osgi.private.pkg>
6666
<lastReleaseVersion>1.0.0</lastReleaseVersion>
67+
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
6768

68-
<org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
69-
<org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
70-
<org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
69+
<org.apache.aries.application.api.version>1.0.1-SNAPSHOT</org.apache.aries.application.api.version>
70+
<org.apache.aries.util.version>1.2.0-SNAPSHOT</org.apache.aries.util.version>
7171
<osgi.core.version>4.3.1</osgi.core.version>
7272
</properties>
7373

@@ -85,12 +85,6 @@
8585
<artifactId>org.apache.aries.util</artifactId>
8686
<version>${org.apache.aries.util.version}</version>
8787
</dependency>
88-
<dependency>
89-
<groupId>org.apache.aries.testsupport</groupId>
90-
<artifactId>org.apache.aries.testsupport.unit</artifactId>
91-
<scope>test</scope>
92-
<version>${org.apache.aries.testsupport.unit.version}</version>
93-
</dependency>
9488

9589
<!--External dependencies. Versions may be specified in default parent -->
9690
<dependency>

0 commit comments

Comments
 (0)