Skip to content

Commit

Permalink
rearrange dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Bartolomeo Sorrentino authored and Bartolomeo Sorrentino committed May 9, 2019
1 parent 471753f commit 9dc0100
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 117 deletions.
89 changes: 57 additions & 32 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,24 +87,35 @@
<artifactId>compiler</artifactId>
<version>0.9.4</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.bsc</groupId>
<artifactId>jvm-npm-core</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
Expand All @@ -120,31 +131,45 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.8.0</version>
<configuration>
<parameters>true</parameters>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
<outputDirectory>${project.build.directory}/apidocs</outputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
<outputDirectory>${project.build.directory}/apidocs</outputDirectory>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
</plugin>

<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<version>3.3.3</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
</plugin>

</plugins>
</pluginManagement>
Expand Down
109 changes: 58 additions & 51 deletions samples/graaljs-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
</parent>

<artifactId>graaljs-sample</artifactId>
<name>java2ts-processor::graaljs::sample - ${project.version}</name>
<name>java2ts-processor::graaljs::sample</name>
<description>graaljs sample</description>
<packaging>pom</packaging>

<properties>
<graalvm.version>1.0.0-rc16</graalvm.version>
Expand Down Expand Up @@ -58,7 +57,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
<configuration>
<argLine>-XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI --module-path=${compiler.dir} --upgrade-module-path=${compiler.dir}/compiler.jar</argLine>
</configuration>
Expand Down Expand Up @@ -228,60 +226,69 @@
</build>
</profile>
</profiles>

<build>
<finalName>sample</finalName>
<plugins>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<arguments>
<argument>--module-path</argument>
<!-- automatically creates the modulepath using all project dependencies, also adding the project build directory -->
<modulepath/>
<argument>-classpath</argument>
<!-- automatically creates the classpath using all project dependencies, also adding the project build directory -->
<classpath/>
</arguments>
</configuration>
</execution>
</executions>
<configuration>
<executable>${JAVA_HOME}/bin/java</executable>
<arguments>
<argument>-classpath</argument>
<!-- automatically creates the classpath using all project dependencies, also adding the project build directory -->
<classpath/>
<argument>org.bsc.java2ts.JSRun$Graaljs</argument>
<argument>${project.build.directory}/js/main.js</argument>
</arguments>
</configuration>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<proc>none</proc>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<skipSource>true</skipSource>
</configuration>
</plugin>

<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<executions>
<execution>
<id>process</id>
<goals>
<goal>process-test</goal>
</goals>
<phase>package</phase>
<configuration>
<outputDirectory>src/main/ts</outputDirectory>
<options>
<ts.outfile>jdk8</ts.outfile>
</options>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>org.bsc</groupId>
<artifactId>jvm-npm-core</artifactId>
</dependency>
-->

<dependency>
<groupId>org.bsc.processor</groupId>
<artifactId>java2ts-processor</artifactId>
<version>${project.version}</version>
</dependency>

</dependencies>
</project>
45 changes: 11 additions & 34 deletions samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,6 @@
</parent>

<build>
<pluginManagement>

<plugins>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<version>3.3.3</version>
</plugin>


<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
</plugin>

</plugins>

</pluginManagement>

<finalName>sample</finalName>

Expand Down Expand Up @@ -59,19 +40,16 @@
</plugin>


<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<!--
<workingDirectory>${basedir}/src/main/ts</workingDirectory>
-->
</configuration>
<executions>
<execution>
<id>tsc</id>
<!--phase>process-sources</phase-->
<goals>
<goal>exec</goal>
</goals>
Expand All @@ -83,21 +61,19 @@
</execution>
</executions>
</plugin>

-->
</plugins>
</build>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<!--
<dependency>
<groupId>org.bsc</groupId>
<artifactId>jvm-npm-core</artifactId>
<version>1.1.0</version>
</dependency>
</dependency>
-->

<dependency>
<groupId>org.bsc.processor</groupId>
Expand Down Expand Up @@ -129,7 +105,7 @@
<goals>
<goal>process-test</goal>
</goals>
<phase>generate-sources</phase>
<phase>package</phase>
<configuration>
<outputDirectory>src/main/ts</outputDirectory>
<options>
Expand Down Expand Up @@ -185,12 +161,13 @@
<version>1.7.10</version>
</dependency>

<!--
<dependency>
<groupId>org.bsc</groupId>
<artifactId>jvm-npm-rhino</artifactId>
<version>1.1.0</version>
</dependency>

</dependency>
-->
</dependencies>

<build>
Expand All @@ -203,9 +180,9 @@
<execution>
<id>process</id>
<goals>
<goal>process</goal>
<goal>process-test</goal>
</goals>
<phase>generate-sources</phase>
<phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
<options>
Expand Down

0 comments on commit 9dc0100

Please sign in to comment.