Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions blueprint/blueprint-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@
<blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version>
<blueprint.cm.version>1.3.3-SNAPSHOT</blueprint.cm.version>
<blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version>
<org.apache.aries.proxy.api.version>1.0.0</org.apache.aries.proxy.api.version>
<org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version>
<org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version>
<org.apache.aries.proxy.api.version>1.1.2</org.apache.aries.proxy.api.version>
<org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
<org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
<org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version>
<osgi.cmpn.version>4.3.1</osgi.cmpn.version>
<slf4j.version>2.0.20</slf4j.version>
Expand Down Expand Up @@ -143,8 +143,8 @@
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
<version>${org.apache.aries.proxy.impl.version}</version>
<artifactId>org.apache.aries.proxy</artifactId>
<version>${org.apache.aries.proxy.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
12 changes: 6 additions & 6 deletions blueprint/blueprint-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@
<blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version>
<easymock.version>5.7.0</easymock.version>
<maven-release-plugin.version>3.3.1</maven-release-plugin.version>
<org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
<org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version>
<org.apache.felix.utils.version>1.11.10</org.apache.felix.utils.version>
<osgi.cmpn.version>4.3.1</osgi.cmpn.version>
<osgi.core.version>4.3.1</osgi.core.version>
<proxy.api.version>1.1.1</proxy.api.version>
<proxy.impl.version>1.1.9</proxy.impl.version>
<quiesce.api.version>1.0.0</quiesce.api.version>
<org.apache.aries.proxy.api.version>1.1.2</org.apache.aries.proxy.api.version>
<org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
<util.version>2.0.0</util.version>
<slf4j.version>2.0.20</slf4j.version>
</properties>
Expand Down Expand Up @@ -185,7 +185,7 @@
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
<version>${quiesce.api.version}</version>
<version>${org.apache.aries.quiesce.api.version}</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Expand All @@ -196,12 +196,12 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
<version>${proxy.api.version}</version>
<version>${org.apache.aries.proxy.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<version>${proxy.impl.version}</version>
<version>${org.apache.aries.proxy.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions blueprint/blueprint-repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
<blueprint.cm.version>1.3.3-SNAPSHOT</blueprint.cm.version>
<blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version>
<bnd-indexer-maven-plugin.version>6.4.0</bnd-indexer-maven-plugin.version>
<org.apache.aries.proxy.api.version>1.0.1</org.apache.aries.proxy.api.version>
<org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version>
<org.apache.aries.proxy.api.version>1.1.2</org.apache.aries.proxy.api.version>
<org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
<org.apache.aries.util.version>2.0.0</org.apache.aries.util.version>
</properties>

Expand Down Expand Up @@ -100,8 +100,8 @@
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
<version>${org.apache.aries.proxy.impl.version}</version>
<artifactId>org.apache.aries.proxy</artifactId>
<version>${org.apache.aries.proxy.version}</version>
</dependency>

<!-- blueprint -->
Expand Down
2 changes: 1 addition & 1 deletion blueprint/itests/blueprint-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<maven-surefire-plugin.version>3.6.0</maven-surefire-plugin.version>
<objenesis.version>3.6</objenesis.version>
<org.apache.aries.proxy.version>2.0.1-SNAPSHOT</org.apache.aries.proxy.version>
<org.apache.aries.quiesce.api.version>1.0.2-SNAPSHOT</org.apache.aries.quiesce.api.version>
<org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
<org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
<org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
<org.apache.servicemix.bundles.aopalliance.version>1.0_6</org.apache.servicemix.bundles.aopalliance.version>
Expand Down
2 changes: 1 addition & 1 deletion jmx/jmx-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<org.apache.aries.jmx.mbeanserver-platform.version>0.0.2-SNAPSHOT</org.apache.aries.jmx.mbeanserver-platform.version>
<org.apache.aries.jmx.whiteboard.version>1.2.1-SNAPSHOT</org.apache.aries.jmx.whiteboard.version>
<org.apache.aries.jmx.version>1.1.6-SNAPSHOT</org.apache.aries.jmx.version>
<org.apache.aries.proxy.version>2.0.1-SNAPSHOT</org.apache.aries.proxy.version>
<org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
<org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
<org.apache.aries.util.version>2.0.0</org.apache.aries.util.version>
<org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
Expand Down
14 changes: 7 additions & 7 deletions jndi/jndi-url-itest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
<jndi-url-itest-biz.version>1.0.1-SNAPSHOT</jndi-url-itest-biz.version>
<jndi-url-itest-web.version>1.0.1-SNAPSHOT</jndi-url-itest-web.version>
<jndi-url.version>1.1.1-SNAPSHOT</jndi-url.version>
<objenesis.version>3.6</objenesis.version>
<org.apache.aries.util.version>2.0.0</org.apache.aries.util.version>
<org.apache.aries.proxy.api.version>1.1.1</org.apache.aries.proxy.api.version>
<org.apache.aries.proxy.impl.version>1.1.14</org.apache.aries.proxy.impl.version>
<org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
<org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version>
<org.apache.aries.blueprint.core.version>1.10.3</org.apache.aries.blueprint.core.version>
<org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
Expand Down Expand Up @@ -141,13 +141,13 @@

<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
<version>${org.apache.aries.proxy.api.version}</version>
<artifactId>org.apache.aries.proxy</artifactId>
<version>${org.apache.aries.proxy.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<version>${org.apache.aries.proxy.impl.version}</version>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>${objenesis.version}</version>
</dependency>

<!-- pax exam -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ public Option[] configuration() {

mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi").versionAsInProject(),

Expand Down
2 changes: 1 addition & 1 deletion jndi/jndi-url/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

<jndi-api.version>1.1.1-SNAPSHOT</jndi-api.version>
<jndi-core.version>1.1.0-SNAPSHOT</jndi-core.version>
<org.apache.aries.proxy.api.version>1.1.1</org.apache.aries.proxy.api.version>
<org.apache.aries.proxy.api.version>1.1.2</org.apache.aries.proxy.api.version>
<org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
<osgi.core.version>8.0.0</osgi.core.version>
<osgi.cmpn.version>7.0.0</osgi.cmpn.version>
Expand Down
2 changes: 1 addition & 1 deletion proxy/proxy-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<junit.version>4.13.2</junit.version>
<mockito-core.version>4.11.0</mockito-core.version>
<objenesis.version>3.6</objenesis.version>
<org.apache.aries.proxy.api.version>1.1.3-SNAPSHOT</org.apache.aries.proxy.api.version>
<org.apache.aries.proxy.api.version>1.1.2</org.apache.aries.proxy.api.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion quiesce/quiesce-manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<org.apache.aries.versioning.plugin.version>0.4.0</org.apache.aries.versioning.plugin.version>
<lastReleaseVersion>1.0.0</lastReleaseVersion>

<org.apache.aries.quiesce.api.version>1.0.2-SNAPSHOT</org.apache.aries.quiesce.api.version>
<org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
<org.apache.aries.util.version>2.0.0</org.apache.aries.util.version>
</properties>

Expand Down
5 changes: 5 additions & 0 deletions samples/blog/blog-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@
<artifactId>org.apache.aries.proxy</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.aries</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ public Option[] configuration() {
mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi").versionAsInProject(),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api").versionAsInProject(),
Expand Down
7 changes: 6 additions & 1 deletion samples/blueprint/helloworld/helloworld-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<properties>
<cm.version>3.2.0-v20070116</cm.version>
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
<org.apache.aries.proxy.version>1.0.0</org.apache.aries.proxy.version>
<org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
<org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
<pax-exam.version>4.13.5</pax-exam.version>
<pax-logging.version>1.12.12</pax-logging.version>
Expand Down Expand Up @@ -72,6 +72,11 @@
<version>${org.apache.aries.proxy.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.aries</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ public static Option[] configuration() {

mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util" ),
mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
Expand Down
12 changes: 9 additions & 3 deletions samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
<org.apache.aries.jpa.container.context.version>1.0.4</org.apache.aries.jpa.container.context.version>

<!-- Aries Quiesce Versions -->
<org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version>
<org.apache.aries.quiesce.manager.version>1.0.0</org.apache.aries.quiesce.manager.version>
<org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
<org.apache.aries.quiesce.manager.version>1.0.1</org.apache.aries.quiesce.manager.version>

<!-- Aries Testsupport Versions -->
<org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
Expand Down Expand Up @@ -113,6 +113,7 @@
<javax.inject.version>1</javax.inject.version>
<javax.persistence-api.version>2.2</javax.persistence-api.version>
<javax.transaction-api.version>1.2</javax.transaction-api.version>
<objenesis.version>3.6</objenesis.version>
<osgi.core.version>8.0.0</osgi.core.version>
<pax-logging.version>2.2.9</pax-logging.version>

Expand All @@ -122,7 +123,7 @@
<org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version>
<org.apache.aries.blueprint.cm.version>1.3.2</org.apache.aries.blueprint.cm.version>
<org.apache.aries.blueprint.core.version>1.10.3</org.apache.aries.blueprint.core.version>
<org.apache.aries.proxy.version>1.1.14</org.apache.aries.proxy.version>
<org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
<org.apache.aries.util.version>1.1.3</org.apache.aries.util.version>
</properties>

Expand Down Expand Up @@ -350,6 +351,11 @@
<artifactId>org.apache.aries.proxy</artifactId>
<version>${org.apache.aries.proxy.version}</version>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>${objenesis.version}</version>
</dependency>
<!-- quiesce -->
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
Expand Down
2 changes: 1 addition & 1 deletion subsystem/subsystem-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

<org.apache.aries.subsystem.modeller.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.modeller.version>
<org.apache.aries.blueprint.version>1.10.4-SNAPSHOT</org.apache.aries.blueprint.version>
<org.apache.aries.proxy.version>2.0.1-SNAPSHOT</org.apache.aries.proxy.version>
<org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
<org.apache.aries.subsystem.api.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.api.version>
<org.apache.aries.subsystem.core.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.core.version>
<org.apache.aries.util.version>2.0.0</org.apache.aries.util.version>
Expand Down
2 changes: 1 addition & 1 deletion subsystem/subsystem-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<objenesis.version>3.6</objenesis.version>
<org.apache.aries.subsystem.modeller.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.modeller.version>
<org.apache.aries.blueprint.version>1.10.4-SNAPSHOT</org.apache.aries.blueprint.version>
<org.apache.aries.proxy.version>2.0.1-SNAPSHOT</org.apache.aries.proxy.version>
<org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
<org.apache.aries.subsystem.api.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.api.version>
<org.apache.aries.subsystem.core.version>2.0.11-SNAPSHOT</org.apache.aries.subsystem.core.version>
<org.apache.aries.subsystem.itest.interfaces.version>1.0.0-SNAPSHOT</org.apache.aries.subsystem.itest.interfaces.version>
Expand Down
13 changes: 10 additions & 3 deletions transaction/transaction-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@
<javax.el-api.version>3.0.0</javax.el-api.version>
<javax.interceptor-api.version>1.2.2</javax.interceptor-api.version>
<javax.transaction-api.version>1.2</javax.transaction-api.version>
<objenesis.version>3.6</objenesis.version>
<org.apache.aries.blueprint.api.version>1.0.0</org.apache.aries.blueprint.api.version>
<org.apache.aries.blueprint.core.version>1.4.4</org.apache.aries.blueprint.core.version>
<org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version>
<org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
<org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
<org.apache.aries.transaction.blueprint.version>2.3.2-SNAPSHOT</org.apache.aries.transaction.blueprint.version>
<org.apache.aries.transaction.jdbc.version>2.1.4-SNAPSHOT</org.apache.aries.transaction.jdbc.version>
Expand Down Expand Up @@ -84,9 +85,15 @@
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
<artifactId>org.apache.aries.proxy</artifactId>
<version>${org.apache.aries.proxy.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>${objenesis.version}</version>
<scope>test</scope>
<version>${org.apache.aries.proxy.impl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public Option[] configuration() {
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
mavenBundle("org.objenesis", "objenesis").versionAsInProject(),
jta12Bundles(),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager").versionAsInProject(),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint").versionAsInProject(),
Expand Down
6 changes: 3 additions & 3 deletions tutorials/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
<jline.version>4.4.8</jline.version>
<org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version>
<org.apache.aries.blueprint.core.version>1.10.3</org.apache.aries.blueprint.core.version>
<org.apache.aries.proxy.version>1.1.14</org.apache.aries.proxy.version>
<org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version>
<org.apache.aries.quiesce.manager.version>1.0.0</org.apache.aries.quiesce.manager.version>
<org.apache.aries.proxy.version>2.0.0</org.apache.aries.proxy.version>
<org.apache.aries.quiesce.api.version>1.0.1</org.apache.aries.quiesce.api.version>
<org.apache.aries.quiesce.manager.version>1.0.1</org.apache.aries.quiesce.manager.version>
<org.apache.aries.util.version>1.1.3</org.apache.aries.util.version>
<org.apache.felix.fileinstall.version>3.7.4</org.apache.felix.fileinstall.version>
<org.apache.felix.gogo.command.version>1.1.2</org.apache.felix.gogo.command.version>
Expand Down
Loading