You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ro...@apache.org on 2018/07/04 03:09:29 UTC
svn commit: r1835038 - in /felix/trunk/logback: itests/pom.xml
logback/pom.xml pom.xml
Author: rotty3000
Date: Wed Jul 4 03:09:29 2018
New Revision: 1835038
URL: http://svn.apache.org/viewvc?rev=1835038&view=rev
Log:
[logback] use equinox from maven central
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
felix/trunk/logback/itests/pom.xml
felix/trunk/logback/logback/pom.xml
felix/trunk/logback/pom.xml
Modified: felix/trunk/logback/itests/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/pom.xml?rev=1835038&r1=1835037&r2=1835038&view=diff
==============================================================================
--- felix/trunk/logback/itests/pom.xml (original)
+++ felix/trunk/logback/itests/pom.xml Wed Jul 4 03:09:29 2018
@@ -95,8 +95,14 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>5.6.10</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -105,15 +111,9 @@
<version>1.2.3</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.10</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>${equinox.version}</version>
+ <version>3.13.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: felix/trunk/logback/logback/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/logback/pom.xml?rev=1835038&r1=1835037&r2=1835038&view=diff
==============================================================================
--- felix/trunk/logback/logback/pom.xml (original)
+++ felix/trunk/logback/logback/pom.xml Wed Jul 4 03:09:29 2018
@@ -39,10 +39,6 @@
<url>http://svn.apache.org/viewvc/felix/trunk/logback/logback/</url>
</scm>
- <properties>
- <equinox.version>3.12.100</equinox.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -58,7 +54,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>${equinox.version}</version>
+ <version>3.13.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: felix/trunk/logback/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/pom.xml?rev=1835038&r1=1835037&r2=1835038&view=diff
==============================================================================
--- felix/trunk/logback/pom.xml (original)
+++ felix/trunk/logback/pom.xml Wed Jul 4 03:09:29 2018
@@ -39,8 +39,6 @@
<properties>
<bnd.version>4.0.0</bnd.version>
- <equinox.p2downloadpath>http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8RC2-201805240900/plugins/</equinox.p2downloadpath>
- <equinox.version>3.13.0.v20180409-1500</equinox.version>
</properties>
<modules>
@@ -49,76 +47,6 @@
</modules>
<build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <version>1.4.0</version>
- <executions>
- <execution>
- <id>get-equinox-3.13.0</id>
- <phase>clean</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
- <url>${equinox.p2downloadpath}org.eclipse.osgi_${equinox.version}.jar</url>
- <outputDirectory>${project.build.directory}/equinox</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>get-equinox-3.13.0-sources</id>
- <phase>clean</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
- <url>${equinox.p2downloadpath}org.eclipse.osgi.source_${equinox.version}.jar</url>
- <outputDirectory>${project.build.directory}/equinox</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- <executions>
- <execution>
- <id>install-equinox</id>
- <phase>clean</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <repositoryLayout>default</repositoryLayout>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${equinox.version}</version>
- <file>${project.build.directory}/equinox/org.eclipse.osgi_${equinox.version}.jar</file>
- <packaging>jar</packaging>
- <generatePom>true</generatePom>
- </configuration>
- </execution>
- <execution>
- <id>install-equinox-sources</id>
- <phase>clean</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <repositoryLayout>default</repositoryLayout>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${equinox.version}</version>
- <file>${project.build.directory}/equinox/org.eclipse.osgi.source_${equinox.version}.jar</file>
- <packaging>jar</packaging>
- <classifier>sources</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
<defaultGoal>install</defaultGoal>
<pluginManagement>
<plugins>