Skip to content

Commit 802d6fa

Browse files
committed
Fixed plugin install issue
1 parent f0ebed3 commit 802d6fa

File tree

12 files changed

+60
-36
lines changed

12 files changed

+60
-36
lines changed

Plugins/Aspose_Words_Java_for_Eclipse_Maven/AsposeWordsEclipseFeature/feature.xml

+7-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="com.aspose.words.java.maven"
44
label="Aspose.Words Java for Eclipse (Maven)"
5-
version="1.0.0.3"
5+
version="20.10"
66
provider-name="http://www.aspose.com">
77

88
<description>
@@ -18,7 +18,7 @@ The newly created project and the Code Examples you added is now ready to be enh
1818

1919
<license url="">
2020
The MIT License (MIT)
21-
Copyright (c) 2001-2016 Aspose Pty Ltd
21+
Copyright (c) 2001-2020 Aspose Pty Ltd
2222

2323
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
2424

@@ -27,11 +27,15 @@ The above copyright notice and this permission notice shall be included in all c
2727
THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2828
</license>
2929

30+
<url>
31+
<update label="Aspose.Words Java for Eclipse (Maven) - Eclipse Update Site" url="https://repository.aspose.com/list/plugins/aspose-words/eclipse/words-maven/20.10/site.xml"/>
32+
</url>
33+
3034
<plugin
3135
id="com.aspose.words.java.maven.plugin"
3236
download-size="0"
3337
install-size="0"
34-
version="1.0.0.3"
38+
version="20.10.0"
3539
unpack="false"/>
3640

3741
</feature>
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4-
org.eclipse.jdt.core.compiler.compliance=1.7
3+
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
5+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6+
org.eclipse.jdt.core.compiler.compliance=1.8
7+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
510
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
611
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.7
12+
org.eclipse.jdt.core.compiler.source=1.8

Plugins/Aspose_Words_Java_for_Eclipse_Maven/AsposeWordsEclipsePlugin/resources/pom-xml-template.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<repository>
1010
<id>Aspose-Maven-Repository</id>
1111
<name>Aspose Maven Repository</name>
12-
<url>http://maven.aspose.com/artifactory/simple/ext-release-local/</url>
12+
<url>https://repository.aspose.com/repo/</url>
1313
</repository>
1414
</repositories>
1515
<properties>

Plugins/Aspose_Words_Java_for_Eclipse_Maven/AsposeWordsEclipsePlugin/src/com/aspose/words/maven/artifacts/maven-metada.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<metadata>
33
<groupId>com.aspose</groupId>
44
<artifactId>aspose-words</artifactId>
5-
<version>14.5.0</version>
5+
<version>16.1.0</version>
66
<versioning>
7-
<latest>14.8.0</latest>
8-
<release>14.8.0</release>
7+
<latest>16.4.0</latest>
8+
<release>16.4.0</release>
99
<versions>
10-
<version>14.5.0</version>
11-
<version>14.6.0</version>
12-
<version>14.7.0</version>
13-
<version>14.8.0</version>
10+
<version>16.1.0</version>
11+
<version>16.2.0</version>
12+
<version>16.3.0</version>
13+
<version>16.4.0</version>
1414
</versions>
15-
<lastUpdated>20140924084136</lastUpdated>
15+
<lastUpdated>20200924084136</lastUpdated>
1616
</versioning>
1717
</metadata>

