Skip to content

Commit

Permalink
Support JPMS
Browse files Browse the repository at this point in the history 
- Bump commons-parent from 58 to 59
- Rework some dependencies
- Leave behind comments of old dependencies FTR in this commit
- Above will be removed next
  • Loading branch information
@garydgregory
garydgregory committed Jul 29, 2023
1 parent 9bc931b commit db8f200
Show file tree
Hide file tree
Showing 8 changed files with 207 additions and 99 deletions.
1 change: 1 addition & 0 deletions commons-jcs-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

<properties>
<commons.bc.version>3.1</commons.bc.version>
<commons.module.name>org.apache.commons.jcs3.core</commons.module.name>
<!-- generate report even if there are binary incompatible changes -->
<commons.japicmp.breakBuildOnBinaryIncompatibleModifications>false</commons.japicmp.breakBuildOnBinaryIncompatibleModifications>
<commons.japicmp.ignoreMissingClasses>false</commons.japicmp.ignoreMissingClasses>
Expand Down
63 changes: 40 additions & 23 deletions commons-jcs-jcache-extras/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,32 +36,48 @@
</scm>

<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcache_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.2_spec</artifactId>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-jcache_1.0_spec</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>javax.inject</groupId>-->
<!-- <artifactId>javax.inject</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-atinject_1.0_spec</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-jcdi_2.0_spec</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<version>1.0</version>
<scope>provided</scope>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-interceptor_1.2_spec</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>javax.annotation</groupId>-->
<!-- <artifactId>javax.annotation-api</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-annotation_1.2_spec</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-servlet_3.0_spec</artifactId>-->
<!-- <version>1.0</version>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->

<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -109,6 +125,7 @@
</dependencies>

<properties>
<commons.module.name>org.apache.commons.jcs3.jcache.extras</commons.module.name>
<project.build.outputTimestamp>2022-01-01T00:00:00Z</project.build.outputTimestamp>
</properties>
</project>
13 changes: 13 additions & 0 deletions ...ache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.util.TreeMap;
import java.util.concurrent.CopyOnWriteArraySet;
import javax.servlet.ServletOutputStream;
import javax.servlet.WriteListener;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
Expand Down Expand Up @@ -204,6 +205,18 @@ public void write(final int b) throws IOException
{
buffer.write(b);
}

@Override
public boolean isReady() {
// TODO Auto-generated method stub
return false;
}

@Override
public void setWriteListener(WriteListener writeListener) {
// TODO Auto-generated method stub

}
};
}

Expand Down
31 changes: 21 additions & 10 deletions commons-jcs-jcache-openjpa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,31 @@
</scm>

<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcache_1.0_spec</artifactId>
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-jpa_2.0_spec</artifactId>-->
<!-- <version>1.1</version>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-jcache_1.0_spec</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>2.4.3</version>
<version>3.2.2</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -77,6 +87,7 @@
</dependencies>

<properties>
<commons.module.name>org.apache.commons.jcs3.jcache.openjpa</commons.module.name>
<project.build.outputTimestamp>2022-01-01T00:00:00Z</project.build.outputTimestamp>
</properties>
</project>
52 changes: 35 additions & 17 deletions commons-jcs-jcache/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,43 @@
</scm>

<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcache_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
<version>1.1.1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-jcache_1.0_spec</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>javax.inject</groupId>-->
<!-- <artifactId>javax.inject</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-atinject_1.0_spec</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-jcdi_2.0_spec</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.2_spec</artifactId>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-interceptor_1.2_spec</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>javax.annotation</groupId>-->
<!-- <artifactId>javax.annotation-api</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-annotation_1.2_spec</artifactId>-->
<!-- </dependency>-->

<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -127,6 +144,7 @@
</build>

<properties>
<commons.module.name>org.apache.commons.jcs3.jcache</commons.module.name>
<project.build.outputTimestamp>2022-01-01T00:00:00Z</project.build.outputTimestamp>
</properties>
</project>
1 change: 0 additions & 1 deletion commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public Method getMethod()
}
}

@Override
public Constructor<?> getConstructor()
{
return null;
Expand Down
62 changes: 39 additions & 23 deletions commons-jcs-tck-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,14 @@
<artifactId>app-domain</artifactId>
</dependency>

<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcache_1.0_spec</artifactId>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-jcache_1.0_spec</artifactId>-->
<!-- </dependency>-->

<dependency>
<groupId>javax.cache</groupId>
Expand All @@ -112,28 +116,40 @@
<scope>test</scope>
</dependency>

<!-- <dependency>-->
<!-- <groupId>javax.transaction</groupId>-->
<!-- <artifactId>jta</artifactId>-->
<!-- <version>1.1</version>-->
<!-- </dependency>-->

<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-jcdi_2.0_spec</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>javax.inject</groupId>-->
<!-- <artifactId>javax.inject</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-atinject_1.0_spec</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
</dependency>

<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.2_spec</artifactId>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-interceptor_1.2_spec</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>javax.annotation</groupId>-->
<!-- <artifactId>javax.annotation-api</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.geronimo.specs</groupId>-->
<!-- <artifactId>geronimo-annotation_1.2_spec</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
Expand Down
Loading

0 comments on commit db8f200

Please sign in to comment.