Skip to content

Commit e11799e

Browse files
committed
make profile package-natives default
1 parent e013b1a commit e11799e

File tree

2 files changed

+31
-41
lines changed

2 files changed

+31
-41
lines changed

.github/workflows/maven_jni_25.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132

133133
- name: Deploy final JAR
134134
run: |
135-
mvn -pl nativememory -am -Ppackage-natives -P '!native-build' -Pdeploy -Pproduction --no-transfer-progress --batch-mode deploy
135+
mvn -pl nativememory -am -P '!native-build' -Pdeploy --no-transfer-progress --batch-mode deploy
136136
env:
137137
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
138138
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

nativememory/pom.xml

Lines changed: 30 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -104,48 +104,38 @@
104104
</plugins>
105105
</build>
106106
</profile>
107-
108-
<profile>
109-
<id>package-natives</id>
110-
<activation>
111-
<property>
112-
<name>native-build</name>
113-
<value>true</value>
114-
</property>
115-
</activation>
116-
<build>
117-
<plugins>
118-
<plugin>
119-
<groupId>org.apache.maven.plugins</groupId>
120-
<artifactId>maven-resources-plugin</artifactId>
121-
<version>3.3.1</version>
122-
<executions>
123-
<execution>
124-
<id>copy-natives-to-classes</id>
125-
<phase>prepare-package</phase>
126-
<goals>
127-
<goal>copy-resources</goal>
128-
</goals>
129-
<configuration>
130-
<outputDirectory>${project.build.outputDirectory}/native</outputDirectory>
131-
<resources>
132-
<resource>
133-
<directory>${project.build.directory}/libs</directory>
134-
<includes>
135-
<include>**/*</include>
136-
</includes>
137-
<filtering>false</filtering>
138-
</resource>
139-
</resources>
140-
</configuration>
141-
</execution>
142-
</executions>
143-
</plugin>
144-
</plugins>
145-
</build>
146-
</profile>
147107
</profiles>
148108

109+
<build>
110+
<plugins>
111+
<plugin>
112+
<groupId>org.apache.maven.plugins</groupId>
113+
<artifactId>maven-resources-plugin</artifactId>
114+
<version>3.3.1</version>
115+
<executions>
116+
<execution>
117+
<id>copy-natives-to-classes</id>
118+
<phase>prepare-package</phase>
119+
<goals>
120+
<goal>copy-resources</goal>
121+
</goals>
122+
<configuration>
123+
<outputDirectory>${project.build.outputDirectory}/native</outputDirectory>
124+
<resources>
125+
<resource>
126+
<directory>${project.build.directory}/libs</directory>
127+
<includes>
128+
<include>**/*</include>
129+
</includes>
130+
<filtering>false</filtering>
131+
</resource>
132+
</resources>
133+
</configuration>
134+
</execution>
135+
</executions>
136+
</plugin>
137+
</plugins>
138+
</build>
149139

150140

151141
</project>

0 commit comments

Comments
 (0)