Skip to content

Commit 3643569

Browse files
tomasstupkatimfel
authored andcommitted
[WIP] [GR-48688] Merge graalpy-maven-plugin goals into one.
PullRequest: graalpython/3079
2 parents abc0d44 + dd9c489 commit 3643569

File tree

43 files changed

+1320
-4103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1320
-4103
lines changed

graalpython/graalpy-maven-plugin/src/test/resources/exec_test/pom.xml renamed to graalpython/com.oracle.graal.python.test/src/tests/standalone/check_home_pom.xml

+16-19
Original file line numberDiff line numberDiff line change
@@ -51,45 +51,42 @@ SOFTWARE.
5151
<name>Test MyMojo</name>
5252

5353
<dependencies>
54-
<dependency>
55-
<groupId>junit</groupId>
56-
<artifactId>junit</artifactId>
57-
<version>3.8.1</version>
58-
<scope>test</scope>
59-
</dependency>
6054
<dependency>
6155
<groupId>org.graalvm.polyglot</groupId>
62-
<artifactId>python</artifactId>
63-
<version>23.1.0</version>
56+
<artifactId>python-community</artifactId>
57+
<version>{graalpy-maven-plugin-version}</version>
6458
<type>pom</type>
6559
</dependency>
6660
<dependency>
6761
<groupId>org.graalvm.python</groupId>
6862
<artifactId>python-launcher</artifactId>
69-
<version>23.1.0</version>
63+
<version>{graalpy-maven-plugin-version}</version>
7064
</dependency>
7165
</dependencies>
72-
66+
7367
<build>
7468
<plugins>
7569
<plugin>
7670
<groupId>org.graalvm.python</groupId>
7771
<artifactId>graalpy-maven-plugin</artifactId>
78-
<version>0.0.1-SNAPSHOT</version>
72+
<version>{graalpy-maven-plugin-version}</version>
7973
<executions>
8074
<execution>
75+
<configuration>
76+
<pythonHome>
77+
<includes>
78+
<include>.*__init__\.py</include>
79+
</includes>
80+
<excludes>
81+
<exclude>.*html/__init__\.py</exclude>
82+
</excludes>
83+
</pythonHome>
84+
</configuration>
8185
<goals>
82-
<goal>prepare-venv</goal>
83-
<goal>vfs-index</goal>
86+
<goal>process-graalpy-resources</goal>
8487
</goals>
8588
</execution>
8689
</executions>
87-
<configuration>
88-
<packages>
89-
<package>psutil</package>
90-
<package>termcolor</package>
91-
</packages>
92-
</configuration>
9390
</plugin>
9491
</plugins>
9592
</build>

graalpython/graalpy-maven-plugin/src/test/resources/list_files_test/pom.xml renamed to graalpython/com.oracle.graal.python.test/src/tests/standalone/fail_without_graalpy_dep_pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ SOFTWARE.
5555
<plugin>
5656
<groupId>org.graalvm.python</groupId>
5757
<artifactId>graalpy-maven-plugin</artifactId>
58-
<version>0.0.1-SNAPSHOT</version>
58+
<version>{graalpy-maven-plugin-version}</version>
5959
<executions>
6060
<execution>
6161
<goals>
62-
<goal>vfs-index</goal>
62+
<goal>process-graalpy-resources</goal>
6363
</goals>
6464
</execution>
6565
</executions>

graalpython/graalpy-maven-plugin/src/test/resources/prepare_venv_test/pom.xml renamed to graalpython/com.oracle.graal.python.test/src/tests/standalone/prepare_venv_pom.xml

+5-6
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ SOFTWARE.
5959
</dependency>
6060
<dependency>
6161
<groupId>org.graalvm.polyglot</groupId>
62-
<artifactId>python</artifactId>
63-
<version>23.1.0</version>
62+
<artifactId>python-community</artifactId>
63+
<version>{graalpy-maven-plugin-version}</version>
6464
<type>pom</type>
6565
</dependency>
6666
<dependency>
6767
<groupId>org.graalvm.python</groupId>
6868
<artifactId>python-launcher</artifactId>
69-
<version>23.1.0</version>
69+
<version>{graalpy-maven-plugin-version}</version>
7070
</dependency>
7171
</dependencies>
7272

@@ -75,12 +75,11 @@ SOFTWARE.
7575
<plugin>
7676
<groupId>org.graalvm.python</groupId>
7777
<artifactId>graalpy-maven-plugin</artifactId>
78-
<version>0.0.1-SNAPSHOT</version>
78+
<version>{graalpy-maven-plugin-version}</version>
7979
<executions>
8080
<execution>
8181
<goals>
82-
<goal>prepare-venv</goal>
83-
<goal>vfs-index</goal>
82+
<goal>process-graalpy-resources</goal>
8483
</goals>
8584
</execution>
8685
</executions>

0 commit comments

Comments
 (0)