Skip to content
This repository has been archived by the owner on May 7, 2020. It is now read-only.

WIP: External null annotations via jar from maven central #4513

Closed
wants to merge 4 commits into from
Closed

WIP: External null annotations via jar from maven central #4513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c6f89d
WIP: External null annotations via zip
triller-telekom Nov 7, 2017
d590e45
Use maven dependencies on CLASSPATH for external annotations in mvn run
triller-telekom Nov 9, 2017
8963f71
Download eeas jar from maven central and copy jar for usage in IDE
triller-telekom Nov 10, 2017
9119105
Rebased on current master
triller-telekom Feb 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions extensions/binding/org.eclipse.smarthome.binding.yahooweather/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="annotationpath" value="/targetplatform/eeas.jar"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<attributes>
<attribute name="annotationpath" value="/targetplatform/eeas.jar"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
23 changes: 22 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
<build.helper.maven.plugin.version>1.8</build.helper.maven.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sat.version>0.4.1</sat.version>
<!-- TODO: insert one project that contains ALL annotations here-->
<eea-groupId>org.lastnpe.eea</eea-groupId>
<eea-artifactId>jdk-eea</eea-artifactId>
<eea-version>0.0.1</eea-version>
</properties>

<packaging>pom</packaging>
Expand Down Expand Up @@ -199,10 +203,18 @@
<artifactId>org.eclipse.jdt.annotation</artifactId>
<version>${jdt-annotations.version}</version>
</extraClasspathElement>
<extraClasspathElement>
<!-- TODO: insert one project that contains ALL annotations here-->
<groupId>${eea-groupId}</groupId>
<artifactId>${eea-artifactId}</artifactId>
<version>${eea-version}</version>
</extraClasspathElement>
</extraClasspathElements>
<compilerArgs>
<!--<arg>-err:+nullAnnot(org.eclipse.jdt.annotation.Nullable|org.eclipse.jdt.annotation.NonNull|org.eclipse.jdt.annotation.NonNullByDefault),+inheritNullAnnot</arg>-->
<arg>-warn:+nullAnnot(org.eclipse.jdt.annotation.Nullable|org.eclipse.jdt.annotation.NonNull|org.eclipse.jdt.annotation.NonNullByDefault),+null,+inheritNullAnnot,+nullAnnotConflict,+nullUncheckedConversion,+nullAnnotRedundant,+nullDereference</arg>
<arg>-warn:+null,+nullAnnot(org.eclipse.jdt.annotation.Nullable|org.eclipse.jdt.annotation.NonNull|org.eclipse.jdt.annotation.NonNullByDefault),+inheritNullAnnot,+nullAnnotConflict,+nullUncheckedConversion,+nullAnnotRedundant,+nullDereference</arg>
<arg>-annotationpath</arg>
<arg>CLASSPATH</arg>
</compilerArgs>
</configuration>
</plugin>
Expand Down Expand Up @@ -583,4 +595,13 @@
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>${eea-groupId}</groupId>
<artifactId>${eea-artifactId}</artifactId>
<version>${eea-version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
1 change: 1 addition & 0 deletions targetplatform/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/eeas.jar
17 changes: 17 additions & 0 deletions targetplatform/DownloadEEAs.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="process-resources"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES"/>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
<intAttribute key="M2_THREADS" value="1"/>
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JRE for JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/targetplatform}"/>
</launchConfiguration>
8 changes: 7 additions & 1 deletion targetplatform/EclipseSmartHome.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion"
value="ignore"/>
value="warning"/>
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.parameterAssignment"
Expand Down Expand Up @@ -2422,6 +2422,12 @@
rootFolder="${git.clone.eclipsesmarthome.location/products}"
locateNestedProjects="true"/>
</setupTask>
<setupTask
xsi:type="launching:LaunchTask"
id="launch.smarthome.downloadEEAs"
launcher="DownloadEEAs">
<description>Downloads Eclipse External Annotations and places them into eeas.jar in targetplatform</description>
</setupTask>
<setupTask
xsi:type="pde:TargetPlatformTask"
id="smarthome.target"
Expand Down
29 changes: 29 additions & 0 deletions targetplatform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,35 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>download-copy-eeas</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${eea-groupId}</groupId>
<artifactId>${eea-artifactId}</artifactId>
<version>${eea-version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${basedir}</outputDirectory>
<destFileName>eeas.jar</destFileName>
</artifactItem>
</artifactItems>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down