Author: cwiklik
Date: Wed Jan 15 15:43:23 2020
New Revision: 1872814
URL: http://svn.apache.org/viewvc?rev=1872814&view=rev
Log:
UIMA-6167 modified parent and deploy editor poms to update eclipse dependencies
to work with maven central artifacts
Modified:
uima/uima-as/trunk/uima-as-parent/pom.xml
uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
Modified: uima/uima-as/trunk/uima-as-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-parent/pom.xml?rev=1872814&r1=1872813&r2=1872814&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Wed Jan 15 15:43:23 2020
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>12</version>
+ <version>13</version>
<relativePath />
</parent>
@@ -34,15 +34,15 @@
<url>${uimaWebsiteUrl}</url>
<scm>
- <connection>
-
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
- </connection>
- <developerConnection>
-
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
- </developerConnection>
- <url>
-
http://svn.apache.org/viewvc/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
- </url>
+ <connection>
+ scm:git:https://github.com/apache/uima-uimaj/uimaj-parent
+ </connection>
+ <developerConnection>
+ scm:git:https://github.com/apache/uima-uimaj/uimaj-parent
+ </developerConnection>
+ <url>
+ https://github.com/apache/uima-uimaj/tree/master/uimaj-parent
+ </url>
</scm>
@@ -56,7 +56,7 @@
<id>eclipsePlugins</id>
<name>Eclipse components</name>
<layout>default</layout>
- <url>http://repo1.maven.org/eclipse</url>
+ <url>http://repo1.maven.org/maven2</url>
<releases>
<updatePolicy>never</updatePolicy>
@@ -206,7 +206,7 @@ ${uimaASNoticeText}
- <dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jaas</artifactId>
<version>${org.apache.activemq.version}</version>
@@ -480,7 +480,6 @@ ${uimaASNoticeText}
<pluginManagement>
<plugins>
-
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
@@ -505,9 +504,11 @@ ${uimaASNoticeText}
maven-bundle-plugin
</artifactId>
<versionRange>
- [2.3.7,)
+ [3,)
</versionRange>
<goals>
+
<goal>process</goal>
+
<goal>bundle</goal>
<goal>manifest</goal>
</goals>
</pluginExecutionFilter>
Modified: uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml?rev=1872814&r1=1872813&r2=1872814&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml Wed Jan 15 15:43:23 2020
@@ -98,7 +98,7 @@
which breaks things.
-->
- <!-- core -->
+ <!-- core
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
@@ -113,14 +113,14 @@
<scope>provided</scope>
</dependency>
- <!-- ui -->
+-->
<!-- next one causes NPE with maven 2.0.7.
Might be related to http://jira.codehaus.org/browse/MNG-3086
- Workaround - change version from 3.2.0 to 3.2.1 as of 2/2008 is OK-->
- <dependency>
+ Workaround - change version from 3.2.0 to 3.2.1 as of 2/2008 is OK -->
+<!-- <dependency>
<groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.ui</artifactId>
- <version>[3.2.1,4.0.0]</version>
+ <version>[3.3.0.0,4.0.0]</version>
<scope>provided</scope>
</dependency>
@@ -152,7 +152,7 @@
<scope>provided</scope>
</dependency>
- <!-- jdt -->
+
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
@@ -160,7 +160,7 @@
<scope>provided</scope>
</dependency>
- <!-- added in Feb 2008 rework -->
+
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching</artifactId>
@@ -173,7 +173,7 @@
<artifactId>org.eclipse.jdt.ui</artifactId>
<version>[3.2.0,4.0.0]</version>
<scope>provided</scope>
- <!-- https://issues.apache.org/jira/browse/UIMA-5374 -->
+
<exclusions>
<exclusion>
<groupId>org.eclipse.platform</groupId>
@@ -194,7 +194,7 @@
</exclusions>
</dependency>
- <!-- misc -->
+
<dependency>
<groupId>org.eclipse.jface</groupId>
<artifactId>org.eclipse.jface.text</artifactId>
@@ -207,7 +207,7 @@
<artifactId>org.eclipse.pde.ui</artifactId>
<version>[3.2.0,4.0.0]</version>
<scope>provided</scope>
- <!-- https://issues.apache.org/jira/browse/UIMA-5374 -->
+
<exclusions>
<exclusion>
<groupId>org.eclipse.platform</groupId>
@@ -242,12 +242,12 @@
<version>[3.2.0,4.0.0]</version>
<scope>provided</scope>
</dependency>
-
+-->
<!-- These next dependencies are just to lock down the
transitive dependencies of the above.
This was done because on Sept 7 2010 somebody uploaded
corrupted versions of these to maven central. -->
-
+<!--
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.registry</artifactId>
@@ -308,6 +308,74 @@
<version>[3.1.100,4.0.0]</version>
<scope>provided</scope>
</dependency>
+-->
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.ui</artifactId>
+ <version>[3.108.1, 4.0.0)</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.swt</groupId>
+ <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+ <version>[3.2.0,5.0.0)</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.jface</artifactId>
+ <version>[3.16.0, 4.0.0)</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.ui</artifactId>
+ <version>[3.12.0,4.0.0)</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.search</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.debug.ui</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.compare</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.team</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.team.ui</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.jface</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.swt</artifactId>
+ </exclusion>
+
+ </exclusions>
+ </dependency>
+
+
+
</dependencies>
<build>
@@ -402,8 +470,10 @@ org.eclipse.core.runtime
<Bundle-Activator>org.apache.uima.editors.dde.internal.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.apache.uima.deployeditor;singleton:=true</Bundle-SymbolicName>
-
<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
+
<!--Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart -->
+ <Eclipse-AutoStart>true</Eclipse-AutoStart>
+
</instructions>
</configuration>
<executions>
