Skip to content

Commit

Permalink
Transition to org.jcryptool.thirdparty update sites
Browse files Browse the repository at this point in the history
Currently located under simlei.github.io/org.jcryptool.thirdparty
See jcryptool#149, jcryptool#150

Project runs under Java 11
Maven build works without complaint
Workspace build works, too
  • Loading branch information
Simon Leischnig committed Oct 16, 2019
1 parent 3330223 commit bb2f132
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 6 deletions.
2 changes: 1 addition & 1 deletion org.jcryptool.crypto.keystore/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.filesystem,
net.sourceforge.codec;bundle-version="1.7.0",
de.flexiprovider;bundle-version="1.7.0",
org.jcryptool.thirdparty.java11migration.jaxb
org.jcryptool.thirdparty.m2bundle.jaxb
Bundle-ActivationPolicy: lazy
Export-Package: org.jcryptool.crypto.keystore,
org.jcryptool.crypto.keystore.backend,
Expand Down
1 change: 1 addition & 0 deletions org.jcryptool.jre.master.feature/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bin.includes = feature.xml
43 changes: 43 additions & 0 deletions org.jcryptool.jre.master.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.jcryptool.jre.master.feature"
label="OpenJDK/JLink JRE"
version="1.0.0">

<description>
Aggregates the JRE features from org.jcryptool.thirdparty.jre
</description>

<copyright>
No copyright is assumend by JCrypTool nor its maintaines for the JRE. Please refer to the information provided with the individual jre features.
</copyright>

<license>
The license under which the OpenJDK JRE is distributed stays untouched. Please refer to the information provided with the individual jre features.
</license>

<includes
id="org.jcryptool.thirdparty.jre.linux64.feature"
version="11.0.4.qualifier"
optional="true"
os="linux"
ws="gtk"
arch="x86_64"/>

<includes
id="org.jcryptool.thirdparty.jre.win64.feature"
version="11.0.4.qualifier"
optional="true"
os="win32"
ws="win32"
arch="x86_64"/>

<includes
id="org.jcryptool.thirdparty.jre.macosx.feature"
version="11.0.4.qualifier"
optional="true"
os="macosx"
ws="cocoa"
arch="x86_64"/>

</feature>
13 changes: 13 additions & 0 deletions org.jcryptool.jre.master.feature/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
<groupId>org.jcryptool</groupId>
<artifactId>org.jcryptool.core.parent</artifactId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.jcryptool.jre.master.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
12 changes: 11 additions & 1 deletion org.jcryptool.target/org.jcryptool.target.target
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,19 @@
<unit id="org.eclipse.rcp.sdk.id" version="4.13.0.I20190916-1045"/>
<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<!-- <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://simlei.github.io/org.jcryptool.thirdparty.java11migration.p2/site"/>
<unit id="org.jcryptool.thirdparty.java11migration.jaxb" version="0.0.1.20190910205836"/>
</location>-->
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://simlei.github.io/org.jcryptool.thirdparty/site/m2bundle"/>
<unit id="org.jcryptool.thirdparty.m2bundle.jaxb" version="0.0.1.20191016062250"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://simlei.github.io/org.jcryptool.thirdparty/site/jre"/>
<unit id="org.jcryptool.thirdparty.jre.linux64.feature.feature.group" version="11.0.4.201910160422"/>
<unit id="org.jcryptool.thirdparty.jre.macosx.feature.feature.group" version="11.0.4.201910160422"/>
<unit id="org.jcryptool.thirdparty.jre.win64.feature.feature.group" version="11.0.4.201910160422"/>
</location>
</locations>
<launcherArgs>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@
<module>org.jcryptool.editors.feature</module>
<module>org.jcryptool.fileexplorer</module>
<module>org.jcryptool.jre.master.feature</module>
<module>org.jcryptool.jre.macosx.feature</module>
<module>org.jcryptool.jre.win64.feature</module>
<module>org.jcryptool.jre.linux64.feature</module>
<!-- <module>org.jcryptool.jre.macosx.feature</module> -->
<!-- <module>org.jcryptool.jre.win64.feature</module> -->
<!-- <module>org.jcryptool.jre.linux64.feature</module> -->
<module>org.jcryptool.product</module>
<module>org.jcryptool.providers.feature</module>
<module>org.jcryptool.target</module>
<module>org.jcryptool.views.feature</module>
<module>org.jcryptool.webbrowser</module>
</modules>
</project>
</project>

0 comments on commit bb2f132

Please sign in to comment.