Skip to content

Commit

Permalink
Merge pull request #266 from bmarwell/#265_remove_indy_profiles
Browse files Browse the repository at this point in the history 
[#265] remove indy profiles
  • Loading branch information
@keeganwitt
keeganwitt committed Sep 25, 2023
2 parents 5093cfc + d95b3af commit ade990c
Show file tree
Hide file tree
Showing 34 changed files with 286 additions and 1,944 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
# - name: integration test
# run: ./mvnw --batch-mode --activate-profiles indy -Dmaven.test.skip=true clean install invoker:install invoker:run
- name: full test
run: ./mvnw --batch-mode --activate-profiles nonindy clean install invoker:install invoker:run
run: ./mvnw --batch-mode clean install invoker:install invoker:run
143 changes: 19 additions & 124 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,25 @@
<version>32.0.0-jre</version>
<scope>runtime</scope>
</dependency>
<!-- main groovy support -->
<dependency>
<groupId>${groovyGroupId}</groupId>
<artifactId>groovy</artifactId>
<version>${groovyVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${groovyGroupId}</groupId>
<artifactId>groovy-ant</artifactId>
<version>${groovyVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${groovyGroupId}</groupId>
<artifactId>groovy-groovydoc</artifactId>
<version>${groovyVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- this is to support use of Groovysh (Groovy jars don't include) -->
<groupId>org.fusesource.jansi</groupId>
Expand Down Expand Up @@ -141,130 +160,6 @@
</dependencies>

<profiles>
<profile>
<id>indy</id>
<dependencies>
<dependency>
<groupId>${groovyGroupId}</groupId>
<artifactId>groovy</artifactId>
<version>${groovyVersion}</version>
<classifier>indy</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${groovyGroupId}</groupId>
<artifactId>groovy-ant</artifactId>
<version>${groovyVersion}</version>
<classifier>indy</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${groovyGroupId}</groupId>
<artifactId>groovy-groovydoc</artifactId>
<version>${groovyVersion}</version>
<classifier>indy</classifier>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<profiles>
<profile>indy</profile>
</profiles>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>nonindy</id>
<dependencies>
<dependency>
<groupId>${groovyGroupId}</groupId>
<artifactId>groovy</artifactId>
<version>${groovyVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${groovyGroupId}</groupId>
<artifactId>groovy-ant</artifactId>
<version>${groovyVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${groovyGroupId}</groupId>
<artifactId>groovy-groovydoc</artifactId>
<version>${groovyVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<profiles>
<profile>nonindy</profile>
</profiles>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>pre2.3-indy</id>
<dependencies>
<dependency>
<groupId>${groovyGroupId}</groupId>
<artifactId>groovy</artifactId>
<version>${groovyVersion}</version>
<classifier>indy</classifier>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<profiles>
<profile>pre2.3-indy</profile>
</profiles>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>pre2.3-nonindy</id>
<dependencies>
<dependency>
<groupId>${groovyGroupId}</groupId>
<artifactId>groovy</artifactId>
<version>${groovyVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<profiles>
<profile>pre2.3-nonindy</profile>
</profiles>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>release-sign-artifacts</id>
<activation>
Expand Down
45 changes: 4 additions & 41 deletions src/it/advancedCompile/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,49 +24,12 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>indy</id>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
<classifier>indy</classifier>
</dependency>
</dependencies>
</profile>
<profile>
<id>nonindy</id>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>pre2.3-indy</id>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
<classifier>indy</classifier>
</dependency>
</dependencies>
</profile>
<profile>
<id>pre2.3-nonindy</id>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down
100 changes: 12 additions & 88 deletions src/it/advancedExecute/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,94 +29,6 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>indy</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
<version>@groovyVersion@</version>
<classifier>indy</classifier>
</dependency>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy-ant</artifactId>
<version>@groovyVersion@</version>
<classifier>indy</classifier>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>nonindy</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
<version>@groovyVersion@</version>
</dependency>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy-ant</artifactId>
<version>@groovyVersion@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>pre2.3-indy</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
<version>@groovyVersion@</version>
<classifier>indy</classifier>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>pre2.3-nonindy</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
<version>@groovyVersion@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -180,6 +92,18 @@
]]></script>
</scripts>
</configuration>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
<version>@groovyVersion@</version>
</dependency>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy-ant</artifactId>
<version>@groovyVersion@</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
45 changes: 4 additions & 41 deletions src/it/advancedGenerateStubs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,49 +22,12 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>indy</id>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
<classifier>indy</classifier>
</dependency>
</dependencies>
</profile>
<profile>
<id>nonindy</id>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>pre2.3-indy</id>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
<classifier>indy</classifier>
</dependency>
</dependencies>
</profile>
<profile>
<id>pre2.3-nonindy</id>
<dependencies>
<dependency>
<groupId>@groovyGroupId@</groupId>
<artifactId>groovy</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down

0 comments on commit ade990c

Please sign in to comment.