Switch back jsoup and remark packaging

This commit is contained in:
BoykoAlex
2019-03-20 11:12:56 -04:00
parent ea7189aa43
commit 0de472b2b4
5 changed files with 60 additions and 16 deletions

View File

@@ -3,5 +3,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/remark-1.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jsoup-1.9.2.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

View File

@@ -22,9 +22,7 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
org.apache.commons.lang3,
org.eclipse.ui.genericeditor,
org.eclipse.ui.editors,
org.springsource.ide.eclipse.commons.core,
org.jsoup;bundle-version="1.9.2",
com.kotcrab.remark;bundle-version="1.0.0"
org.springsource.ide.eclipse.commons.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.springframework.tooling.ls.eclipse.commons,

View File

@@ -4,6 +4,6 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
icons/,\
lib/,\
lib/remark-1.0.0.jar,\
lib/jsoup-1.9.2.jar,\
about.html

View File

@@ -11,5 +11,59 @@
<artifactId>org.springframework.tooling.ls.eclipse.commons</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<!-- make sure lib dir is removed after clean to avoid "dirty" build -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<filesets>
<fileset>
<directory>${basedir}/lib</directory>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<?m2e execute onConfiguration?>
<id>get-libs</id>
<goals>
<goal>copy</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
<configuration>
<skip>false</skip>
<artifactItems>
<artifactItem>
<groupId>com.kotcrab.remark</groupId>
<artifactId>remark</artifactId>
<version>1.0.0</version>
</artifactItem>
<artifactItem>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.9.2</version>
</artifactItem>
</artifactItems>
<outputDirectory>${basedir}/lib/</outputDirectory>
<!-- baseVersion is to avoid SNAPSHOT dependencies being copied with
ever daily changing timestamp -->
<useBaseVersion>true</useBaseVersion>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@@ -90,18 +90,8 @@
<dist.key>TOOLS</dist.key>
<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.version}</dist.path>
<misc.p2.repo.version>3.9.4.201902271843</misc.p2.repo.version>
</properties>
<repositories>
<repository>
<id>third-party-p2-site</id>
<layout>p2</layout>
<url>http://dist.springsource.com/release/TOOLS/third-party/misc-p2-repo/${misc.p2.repo.version}</url>
</repository>
</repositories>
<profiles>
<profile>