Plugins/Aspose_Words_Java_for_Eclipse_Maven/AsposeWordsEclipsePlugin/src/com/aspose/words/maven/utils/AsposeConstants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public class AsposeConstants {
9292
/**
9393
*
9494
*/
95-
public static final String ASPOSE_MAVEN_REPOSITORY = "http://maven.aspose.com";
95+
public static final String ASPOSE_MAVEN_REPOSITORY = "https://repository.aspose.com";
9696

9797
/**
9898
*

Plugins/Aspose_Words_Java_for_Eclipse_Maven/AsposeWordsEclipsePlugin/src/com/aspose/words/maven/utils/AsposeMavenProjectManager.java

+23-9
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@
4545
import org.w3c.dom.Element;
4646
import org.w3c.dom.Node;
4747
import org.w3c.dom.NodeList;
48+
import org.xml.sax.InputSource;
4849
import org.xml.sax.SAXException;
4950
import com.aspose.words.maven.artifacts.Metadata;
5051
import com.aspose.words.maven.artifacts.ObjectFactory;
5152

53+
5254
public class AsposeMavenProjectManager {
5355

5456
private File projectDir = null;
@@ -314,27 +316,39 @@ public String readURLContents(String Url) throws IOException {
314316
*/
315317
public Metadata getProductMavenDependency(String productMavenRepositoryUrl) {
316318
final String mavenMetaDataFileName = "maven-metadata.xml";
317-
Metadata data = null;
319+
Metadata data = new Metadata();
318320

319321
try {
320322
String productMavenInfo;
321-
productMavenInfo = readURLContents(productMavenRepositoryUrl + mavenMetaDataFileName);
322-
JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
323-
Unmarshaller unmarshaller;
324-
unmarshaller = jaxbContext.createUnmarshaller();
325-
326-
data = (Metadata) unmarshaller.unmarshal(new StreamSource(new StringReader(productMavenInfo)));
327-
323+
productMavenInfo = readURLContents(productMavenRepositoryUrl + mavenMetaDataFileName);
324+
325+
DocumentBuilder dBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
326+
Document doc = dBuilder.parse(new InputSource(new StringReader(productMavenInfo)));
327+
XPath xPath = XPathFactory.newInstance().newXPath();
328+
String groupId = XPathFactory.newInstance().newXPath().compile("//metadata/groupId").evaluate(doc);
329+
String artifactId = XPathFactory.newInstance().newXPath().compile("//metadata/artifactId").evaluate(doc);
330+
String version = XPathFactory.newInstance().newXPath().compile("//metadata/version").evaluate(doc);
331+
String latest = XPathFactory.newInstance().newXPath().compile("//metadata/versioning/latest").evaluate(doc);
332+
333+
data.setArtifactId(artifactId);
334+
data.setGroupId(groupId);
335+
data.setVersion(version);
336+
337+
Metadata.Versioning ver = new Metadata.Versioning();
338+
ver.setLatest(latest);
339+
data.setVersioning(ver);
340+
328341
String remoteArtifactFile = productMavenRepositoryUrl + data.getVersioning().getLatest() + "/"
329342
+ data.getArtifactId() + "-" + data.getVersioning().getLatest();
343+
330344

331345
if (!remoteFileExists(remoteArtifactFile + ".jar")) {
332346
AsposeConstants.println("Not Exists");
333347
data.setClassifier(getResolveSupportedJDK(remoteArtifactFile));
334348
} else {
335349
AsposeConstants.println("Exists");
336350
}
337-
} catch (IOException | JAXBException ex) {
351+
} catch (Exception ex) {
338352
ex.printStackTrace();
339353
data = null;
340354
}

Plugins/Aspose_Words_Java_for_Eclipse_Maven/AsposeWordsEclipsePlugin/src/com/aspose/words/maven/utils/AsposeWordsJavaAPI.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
*/
2424
public class AsposeWordsJavaAPI extends AsposeJavaAPI {
2525

26-
private final String _name = AsposeConstants.API_NAME;
27-
private final String _mavenRepositoryURL = "http://maven.aspose.com/repository/ext-release-local/com/aspose/aspose-words/";
28-
private final String _remoteExamplesRepository = "https://github.com/asposewords/Aspose_Words_Java";
26+
private final String _name = AsposeConstants.API_NAME;
27+
private final String _mavenRepositoryURL = "https://repository.aspose.com/repo/com/aspose/aspose-words/";
28+
private final String _remoteExamplesRepository = "https://github.com/aspose-words/Aspose.Words-for-Java";
2929

3030
/**
3131
* @return the _name

Plugins/Aspose_Words_Java_for_Eclipse_Maven/AsposeWordsEclipsePlugin/src/com/aspose/words/maven/utils/GitHelper.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* @author Adeel Ilyas
1515
*
1616
*/
17+
@SuppressWarnings("restriction")
1718
public class GitHelper {
1819

1920
/**
@@ -22,7 +23,7 @@ public class GitHelper {
2223
* @param remotePath
2324
* @throws Exception
2425
*/
25-
public static void updateRepository(String localPath, String remotePath) throws Exception {
26+
public static void updateRepository(String localPath, String remotePath) throws Exception {
2627
Repository localRepo;
2728
try {
2829
localRepo = new FileRepository(localPath + "/.git");
@@ -54,7 +55,7 @@ public static void updateRepository(String localPath, String remotePath) throws
5455
* @param remotePath
5556
* @throws Exception
5657
*/
57-
public static void syncRepository(String localPath, String remotePath) throws Exception {
58+
public static void syncRepository(String localPath, String remotePath) throws Exception {
5859
Repository localRepo;
5960
try {
6061
localRepo = new FileRepository(localPath + "/.git");

Plugins/Aspose_Words_Java_for_Eclipse_Maven/AsposeWordsEclipseSite/site.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<site>
3-
<description name="Aspose.Words Java for Eclipse (Maven) - Eclipse Update Site" url="http://cdn.aspose.com/marketplace/eclipse/java/maven/asposewords/">
3+
<description name="Aspose.Words Java for Eclipse (Maven) - Eclipse Update Site" url="https://repository.aspose.com/list/plugins/aspose-words/eclipse/words-maven/20.10/site.xml">
44
Aspose.Words Maven Project wizard creates Maven Project for using
55
Aspose.Words for Java API within Eclipse IDE.
66
Aspose.Words for Java is an advanced class library for Java that
@@ -16,7 +16,7 @@ Aspose Cloud Maven Repository.
1616
The wizard also gives you option to download the Code Examples
1717
to use Aspose.Words for Java API.
1818
</description>
19-
<feature url="features/com.aspose.words.java.maven_1.0.0.3.jar" id="com.aspose.words.java.maven" version="1.0.0.3">
19+
<feature url="features/com.aspose.words.java.maven_20.10.0.jar" id="com.aspose.words.java.maven" version="20.10">
2020
<category name="com.aspose.words.java.maven.category"/>
2121
</feature>
2222
<category-def name="com.aspose.words.java.maven.category" label="Aspose.Words Java for Eclipse (Maven)"/>

Plugins/Aspose_Words_Java_for_Eclipse_Maven/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2001-2016 Aspose Pty Ltd
3+
Copyright (c) 2001-2020 Aspose Pty Ltd
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Plugins/Aspose_Words_Java_for_Eclipse_Maven/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The plugin provides following features to work with [Aspose.Words for Java](http
2525

2626
### Other Features
2727

28-
* Supports latest **Eclipse Mars.1 (4.5.1)** version
28+
* Supports **Eclipse Mars.1 (4.5.1)** and later versions
2929
* Compatible with **Mac**, **Linux Flavors** and **Windows**
3030
* Native IDE user experience
3131
* Open Source

Plugins/Aspose_Words_Java_for_Eclipse_Maven/Release Notes.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<body>
77

88

9-
<b>Aspose.Words Java for Eclipse (Maven) - v1.0.0</b>
9+
<b>Aspose.Words Java for Eclipse (Maven) - v20.10</b>
1010
<p> This is new Plugin for Eclipse IDE by <a href="http://aspose.com">Aspose</a>. The Plugin intended for developers using Maven platform for Java developments and want to use <a href="http://goo.gl/Eg359W">Aspose.Words for Java</a> in their projects.</p>
1111
<p><b>NOTE:</b> <a href="http://goo.gl/Eg359W">Aspose.Words for Java</a> is Java API developed by <a href="http://aspose.com">Aspose</a> that offers easy Microsoft Word document creation and manipulation right from within Java Projects. For the API detailed features list check the <a href="http://goo.gl/Eg359W">link</a>.
1212
</p><p> The plugin provides following features to work with <a href="http://goo.gl/Eg359W">Aspose.Words for Java</a> API within <b>Eclipse IDE</b> comfortably:
1313
</p><ul><li><b>Aspose.Words Maven Project</b><br><ul><li>By using this wizard plugin creates Maven project for using <a href="http://goo.gl/Eg359W">Aspose.Words for Java</a> from <b>New -> Project -> Maven-> Aspose.Words Maven Project</b></li><li>The wizard will also give option for downloading latest available Code Examples for using the API.</li></ul></li>
1414
<li><b>Aspose.Words Code Example</b><ul><li>By using this wizard plugin lets you copy the downloaded Code Examples into your project for using <a href="http://goo.gl/Eg359W">Aspose.Words for Java</a> from <b>New -> Other -> Java -> Aspose.Words Code Example</b></li><li>The wizard will also look for and updates for newly available Code Examples from <a href="https://goo.gl/Qx9Hp9">Aspose.Words for Java examples repository.</a></li></ul></li>
15-
<li><b>Other Features</b><ul><li>Supports latest <b>Eclipse Mars.1 (4.5.1)</b> version</li><li>Compatible with <b>Mac</b>, <b>Linux Flavors</b> and <b>Windows</b></li><li>Native IDE user experience</li><li>Open Source</li></ul></li></ul>
15+
<li><b>Other Features</b><ul><li>Supports <b>Eclipse Mars.1 (4.5.1) and later</b> versions</li><li>Compatible with <b>Mac</b>, <b>Linux Flavors</b> and <b>Windows</b></li><li>Native IDE user experience</li><li>Open Source</li></ul></li></ul>
1616
</body>
1717
</html>

0 commit comments

Comments
 (0)